diff --git a/angular.json b/angular.json
index deb81383afc5..b9617f89bbf9 100644
--- a/angular.json
+++ b/angular.json
@@ -485,7 +485,7 @@
},
{
"glob": "**/*",
- "input": "projects/icons/src/icons/src",
+ "input": "projects/icons/src",
"output": "assets/taiga-ui/icons"
}
],
diff --git a/package.json b/package.json
index 3e0403a21808..2c58a0d82ccb 100644
--- a/package.json
+++ b/package.json
@@ -18,15 +18,13 @@
"prettier": "prettier --write \"projects/**/*.{js,ts,html,md,less,json}\"",
"clear": "prettier --write '**/projects/**/*.{js,ts,html,md,less,json}' && tslint '**/projects/**/*.ts' --fix",
"typecheck": "tsc --noEmit --skipLibCheck",
- "*** build **": "",
+ "*** Build **": "",
"build": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --configuration=production",
"build:demo": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod --configuration=production",
"postbuild:demo": "node scripts/checkDist.js && cp ./dist/demo/browser/index.html ./dist/demo/browser/404.html",
"*** Icons ***": "",
- "compile:icons": "ts-node --project ./tsconfig.compiler.json scripts/compileIcons.ts",
- "prebuild:icons": "npm run compile:icons projects/icons",
+ "prebuild:icons": "ts-node --project ./tsconfig.compiler.json projects/icons/scripts/compile-icons.ts",
"build:icons": "ng run icons:build --configuration=production",
- "postbuild:icons": "node projects/icons/scripts/copy-icons.js",
"*** Release ***": "",
"release": "standard-version -a --no-verify",
"release:patch": "node scripts/release.js patch",
diff --git a/projects/addon-editor/components/color-selector/color-selector.style.less b/projects/addon-editor/components/color-selector/color-selector.style.less
index 31b3fc8f22f3..07ba5887d594 100644
--- a/projects/addon-editor/components/color-selector/color-selector.style.less
+++ b/projects/addon-editor/components/color-selector/color-selector.style.less
@@ -90,7 +90,7 @@
&:hover,
&_active {
- color: var(--tui-primary-text);
+ color: var(--tui-text-01);
background: var(--tui-secondary-hover);
}
}
diff --git a/projects/addon-editor/components/toolbar/toolbar.component.ts b/projects/addon-editor/components/toolbar/toolbar.component.ts
index c7032ddbdcbe..e4713fb6a0b6 100644
--- a/projects/addon-editor/components/toolbar/toolbar.component.ts
+++ b/projects/addon-editor/components/toolbar/toolbar.component.ts
@@ -111,13 +111,13 @@ export class TuiToolbarComponent {
{
size: '5',
px: 24,
- family: 'tuiHeading',
+ family: 'var(--tui-heading-font)',
name: 'Подзаголовок',
},
{
size: '6',
px: 30,
- family: 'tuiHeading',
+ family: 'var(--tui-heading-font)',
name: 'Заголовок',
},
];
diff --git a/projects/addon-editor/constants/default-editor-styles.ts b/projects/addon-editor/constants/default-editor-styles.ts
index 3ec1e920fb6b..52a93ceb95d1 100644
--- a/projects/addon-editor/constants/default-editor-styles.ts
+++ b/projects/addon-editor/constants/default-editor-styles.ts
@@ -127,7 +127,7 @@ body.tui-editor-socket {
.tui-editor-socket font[size='7'] {
display: block;
margin: 32px 0 16px;
- font-family: tuiHeading, 'Manrope', sans-serif;
+ font-family: var(--tui-heading-font);
}
.tui-editor-socket font[size='5'] {
diff --git a/projects/addon-editor/icons/all.ts b/projects/addon-editor/icons/all.ts
deleted file mode 100644
index ca71220474fe..000000000000
--- a/projects/addon-editor/icons/all.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-var tuiIconToolbarAttach = "";
-
-var tuiIconToolbarBold = "";
-
-var tuiIconToolbarClearFormat = "";
-
-var tuiIconToolbarCode = "";
-
-var tuiIconToolbarColor = "";
-
-var tuiIconToolbarFont = "";
-
-var tuiIconToolbarFormat = "";
-
-var tuiIconToolbarHilite = "";
-
-var tuiIconToolbarHr = "";
-
-var tuiIconToolbarImg = "";
-
-var tuiIconToolbarIndent = "";
-
-var tuiIconToolbarItalic = "";
-
-var tuiIconToolbarJustifyCenter = "";
-
-var tuiIconToolbarJustifyFull = "";
-
-var tuiIconToolbarJustifyLeft = "";
-
-var tuiIconToolbarJustifyRight = "";
-
-var tuiIconToolbarLink = "";
-
-var tuiIconToolbarOL = "";
-
-var tuiIconToolbarOutdent = "";
-
-var tuiIconToolbarQuote = "";
-
-var tuiIconToolbarRedo = "";
-
-var tuiIconToolbarStrikeThrough = "";
-
-var tuiIconToolbarSubscript = "";
-
-var tuiIconToolbarSuperscript = "";
-
-var tuiIconToolbarTeX = "";
-
-var tuiIconToolbarTransparent = "";
-
-var tuiIconToolbarUL = "";
-
-var tuiIconToolbarUnderline = "";
-
-var tuiIconToolbarUndo = "";
-
-export { tuiIconToolbarAttach, tuiIconToolbarBold, tuiIconToolbarClearFormat, tuiIconToolbarCode, tuiIconToolbarColor, tuiIconToolbarFont, tuiIconToolbarFormat, tuiIconToolbarHilite, tuiIconToolbarHr, tuiIconToolbarImg, tuiIconToolbarIndent, tuiIconToolbarItalic, tuiIconToolbarJustifyCenter, tuiIconToolbarJustifyFull, tuiIconToolbarJustifyLeft, tuiIconToolbarJustifyRight, tuiIconToolbarLink, tuiIconToolbarOL, tuiIconToolbarOutdent, tuiIconToolbarQuote, tuiIconToolbarRedo, tuiIconToolbarStrikeThrough, tuiIconToolbarSubscript, tuiIconToolbarSuperscript, tuiIconToolbarTeX, tuiIconToolbarTransparent, tuiIconToolbarUL, tuiIconToolbarUnderline, tuiIconToolbarUndo };
diff --git a/projects/addon-editor/icons/index.ts b/projects/addon-editor/icons/index.ts
deleted file mode 100644
index 73508fe9b5e1..000000000000
--- a/projects/addon-editor/icons/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './all';
diff --git a/projects/addon-editor/icons/package.json b/projects/addon-editor/icons/package.json
deleted file mode 100644
index cdd9e35f1143..000000000000
--- a/projects/addon-editor/icons/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "ngPackage": {
- "lib": {
- "entryFile": "index.ts"
- }
- }
-}
\ No newline at end of file
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarAttach.svg b/projects/addon-editor/icons/src/tuiIconToolbarAttach.svg
deleted file mode 100644
index c7a0d9bea8a4..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarAttach.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarBold.svg b/projects/addon-editor/icons/src/tuiIconToolbarBold.svg
deleted file mode 100644
index db6c9604845c..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarBold.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarClearFormat.svg b/projects/addon-editor/icons/src/tuiIconToolbarClearFormat.svg
deleted file mode 100644
index 30997412b4cf..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarClearFormat.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarCode.svg b/projects/addon-editor/icons/src/tuiIconToolbarCode.svg
deleted file mode 100644
index 61c184a86346..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarCode.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarColor.svg b/projects/addon-editor/icons/src/tuiIconToolbarColor.svg
deleted file mode 100644
index 71862b2201bf..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarColor.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarFont.svg b/projects/addon-editor/icons/src/tuiIconToolbarFont.svg
deleted file mode 100644
index 56fe6a06c8f4..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarFont.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarFormat.svg b/projects/addon-editor/icons/src/tuiIconToolbarFormat.svg
deleted file mode 100644
index 2f0d1c531d11..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarFormat.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarHilite.svg b/projects/addon-editor/icons/src/tuiIconToolbarHilite.svg
deleted file mode 100644
index 543c7e505ba6..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarHilite.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarHr.svg b/projects/addon-editor/icons/src/tuiIconToolbarHr.svg
deleted file mode 100644
index 9d3051135c72..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarHr.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarImg.svg b/projects/addon-editor/icons/src/tuiIconToolbarImg.svg
deleted file mode 100644
index 6464d827aee4..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarImg.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarIndent.svg b/projects/addon-editor/icons/src/tuiIconToolbarIndent.svg
deleted file mode 100644
index 10b16bf3244f..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarIndent.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarItalic.svg b/projects/addon-editor/icons/src/tuiIconToolbarItalic.svg
deleted file mode 100644
index 2a09a8959c11..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarItalic.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarJustifyCenter.svg b/projects/addon-editor/icons/src/tuiIconToolbarJustifyCenter.svg
deleted file mode 100644
index d59e17e0c295..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarJustifyCenter.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarJustifyFull.svg b/projects/addon-editor/icons/src/tuiIconToolbarJustifyFull.svg
deleted file mode 100644
index df6e9c8e443c..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarJustifyFull.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarJustifyLeft.svg b/projects/addon-editor/icons/src/tuiIconToolbarJustifyLeft.svg
deleted file mode 100644
index 1b7c152c73ab..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarJustifyLeft.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarJustifyRight.svg b/projects/addon-editor/icons/src/tuiIconToolbarJustifyRight.svg
deleted file mode 100644
index 46a2f381bd46..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarJustifyRight.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarLink.svg b/projects/addon-editor/icons/src/tuiIconToolbarLink.svg
deleted file mode 100644
index c1dbe1ea7c60..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarLink.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarOL.svg b/projects/addon-editor/icons/src/tuiIconToolbarOL.svg
deleted file mode 100644
index 882494b42a54..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarOL.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarOutdent.svg b/projects/addon-editor/icons/src/tuiIconToolbarOutdent.svg
deleted file mode 100644
index 85d6aceb993c..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarOutdent.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarQuote.svg b/projects/addon-editor/icons/src/tuiIconToolbarQuote.svg
deleted file mode 100644
index 6c62d7e86607..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarQuote.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarRedo.svg b/projects/addon-editor/icons/src/tuiIconToolbarRedo.svg
deleted file mode 100644
index 76747529650e..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarRedo.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarStrikeThrough.svg b/projects/addon-editor/icons/src/tuiIconToolbarStrikeThrough.svg
deleted file mode 100644
index ddfc78cdf89e..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarStrikeThrough.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarSubscript.svg b/projects/addon-editor/icons/src/tuiIconToolbarSubscript.svg
deleted file mode 100644
index 24157e4d9630..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarSubscript.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarSuperscript.svg b/projects/addon-editor/icons/src/tuiIconToolbarSuperscript.svg
deleted file mode 100644
index 93e10d349d7b..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarSuperscript.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarTeX.svg b/projects/addon-editor/icons/src/tuiIconToolbarTeX.svg
deleted file mode 100644
index edc5b5e19fd1..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarTeX.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarTransparent.svg b/projects/addon-editor/icons/src/tuiIconToolbarTransparent.svg
deleted file mode 100644
index 29df7c0f6252..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarTransparent.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarUL.svg b/projects/addon-editor/icons/src/tuiIconToolbarUL.svg
deleted file mode 100644
index e20ab6d2f47e..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarUL.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarUnderline.svg b/projects/addon-editor/icons/src/tuiIconToolbarUnderline.svg
deleted file mode 100644
index 35026a5a28a8..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarUnderline.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/icons/src/tuiIconToolbarUndo.svg b/projects/addon-editor/icons/src/tuiIconToolbarUndo.svg
deleted file mode 100644
index 7ca1b54c2e4f..000000000000
--- a/projects/addon-editor/icons/src/tuiIconToolbarUndo.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/projects/addon-editor/index.ts b/projects/addon-editor/index.ts
index 8c2b189aa788..17d2e62afa00 100644
--- a/projects/addon-editor/index.ts
+++ b/projects/addon-editor/index.ts
@@ -2,7 +2,6 @@ export * from '@taiga-ui/addon-editor/components';
export * from '@taiga-ui/addon-editor/constants';
export * from '@taiga-ui/addon-editor/directives';
export * from '@taiga-ui/addon-editor/enums';
-export * from '@taiga-ui/addon-editor/icons';
export * from '@taiga-ui/addon-editor/interfaces';
export * from '@taiga-ui/addon-editor/tokens';
export * from '@taiga-ui/addon-editor/utils';
diff --git a/projects/addon-editor/styles/editor-socket.css b/projects/addon-editor/styles/editor-socket.css
index 33b108003ab9..a5d416a78183 100644
--- a/projects/addon-editor/styles/editor-socket.css
+++ b/projects/addon-editor/styles/editor-socket.css
@@ -125,7 +125,7 @@ body.tui-editor-socket {
.tui-editor-socket font[size='7'] {
display: block;
margin: 32px 0 16px;
- font-family: tuiHeading, 'Manrope', sans-serif;
+ font-family: var(--tui-heading-font);
}
.tui-editor-socket font[size='5'] {
diff --git a/projects/addon-mobile/components/theme-android/theme-android.style.less b/projects/addon-mobile/components/theme-android/theme-android.style.less
index 7dd3ccfe0e3d..a8b7af72913d 100644
--- a/projects/addon-mobile/components/theme-android/theme-android.style.less
+++ b/projects/addon-mobile/components/theme-android/theme-android.style.less
@@ -1,10 +1,3 @@
-@font-face {
- font-family: 'tuiHeading';
- src: local('hapica');
- font-weight: 400;
- font-style: normal;
-}
-
html {
touch-action: manipulation;
}
diff --git a/projects/icons/src/icons/all.ts b/projects/icons/all.ts
similarity index 80%
rename from projects/icons/src/icons/all.ts
rename to projects/icons/all.ts
index 0ea065296039..e13e266fa006 100644
--- a/projects/icons/src/icons/all.ts
+++ b/projects/icons/all.ts
@@ -18,12 +18,20 @@ var tuiIconArrowLeftLgLarge = "";
+var tuiIconArrowLongDownLeft = "";
+
+var tuiIconArrowLongDownRight = "";
+
var tuiIconArrowLongLeft = "";
var tuiIconArrowLongRight = "";
var tuiIconArrowLongUp = "";
+var tuiIconArrowLongUpLeft = "";
+
+var tuiIconArrowLongUpRight = "";
+
var tuiIconArrowRight = "";
var tuiIconArrowRightLarge = "";
@@ -310,6 +318,64 @@ var tuiIconToggleOn = "";
+var tuiIconToolbarAttach = "";
+
+var tuiIconToolbarBold = "";
+
+var tuiIconToolbarClearFormat = "";
+
+var tuiIconToolbarCode = "";
+
+var tuiIconToolbarColor = "";
+
+var tuiIconToolbarFont = "";
+
+var tuiIconToolbarFormat = "";
+
+var tuiIconToolbarHilite = "";
+
+var tuiIconToolbarHr = "";
+
+var tuiIconToolbarImg = "";
+
+var tuiIconToolbarIndent = "";
+
+var tuiIconToolbarItalic = "";
+
+var tuiIconToolbarJustifyCenter = "";
+
+var tuiIconToolbarJustifyFull = "";
+
+var tuiIconToolbarJustifyLeft = "";
+
+var tuiIconToolbarJustifyRight = "";
+
+var tuiIconToolbarLink = "";
+
+var tuiIconToolbarOL = "";
+
+var tuiIconToolbarOutdent = "";
+
+var tuiIconToolbarQuote = "";
+
+var tuiIconToolbarRedo = "";
+
+var tuiIconToolbarStrikeThrough = "";
+
+var tuiIconToolbarSubscript = "";
+
+var tuiIconToolbarSuperscript = "";
+
+var tuiIconToolbarTeX = "";
+
+var tuiIconToolbarTransparent = "";
+
+var tuiIconToolbarUL = "";
+
+var tuiIconToolbarUnderline = "";
+
+var tuiIconToolbarUndo = "";
+
var tuiIconTooltip = "";
var tuiIconTooltipLarge = "";
@@ -342,4 +408,4 @@ var tuiIconWifiOffLarge = "";
-export { tuiIcon2Info, tuiIconAlertCircle2Large, tuiIconAlertCircleLarge, tuiIconArrowDown, tuiIconArrowDown2Large, tuiIconArrowDownLarge, tuiIconArrowLeft, tuiIconArrowLeftLarge, tuiIconArrowLeftLgLarge, tuiIconArrowLongDown, tuiIconArrowLongLeft, tuiIconArrowLongRight, tuiIconArrowLongUp, tuiIconArrowRight, tuiIconArrowRightLarge, tuiIconArrowRightLgLarge, tuiIconArrowUp, tuiIconArrowUp2Large, tuiIconArrowUpLarge, tuiIconAttach, tuiIconAttachLarge, tuiIconAttention, tuiIconBackCircleLarge, tuiIconBell, tuiIconBellLarge, tuiIconBookmark, tuiIconBookmarkLarge, tuiIconCalendar, tuiIconCalendarLarge, tuiIconCall, tuiIconCallIn, tuiIconCallInLarge, tuiIconCallLarge, tuiIconCallOut, tuiIconCallOutLarge, tuiIconCallTransferLarge, tuiIconCameraLarge, tuiIconCancel, tuiIconCancelCircleLarge, tuiIconCard, tuiIconCardsLarge, tuiIconChartBar, tuiIconChartLarge, tuiIconChartLineLarge, tuiIconCheck, tuiIconCheckCircle, tuiIconCheckCircle2Large, tuiIconCheckCircleLarge, tuiIconCheckLarge, tuiIconCheckList, tuiIconCloseCircleLarge, tuiIconCloseLarge, tuiIconCloseLgLarge, tuiIconCloud, tuiIconCode, tuiIconCodeLarge, tuiIconCollapse, tuiIconComment, tuiIconCommentLarge, tuiIconCompanyLarge, tuiIconCopy, tuiIconCopyLarge, tuiIconDeleteLarge, tuiIconDesktopLarge, tuiIconDislikeLarge, tuiIconDone, tuiIconDownload, tuiIconDownloadLarge, tuiIconDraft, tuiIconDragLarge, tuiIconEdit, tuiIconEdit2Large, tuiIconExpand, tuiIconExternal, tuiIconExternalLarge, tuiIconEyeClosed, tuiIconEyeOpen, tuiIconFile, tuiIconFileLarge, tuiIconFilter, tuiIconFilterLarge, tuiIconFlag, tuiIconFlagLarge, tuiIconFolder, tuiIconFolderLarge, tuiIconFrameLarge, tuiIconGeoLarge, tuiIconHeart, tuiIconHeartLarge, tuiIconHelpCircleLarge, tuiIconHideLarge, tuiIconImgLarge, tuiIconInfo, tuiIconInfoCircleLarge, tuiIconLikeLarge, tuiIconLink, tuiIconLinkedLarge, tuiIconLock, tuiIconLockLarge, tuiIconLockOpenLarge, tuiIconLoginLarge, tuiIconLogoutLarge, tuiIconMail, tuiIconMailLarge, tuiIconMenuLarge, tuiIconMicLarge, tuiIconMicOffLarge, tuiIconMinus, tuiIconMinus2, tuiIconMinusLarge, tuiIconMobile, tuiIconMobileLarge, tuiIconMoreHorLarge, tuiIconMoreVer, tuiIconMoreVertLarge, tuiIconMusicLarge, tuiIconNavBack, tuiIconPause2, tuiIconPause2Large, tuiIconPicture, tuiIconPiechartLarge, tuiIconPin, tuiIconPlay2, tuiIconPlay2Large, tuiIconPlus, tuiIconPlusCircleLarge, tuiIconPlusLarge, tuiIconPrintLarge, tuiIconRedo, tuiIconRefresh, tuiIconRenewLarge, tuiIconRotate, tuiIconSearch, tuiIconSearchLarge, tuiIconSettings, tuiIconSettings2Large, tuiIconShowLarge, tuiIconSortDown, tuiIconSortUp, tuiIconSound, tuiIconSoundLarge, tuiIconSoundOff, tuiIconSoundOffLarge, tuiIconStar, tuiIconStarLarge, tuiIconStop, tuiIconStopLarge, tuiIconStructureLarge, tuiIconSubitem, tuiIconSublevelLarge, tuiIconTime, tuiIconTimeLarge, tuiIconToggleOff, tuiIconToggleOffLarge, tuiIconToggleOn, tuiIconToggleOnLarge, tuiIconTooltip, tuiIconTooltipLarge, tuiIconTrash, tuiIconTrashLarge, tuiIconUndo, tuiIconUndoLarge, tuiIconUpload, tuiIconUploadLarge, tuiIconUser, tuiIconUsers, tuiIconVideo, tuiIconVideoLarge, tuiIconViewListLarge, tuiIconWarningLarge, tuiIconWifiOffLarge, tuiIconWifiOnLarge };
+export { tuiIcon2Info, tuiIconAlertCircle2Large, tuiIconAlertCircleLarge, tuiIconArrowDown, tuiIconArrowDown2Large, tuiIconArrowDownLarge, tuiIconArrowLeft, tuiIconArrowLeftLarge, tuiIconArrowLeftLgLarge, tuiIconArrowLongDown, tuiIconArrowLongDownLeft, tuiIconArrowLongDownRight, tuiIconArrowLongLeft, tuiIconArrowLongRight, tuiIconArrowLongUp, tuiIconArrowLongUpLeft, tuiIconArrowLongUpRight, tuiIconArrowRight, tuiIconArrowRightLarge, tuiIconArrowRightLgLarge, tuiIconArrowUp, tuiIconArrowUp2Large, tuiIconArrowUpLarge, tuiIconAttach, tuiIconAttachLarge, tuiIconAttention, tuiIconBackCircleLarge, tuiIconBell, tuiIconBellLarge, tuiIconBookmark, tuiIconBookmarkLarge, tuiIconCalendar, tuiIconCalendarLarge, tuiIconCall, tuiIconCallIn, tuiIconCallInLarge, tuiIconCallLarge, tuiIconCallOut, tuiIconCallOutLarge, tuiIconCallTransferLarge, tuiIconCameraLarge, tuiIconCancel, tuiIconCancelCircleLarge, tuiIconCard, tuiIconCardsLarge, tuiIconChartBar, tuiIconChartLarge, tuiIconChartLineLarge, tuiIconCheck, tuiIconCheckCircle, tuiIconCheckCircle2Large, tuiIconCheckCircleLarge, tuiIconCheckLarge, tuiIconCheckList, tuiIconCloseCircleLarge, tuiIconCloseLarge, tuiIconCloseLgLarge, tuiIconCloud, tuiIconCode, tuiIconCodeLarge, tuiIconCollapse, tuiIconComment, tuiIconCommentLarge, tuiIconCompanyLarge, tuiIconCopy, tuiIconCopyLarge, tuiIconDeleteLarge, tuiIconDesktopLarge, tuiIconDislikeLarge, tuiIconDone, tuiIconDownload, tuiIconDownloadLarge, tuiIconDraft, tuiIconDragLarge, tuiIconEdit, tuiIconEdit2Large, tuiIconExpand, tuiIconExternal, tuiIconExternalLarge, tuiIconEyeClosed, tuiIconEyeOpen, tuiIconFile, tuiIconFileLarge, tuiIconFilter, tuiIconFilterLarge, tuiIconFlag, tuiIconFlagLarge, tuiIconFolder, tuiIconFolderLarge, tuiIconFrameLarge, tuiIconGeoLarge, tuiIconHeart, tuiIconHeartLarge, tuiIconHelpCircleLarge, tuiIconHideLarge, tuiIconImgLarge, tuiIconInfo, tuiIconInfoCircleLarge, tuiIconLikeLarge, tuiIconLink, tuiIconLinkedLarge, tuiIconLock, tuiIconLockLarge, tuiIconLockOpenLarge, tuiIconLoginLarge, tuiIconLogoutLarge, tuiIconMail, tuiIconMailLarge, tuiIconMenuLarge, tuiIconMicLarge, tuiIconMicOffLarge, tuiIconMinus, tuiIconMinus2, tuiIconMinusLarge, tuiIconMobile, tuiIconMobileLarge, tuiIconMoreHorLarge, tuiIconMoreVer, tuiIconMoreVertLarge, tuiIconMusicLarge, tuiIconNavBack, tuiIconPause2, tuiIconPause2Large, tuiIconPicture, tuiIconPiechartLarge, tuiIconPin, tuiIconPlay2, tuiIconPlay2Large, tuiIconPlus, tuiIconPlusCircleLarge, tuiIconPlusLarge, tuiIconPrintLarge, tuiIconRedo, tuiIconRefresh, tuiIconRenewLarge, tuiIconRotate, tuiIconSearch, tuiIconSearchLarge, tuiIconSettings, tuiIconSettings2Large, tuiIconShowLarge, tuiIconSortDown, tuiIconSortUp, tuiIconSound, tuiIconSoundLarge, tuiIconSoundOff, tuiIconSoundOffLarge, tuiIconStar, tuiIconStarLarge, tuiIconStop, tuiIconStopLarge, tuiIconStructureLarge, tuiIconSubitem, tuiIconSublevelLarge, tuiIconTime, tuiIconTimeLarge, tuiIconToggleOff, tuiIconToggleOffLarge, tuiIconToggleOn, tuiIconToggleOnLarge, tuiIconToolbarAttach, tuiIconToolbarBold, tuiIconToolbarClearFormat, tuiIconToolbarCode, tuiIconToolbarColor, tuiIconToolbarFont, tuiIconToolbarFormat, tuiIconToolbarHilite, tuiIconToolbarHr, tuiIconToolbarImg, tuiIconToolbarIndent, tuiIconToolbarItalic, tuiIconToolbarJustifyCenter, tuiIconToolbarJustifyFull, tuiIconToolbarJustifyLeft, tuiIconToolbarJustifyRight, tuiIconToolbarLink, tuiIconToolbarOL, tuiIconToolbarOutdent, tuiIconToolbarQuote, tuiIconToolbarRedo, tuiIconToolbarStrikeThrough, tuiIconToolbarSubscript, tuiIconToolbarSuperscript, tuiIconToolbarTeX, tuiIconToolbarTransparent, tuiIconToolbarUL, tuiIconToolbarUnderline, tuiIconToolbarUndo, tuiIconTooltip, tuiIconTooltipLarge, tuiIconTrash, tuiIconTrashLarge, tuiIconUndo, tuiIconUndoLarge, tuiIconUpload, tuiIconUploadLarge, tuiIconUser, tuiIconUsers, tuiIconVideo, tuiIconVideoLarge, tuiIconViewListLarge, tuiIconWarningLarge, tuiIconWifiOffLarge, tuiIconWifiOnLarge };
diff --git a/projects/icons/src/constants/icons.ts b/projects/icons/constants/icons.ts
similarity index 98%
rename from projects/icons/src/constants/icons.ts
rename to projects/icons/constants/icons.ts
index c8c326c1250a..6aca37e3cc29 100644
--- a/projects/icons/src/constants/icons.ts
+++ b/projects/icons/constants/icons.ts
@@ -28,7 +28,7 @@ import {
tuiIconToggleOffLarge,
tuiIconTooltip,
tuiIconTrashLarge,
-} from '../icons/all';
+} from '../all';
export const tuiCoreIcons = {
tuiIconArrowRight,
diff --git a/projects/icons/ng-package.json b/projects/icons/ng-package.json
index f62b94fb1f88..14ba68779e0b 100644
--- a/projects/icons/ng-package.json
+++ b/projects/icons/ng-package.json
@@ -1,7 +1,8 @@
{
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/icons",
+ "assets": ["src"],
"lib": {
- "entryFile": "src/public-api.ts"
+ "entryFile": "./public-api.ts"
}
}
diff --git a/projects/icons/src/public-api.ts b/projects/icons/public-api.ts
similarity index 74%
rename from projects/icons/src/public-api.ts
rename to projects/icons/public-api.ts
index 73bde9eddd55..d259890383b8 100644
--- a/projects/icons/src/public-api.ts
+++ b/projects/icons/public-api.ts
@@ -1,5 +1,5 @@
/**
* Public API Surface of @taiga-ui/icons
*/
-export * from './icons/all';
+export * from './all';
export * from './constants/icons';
diff --git a/scripts/compileIcons.ts b/projects/icons/scripts/compile-icons.ts
similarity index 81%
rename from scripts/compileIcons.ts
rename to projects/icons/scripts/compile-icons.ts
index ca7bc7f252b7..92b8110baf41 100644
--- a/scripts/compileIcons.ts
+++ b/projects/icons/scripts/compile-icons.ts
@@ -1,13 +1,11 @@
import {readdirSync, unlinkSync, writeFileSync} from 'fs';
import {rollup} from 'rollup';
-import {rollupSvgo} from './rollupSvgo';
+import {rollupSvgo} from './rollup-svgo';
const typescript = require('rollup-plugin-typescript2');
-
-const projectPath = process.argv[2];
-const hasSrc = projectPath.includes('icons');
-const allToCompilePath = `${projectPath}${hasSrc ? '/src' : ''}/icons/all-to-compile.ts`;
-const iconsSrc = `${projectPath}${hasSrc ? '/src' : ''}/icons/src/`;
+const projectPath = 'projects/icons';
+const allToCompilePath = `${projectPath}/all-to-compile.ts`;
+const iconsSrc = `${projectPath}/src/`;
const inputOptions = {
input: allToCompilePath,
@@ -39,7 +37,7 @@ async function build(): Promise {
await bundle.write({
format: 'es',
- file: projectPath + '/src/icons/all.ts',
+ file: projectPath + '/all.ts',
});
deleteAllToCompileFile();
@@ -56,7 +54,7 @@ function prepareAllToCompileFile() {
}.svg';\n`
);
}, '')}
-
+
export {
${icons.reduce((acc, el) => {
return acc + `${el.split('.')[0]},\n`;
diff --git a/projects/icons/scripts/copy-icons.js b/projects/icons/scripts/copy-icons.js
deleted file mode 100644
index 30357620f94b..000000000000
--- a/projects/icons/scripts/copy-icons.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const fs = require('fs-extra');
-const {resolve} = require('path');
-
-fs.copy(resolve(__dirname, '..', 'src/icons/src'), './dist/icons/src');
diff --git a/projects/icons/scripts/process-icons.js b/projects/icons/scripts/process-icons.js
new file mode 100644
index 000000000000..629be2a4e0e8
--- /dev/null
+++ b/projects/icons/scripts/process-icons.js
@@ -0,0 +1,68 @@
+const fs = require('fs');
+const glob = require('glob');
+const WIDTH_SEARCH = 'width="';
+const HEIGHT_SEARCH = 'height="';
+const START = ' {
+ files.forEach(file => {
+ const src = String(fs.readFileSync(file));
+ const wrapped = wrapIcon(src, file.replace('.svg', ''));
+ const final =
+ typeof wrapped === 'string'
+ ? wrapped.replace('${wrapped.src}`;
+
+ fs.writeFileSync(file, final);
+ });
+ });
+}
+
+function wrapIcon(source, name) {
+ const indexOfSTART = source.indexOf(START);
+ const src = source.substring(indexOfSTART);
+ const attibutes = src.substring(indexOfSTART, src.indexOf('>', indexOfSTART));
+
+ if (
+ !attibutes ||
+ !attibutes.includes(WIDTH_SEARCH) ||
+ !attibutes.includes(HEIGHT_SEARCH)
+ ) {
+ return '';
+ }
+
+ const indexOfWidth = attibutes.indexOf(WIDTH_SEARCH);
+ const indexOfHeight = attibutes.indexOf(HEIGHT_SEARCH);
+ const widthOffset = indexOfWidth + WIDTH_SEARCH.length;
+ const heightOffset = indexOfHeight + HEIGHT_SEARCH.length;
+ const widthString = attibutes.substring(
+ widthOffset,
+ attibutes.indexOf('"', widthOffset),
+ );
+ const heightString = attibutes.substring(
+ heightOffset,
+ attibutes.indexOf('"', heightOffset),
+ );
+
+ if (
+ !heightString ||
+ !widthString ||
+ widthString.includes('%') ||
+ heightString.includes('%')
+ ) {
+ return src.replace(START, `