chore: fixup

taiga-family · Jun 10, 2024 · 43ea1e2 · 43ea1e2
1 parent 72790b6
commit 43ea1e2
Show file tree

Hide file tree

Showing 28 changed files with 74 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/projects/demo/src/app/pages/color-picker/examples/1/index.ts b/projects/demo/src/app/pages/color-picker/examples/1/index.ts
@@ -1,7 +1,7 @@
 import {ChangeDetectionStrategy, Component} from '@angular/core';
 import {FormsModule} from '@angular/forms';
-import {TuiTextfieldControllerModule} from '@taiga-ui/core';
 import {TUI_EDITOR_DEFAULT_EDITOR_COLORS, TuiInputColorComponent} from '@taiga-ui/editor';
+import {TuiTextfieldControllerModule} from '@taiga-ui/legacy';
 
 @Component({
     standalone: true,

diff --git a/projects/demo/src/app/pages/color-picker/examples/2/index.ts b/projects/demo/src/app/pages/color-picker/examples/2/index.ts
@@ -2,8 +2,9 @@ import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import type {SafeStyle} from '@angular/platform-browser';
 import {DomSanitizer} from '@angular/platform-browser';
 import {TuiActiveZoneDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective} from '@taiga-ui/core';
 import {TuiColorSelector} from '@taiga-ui/editor';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 
 @Component({
     standalone: true,

diff --git a/projects/demo/src/app/pages/color-picker/examples/3/index.ts b/projects/demo/src/app/pages/color-picker/examples/3/index.ts
@@ -1,7 +1,8 @@
 import {AsyncPipe} from '@angular/common';
 import {ChangeDetectionStrategy, Component} from '@angular/core';
-import {TuiButtonDirective, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective} from '@taiga-ui/core';
 import {TuiPalette} from '@taiga-ui/editor';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {BehaviorSubject} from 'rxjs';
 
 @Component({

diff --git a/projects/demo/src/app/pages/color-picker/examples/4/index.ts b/projects/demo/src/app/pages/color-picker/examples/4/index.ts
@@ -1,12 +1,12 @@
 import {ChangeDetectionStrategy, Component} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {MaskitoModule} from '@maskito/angular';
+import {TuiSvgComponent} from '@taiga-ui/core';
 import {
-    TuiSvgComponent,
+    TuiInputModule,
     TuiTextfieldControllerModule,
     TuiWrapperModule,
-} from '@taiga-ui/core';
-import {TuiInputModule} from '@taiga-ui/legacy';
+} from '@taiga-ui/legacy';
 
 @Component({
     standalone: true,

diff --git a/.../custom-tool/color-picker/examples/1/custom-color-picker/custom-color-picker.component.ts b/.../custom-tool/color-picker/examples/1/custom-color-picker/custom-color-picker.component.ts
@@ -1,13 +1,14 @@
 import {AsyncPipe} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core';
 import {TuiActiveZoneDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective} from '@taiga-ui/core';
 import type {AbstractTuiEditor} from '@taiga-ui/editor';
 import {
     TUI_EDITOR_OPTIONS,
     TuiColorSelector,
     TuiTiptapEditorService,
 } from '@taiga-ui/editor';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {distinctUntilChanged, map, share} from 'rxjs';
 
 @Component({

diff --git a/...emo/src/app/pages/custom-tool/paste-emoji/examples/1/smiles-tool/smiles-tool.component.ts b/...emo/src/app/pages/custom-tool/paste-emoji/examples/1/smiles-tool/smiles-tool.component.ts
@@ -1,8 +1,9 @@
 import {NgForOf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {TuiActiveZoneDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective} from '@taiga-ui/core';
 import {TuiTiptapEditorService} from '@taiga-ui/editor';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 
 @Component({
     standalone: true,

diff --git a/.../demo/src/app/pages/custom-tool/paste-image/examples/1/image-tool/image-tool.component.ts b/.../demo/src/app/pages/custom-tool/paste-image/examples/1/image-tool/image-tool.component.ts
@@ -1,10 +1,11 @@
 import {ChangeDetectionStrategy, Component, inject, ViewChild} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {TuiActiveZoneDirective, TuiAutoFocusDirective} from '@taiga-ui/cdk';
-import type {TuiHostedDropdownComponent} from '@taiga-ui/core';
-import {TuiButtonDirective, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective} from '@taiga-ui/core';
 import {TuiTiptapEditorService} from '@taiga-ui/editor';
 import {TuiInputInlineComponent} from '@taiga-ui/kit';
+import type {TuiHostedDropdownComponent} from '@taiga-ui/legacy';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 
 @Component({
     standalone: true,

diff --git a/projects/demo/src/app/pages/embed/iframe/examples/1/embed-tool/embed-tool.component.ts b/projects/demo/src/app/pages/embed/iframe/examples/1/embed-tool/embed-tool.component.ts
@@ -1,10 +1,10 @@
 import {ChangeDetectionStrategy, Component, inject, ViewChild} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {TuiActiveZoneDirective, TuiAutoFocusDirective} from '@taiga-ui/cdk';
-import type {TuiHostedDropdownComponent} from '@taiga-ui/core';
-import {TuiButtonDirective, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective} from '@taiga-ui/core';
 import {TuiTiptapEditorService} from '@taiga-ui/editor';
 import {TuiInputInlineComponent} from '@taiga-ui/kit';
+import {TuiHostedDropdownComponent, TuiHostedDropdownModule} from '@taiga-ui/legacy';
 
 @Component({
     standalone: true,

diff --git a/projects/demo/src/app/pages/embed/youtube/examples/1/youtube-tool/youtube-tool.component.ts b/projects/demo/src/app/pages/embed/youtube/examples/1/youtube-tool/youtube-tool.component.ts
@@ -1,10 +1,11 @@
 import {ChangeDetectionStrategy, Component, inject, ViewChild} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {TuiActiveZoneDirective, TuiAutoFocusDirective} from '@taiga-ui/cdk';
-import type {TuiHostedDropdownComponent} from '@taiga-ui/core';
-import {TuiButtonDirective, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective} from '@taiga-ui/core';
 import {TuiTiptapEditorService} from '@taiga-ui/editor';
 import {TuiInputInlineComponent} from '@taiga-ui/kit';
+import type {TuiHostedDropdownComponent} from '@taiga-ui/legacy';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 
 @Component({
     standalone: true,

diff --git a/projects/demo/src/app/pages/font/examples/3/font-size-tool/font-size-tool.component.ts b/projects/demo/src/app/pages/font/examples/3/font-size-tool/font-size-tool.component.ts
@@ -2,8 +2,9 @@ import {AsyncPipe, NgForOf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {WINDOW} from '@ng-web-apis/common';
 import {tuiPure} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiDataList, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiDataList} from '@taiga-ui/core';
 import {TuiTiptapEditorService} from '@taiga-ui/editor';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {distinctUntilChanged, map} from 'rxjs';
 
 @Component({

diff --git a/projects/editor/src/components/color-selector/color-edit/color-edit.component.ts b/projects/editor/src/components/color-selector/color-edit/color-edit.component.ts
@@ -10,15 +10,12 @@ import {FormsModule} from '@angular/forms';
 import {MaskitoModule} from '@maskito/angular';
 import type {MaskitoOptions} from '@maskito/core';
 import {tuiHexToRgb, tuiRgbToHex} from '@taiga-ui/cdk';
-import {
-    TuiDataList,
-    TuiDropdownOptionsDirective,
-    TuiPrimitiveTextfieldModule,
-    TuiTextfieldControllerModule,
-} from '@taiga-ui/core';
+import {TuiDataList, TuiDropdownOptionsDirective} from '@taiga-ui/core';
 import {
     TuiInputNumberModule,
+    TuiPrimitiveTextfieldModule,
     TuiSelectModule,
+    TuiTextfieldControllerModule,
     TuiValueAccessorModule,
 } from '@taiga-ui/legacy';
 

diff --git a/projects/editor/src/components/color-selector/color-selector.component.ts b/projects/editor/src/components/color-selector/color-selector.component.ts
@@ -10,15 +10,15 @@ import {
 import type {SafeStyle} from '@angular/platform-browser';
 import {DomSanitizer} from '@angular/platform-browser';
 import {tuiDefaultSort, tuiParseColor, tuiPure} from '@taiga-ui/cdk';
-import type {TuiHostedDropdownComponent} from '@taiga-ui/core';
 import {
     TuiButtonDirective,
     TuiDataList,
     TuiGroupDirective,
     TuiHint,
-    TuiHostedDropdownModule,
     TuiSvgComponent,
 } from '@taiga-ui/core';
+import type {TuiHostedDropdownComponent} from '@taiga-ui/legacy';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 
 import {TUI_EDITOR_OPTIONS} from '../../tokens/editor-options';
 import {TUI_EDITOR_COLOR_SELECTOR_MODE_NAMES} from '../../tokens/i18n';

diff --git a/projects/editor/src/components/editor/editor.component.ts b/projects/editor/src/components/editor/editor.component.ts
@@ -28,8 +28,8 @@ import {
     TuiDropdownDirective,
     TuiDropdownOptionsDirective,
     TuiScrollbarComponent,
-    TuiWrapperModule,
 } from '@taiga-ui/core';
+import {TuiWrapperModule} from '@taiga-ui/legacy';
 import {delay, fromEvent, throttleTime} from 'rxjs';
 
 import type {AbstractTuiEditor} from '../../abstract/editor-adapter.abstract';

diff --git a/projects/editor/src/components/input-color/input-color.component.ts b/projects/editor/src/components/input-color/input-color.component.ts
@@ -12,14 +12,14 @@ import {MaskitoDirective} from '@maskito/angular';
 import type {MaskitoOptions} from '@maskito/core';
 import type {TuiFocusableElementAccessor, TuiNativeFocusableElement} from '@taiga-ui/cdk';
 import {AbstractTuiControl, TuiActiveZoneDirective, tuiPure} from '@taiga-ui/cdk';
+import {tuiDropdownOptionsProvider} from '@taiga-ui/core';
 import {
-    tuiDropdownOptionsProvider,
     TuiHostedDropdownComponent,
     TuiHostedDropdownModule,
     TuiPrimitiveTextfieldComponent,
     TuiPrimitiveTextfieldModule,
     TuiTextfieldControllerModule,
-} from '@taiga-ui/core';
+} from '@taiga-ui/legacy';
 
 import {tuiGetGradientData} from '../../utils/get-gradient-data';
 import {tuiParseGradient} from '../../utils/parse-gradient';

diff --git a/projects/editor/src/components/toolbar-tools/align-content/align-content.component.ts b/projects/editor/src/components/toolbar-tools/align-content/align-content.component.ts
@@ -1,7 +1,8 @@
 import {AsyncPipe, NgIf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {TuiLetDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {combineLatest, map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/projects/editor/src/components/toolbar-tools/code/code.component.ts b/projects/editor/src/components/toolbar-tools/code/code.component.ts
@@ -1,11 +1,7 @@
 import {AsyncPipe, NgForOf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
-import {
-    TuiButtonDirective,
-    TuiDataList,
-    TuiHint,
-    TuiHostedDropdownModule,
-} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiDataList, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {distinctUntilChanged, map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/projects/editor/src/components/toolbar-tools/font-size/font-size.component.ts b/projects/editor/src/components/toolbar-tools/font-size/font-size.component.ts
@@ -1,12 +1,8 @@
 import {AsyncPipe, LowerCasePipe, NgClass, NgForOf, NgStyle} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {tuiPx} from '@taiga-ui/cdk';
-import {
-    TuiButtonDirective,
-    TuiDataList,
-    TuiHint,
-    TuiHostedDropdownModule,
-} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiDataList, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import type {Observable} from 'rxjs';
 import {map} from 'rxjs';
 

diff --git a/projects/editor/src/components/toolbar-tools/font-style/font-style.component.ts b/projects/editor/src/components/toolbar-tools/font-style/font-style.component.ts
@@ -1,6 +1,7 @@
 import {AsyncPipe, NgIf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {combineLatest, map} from 'rxjs';
 
 import {TUI_EDITOR_DEFAULT_TOOLS} from '../../../constants/default-editor-tools';

diff --git a/projects/editor/src/components/toolbar-tools/highlight-color/highlight-color.component.ts b/projects/editor/src/components/toolbar-tools/highlight-color/highlight-color.component.ts
@@ -1,7 +1,8 @@
 import {AsyncPipe, NgIf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core';
 import {TuiActiveZoneDirective, TuiLetDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {distinctUntilChanged, map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/projects/editor/src/components/toolbar-tools/list-configs/list-configs.component.ts b/projects/editor/src/components/toolbar-tools/list-configs/list-configs.component.ts
@@ -1,7 +1,8 @@
 import {AsyncPipe, NgIf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {TuiLetDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {combineLatest, map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/projects/editor/src/components/toolbar-tools/table-cell-color/table-cell-color.component.ts b/projects/editor/src/components/toolbar-tools/table-cell-color/table-cell-color.component.ts
@@ -1,7 +1,8 @@
 import {AsyncPipe, NgIf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core';
 import {TuiActiveZoneDirective, TuiLetDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {combineLatest, distinctUntilChanged, map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/projects/editor/src/components/toolbar-tools/table-create/table-create.component.ts b/projects/editor/src/components/toolbar-tools/table-create/table-create.component.ts
@@ -1,6 +1,7 @@
 import {AsyncPipe} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/...c/components/toolbar-tools/table-row-column-manager/table-row-column-manager.component.ts b/...c/components/toolbar-tools/table-row-column-manager/table-row-column-manager.component.ts
@@ -1,12 +1,8 @@
 import {AsyncPipe, NgForOf} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {TuiLetDirective} from '@taiga-ui/cdk';
-import {
-    TuiButtonDirective,
-    TuiDataList,
-    TuiHint,
-    TuiHostedDropdownModule,
-} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiDataList, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/projects/editor/src/components/toolbar-tools/text-color/text-color.component.ts b/projects/editor/src/components/toolbar-tools/text-color/text-color.component.ts
@@ -1,7 +1,8 @@
 import {AsyncPipe} from '@angular/common';
 import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core';
 import {TuiActiveZoneDirective, TuiLetDirective} from '@taiga-ui/cdk';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {distinctUntilChanged, map} from 'rxjs';
 
 import {TuiTiptapEditorService} from '../../../directives/tiptap-editor/tiptap-editor.service';

diff --git a/projects/editor/src/components/toolbar/toolbar.component.ts b/projects/editor/src/components/toolbar/toolbar.component.ts
@@ -17,8 +17,9 @@ import {
 } from '@angular/core';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 import {EMPTY_QUERY, tuiIsNativeFocusedIn, TuiItemDirective} from '@taiga-ui/cdk';
-import type {TuiHostedDropdownComponent} from '@taiga-ui/core';
-import {TuiButtonDirective, TuiHint, TuiHostedDropdownModule} from '@taiga-ui/core';
+import {TuiButtonDirective, TuiHint} from '@taiga-ui/core';
+import type {TuiHostedDropdownComponent} from '@taiga-ui/legacy';
+import {TuiHostedDropdownModule} from '@taiga-ui/legacy';
 import {take} from 'rxjs';
 
 import {TUI_EDITOR_DEFAULT_TOOLS} from '../../constants/default-editor-tools';

diff --git a/projects/editor/src/tokens/editor-options.ts b/projects/editor/src/tokens/editor-options.ts
@@ -1,5 +1,5 @@
 import type {Provider} from '@angular/core';
-import {tuiCreateOptions, tuiProvideOptions} from '@taiga-ui/cdk';
+import {tuiCreateToken, tuiProvideOptions} from '@taiga-ui/cdk';
 
 import {
     EDITOR_BLANK_COLOR,
@@ -125,7 +125,7 @@ export const TUI_EDITOR_DEFAULT_OPTIONS: TuiEditorOptions = {
     },
 };
 
-export const TUI_EDITOR_OPTIONS = tuiCreateOptions(TUI_EDITOR_DEFAULT_OPTIONS);
+export const TUI_EDITOR_OPTIONS = tuiCreateToken(TUI_EDITOR_DEFAULT_OPTIONS);
 
 export function tuiEditorOptionsProvider(options: Partial<TuiEditorOptions>): Provider {
     return tuiProvideOptions(TUI_EDITOR_OPTIONS, options, TUI_EDITOR_DEFAULT_OPTIONS);

diff --git a/taiga-ui b/taiga-ui