diff --git a/projects/addon-editor/components/editor-new/editor-new.component.ts b/projects/addon-editor/components/editor-new/editor-new.component.ts
index 01caf11501aa..76708b104fa3 100644
--- a/projects/addon-editor/components/editor-new/editor-new.component.ts
+++ b/projects/addon-editor/components/editor-new/editor-new.component.ts
@@ -102,10 +102,6 @@ export class TuiEditorNewComponent
);
}
- onHovered(hovered: boolean): void {
- this.updateHovered(hovered);
- }
-
selectLinkIfClosest(): void {
if (this.getMarkedLinkBeforeSelectClosest()) {
this.editor?.selectClosest();
diff --git a/projects/addon-editor/components/editor-new/editor-new.module.ts b/projects/addon-editor/components/editor-new/editor-new.module.ts
index 1e02bccf9d57..ecba75fa859b 100644
--- a/projects/addon-editor/components/editor-new/editor-new.module.ts
+++ b/projects/addon-editor/components/editor-new/editor-new.module.ts
@@ -3,12 +3,7 @@ import {NgModule} from '@angular/core';
import {TuiEditLinkModule} from '@taiga-ui/addon-editor/components/edit-link';
import {TuiToolbarNewModule} from '@taiga-ui/addon-editor/components/toolbar-new';
import {TuiTiptapEditorModule} from '@taiga-ui/addon-editor/directives';
-import {
- TuiActiveZoneModule,
- TuiHoveredModule,
- TuiItemDirective,
- TuiLetModule,
-} from '@taiga-ui/cdk';
+import {TuiActiveZoneModule, TuiItemDirective, TuiLetModule} from '@taiga-ui/cdk';
import {TuiScrollbarModule, TuiWrapperModule} from '@taiga-ui/core';
import {TuiDropdownSelectionModule} from '@taiga-ui/kit';
@@ -26,7 +21,6 @@ import {TuiEditorPortalHostComponent} from './portal/editor-portal-host.componen
CommonModule,
TuiToolbarNewModule,
TuiWrapperModule,
- TuiHoveredModule,
TuiScrollbarModule,
TuiEditLinkModule,
TuiActiveZoneModule,
diff --git a/projects/addon-editor/components/editor/editor.component.ts b/projects/addon-editor/components/editor/editor.component.ts
index 923235e6eda8..ebe55496eb1a 100644
--- a/projects/addon-editor/components/editor/editor.component.ts
+++ b/projects/addon-editor/components/editor/editor.component.ts
@@ -208,10 +208,6 @@ export class TuiEditorComponent extends AbstractTuiControl implements On
this.updateValue(value.trim() === '
' ? '' : value);
}
- onHovered(hovered: boolean): void {
- this.updateHovered(hovered);
- }
-
onFocusedChange(focused: boolean): void {
this.updateFocused(focused);
this.linkDropdownEnabled = focused || this.linkDropdownEnabled;
diff --git a/projects/addon-editor/components/editor/editor.module.ts b/projects/addon-editor/components/editor/editor.module.ts
index 2b0032082538..2d7f775b2a9d 100644
--- a/projects/addon-editor/components/editor/editor.module.ts
+++ b/projects/addon-editor/components/editor/editor.module.ts
@@ -9,12 +9,7 @@ import {
import {TuiToolbarModule} from '@taiga-ui/addon-editor/components/toolbar';
import {TuiToolbarNewModule} from '@taiga-ui/addon-editor/components/toolbar-new';
import {TuiDesignModeModule} from '@taiga-ui/addon-editor/directives/design-mode';
-import {
- TuiActiveZoneModule,
- TuiHoveredModule,
- TuiItemDirective,
- TuiLetModule,
-} from '@taiga-ui/cdk';
+import {TuiActiveZoneModule, TuiItemDirective, TuiLetModule} from '@taiga-ui/cdk';
import {
TuiButtonModule,
TuiLinkModule,
@@ -30,7 +25,6 @@ import {TuiEditorComponent} from './editor.component';
CommonModule,
FormsModule,
TuiLetModule,
- TuiHoveredModule,
TuiActiveZoneModule,
TuiWrapperModule,
TuiScrollbarModule,
diff --git a/projects/addon-editor/components/editor/editor.template.html b/projects/addon-editor/components/editor/editor.template.html
index 3b8ed173bc07..a181f15bc518 100644
--- a/projects/addon-editor/components/editor/editor.template.html
+++ b/projects/addon-editor/components/editor/editor.template.html
@@ -4,13 +4,12 @@
class="t-outline"
[readOnly]="readOnly"
[disabled]="disabled"
- [focused]="computedFocused"
- [hover]="computedHovered"
+ [focus]="computedFocused"
+ [hover]="pseudoHover"
[invalid]="computedInvalid"
>
diff --git a/projects/addon-editor/components/input-color/input-color.component.ts b/projects/addon-editor/components/input-color/input-color.component.ts
index 717d120f0d2d..e22e14638d9b 100644
--- a/projects/addon-editor/components/input-color/input-color.component.ts
+++ b/projects/addon-editor/components/input-color/input-color.component.ts
@@ -103,14 +103,6 @@ export class TuiInputColorComponent
this.updateFocused(focused);
}
- onHovered(hovered: boolean): void {
- this.updateHovered(hovered);
- }
-
- onPressed(pressed: boolean): void {
- this.updatePressed(pressed);
- }
-
protected getFallbackValue(): string {
return `#000000`;
}
diff --git a/projects/addon-editor/components/input-color/input-color.template.html b/projects/addon-editor/components/input-color/input-color.template.html
index 3003e17bbdaf..68c3c78f58ef 100644
--- a/projects/addon-editor/components/input-color/input-color.template.html
+++ b/projects/addon-editor/components/input-color/input-color.template.html
@@ -7,9 +7,9 @@
tuiTextfieldAutocomplete="off"
class="t-textfield"
[tuiTextfieldIconLeft]="color"
- [pseudoFocused]="computedFocused"
- [pseudoHovered]="pseudoHovered"
- [pseudoPressed]="pseudoPressed"
+ [pseudoFocus]="computedFocused"
+ [pseudoHover]="pseudoHover"
+ [pseudoActive]="pseudoActive"
[invalid]="computedInvalid"
[focusable]="focusable"
[nativeId]="nativeId"
@@ -18,8 +18,6 @@
[value]="value"
(valueChange)="onValueChange($event)"
(focusedChange)="onFocused($event)"
- (hoveredChange)="onHovered($event)"
- (pressedChange)="onPressed($event)"
>
diff --git a/projects/addon-editor/components/toolbar-new/toolbar-new.template.html b/projects/addon-editor/components/toolbar-new/toolbar-new.template.html
index 2d61e2fd3de3..e5f09d42d7d0 100644
--- a/projects/addon-editor/components/toolbar-new/toolbar-new.template.html
+++ b/projects/addon-editor/components/toolbar-new/toolbar-new.template.html
@@ -102,7 +102,7 @@
[tuiHint]="texts.quote"
[tuiHintId]="quoteBtn.id"
[tuiDescribedBy]="quoteBtn.id"
- [pseudoPressed]="blockquote"
+ [pseudoActive]="blockquote"
[disabled]="unorderedList || orderedList"
[focusable]="false"
(click)="toggleQuote()"
@@ -128,7 +128,7 @@
[tuiHint]="texts.link"
[tuiHintId]="linkBtn.id"
[tuiDescribedBy]="linkBtn.id"
- [pseudoPressed]="link.open || a"
+ [pseudoActive]="link.open || a"
[focusable]="link.open"
>
@@ -177,7 +177,7 @@
[tuiHint]="texts.subscript"
[tuiHintId]="subBtn.id"
[tuiDescribedBy]="subBtn.id"
- [pseudoPressed]="subscript"
+ [pseudoActive]="subscript"
[focusable]="false"
(click)="toggleSubscript()"
>
@@ -196,7 +196,7 @@
[tuiHint]="texts.superscript"
[tuiHintId]="supBtn.id"
[tuiDescribedBy]="supBtn.id"
- [pseudoPressed]="superscript"
+ [pseudoActive]="superscript"
[focusable]="false"
(click)="toggleSuperscript()"
>
diff --git a/projects/addon-editor/components/toolbar-tools/align-content/align-content.template.html b/projects/addon-editor/components/toolbar-tools/align-content/align-content.template.html
index 82d076c23656..5979f360f000 100644
--- a/projects/addon-editor/components/toolbar-tools/align-content/align-content.template.html
+++ b/projects/addon-editor/components/toolbar-tools/align-content/align-content.template.html
@@ -16,7 +16,7 @@
[tuiHint]="texts.justify"
[tuiHintId]="alignBtn.id"
[tuiDescribedBy]="alignBtn.id"
- [pseudoPressed]="align.open"
+ [pseudoActive]="align.open"
[focusable]="align.open"
>
@@ -28,7 +28,7 @@
icon="tuiIconAlignLeftLarge"
appearance="icon"
class="t-option t-option_margin"
- [pseudoPressed]="alignState.left"
+ [pseudoActive]="alignState.left"
[tuiHint]="texts.justifyLeft"
(click)="editor.onAlign('left')"
>
@@ -39,7 +39,7 @@
icon="tuiIconAlignCenterLarge"
appearance="icon"
class="t-option t-option_margin"
- [pseudoPressed]="alignState.center"
+ [pseudoActive]="alignState.center"
[tuiHint]="texts.justifyCenter"
(click)="editor.onAlign('center')"
>
@@ -50,7 +50,7 @@
icon="tuiIconAlignRightLarge"
appearance="icon"
class="t-option t-option_margin"
- [pseudoPressed]="alignState.right"
+ [pseudoActive]="alignState.right"
[tuiHint]="texts.justifyRight"
(click)="editor.onAlign('right')"
>
@@ -61,7 +61,7 @@
icon="tuiIconAlignJustifyLarge"
appearance="icon"
class="t-option t-option_margin"
- [pseudoPressed]="alignState.justify"
+ [pseudoActive]="alignState.justify"
[tuiHint]="texts.justifyFull"
(click)="editor.onAlign('justify')"
>
diff --git a/projects/addon-editor/components/toolbar-tools/code/code.component.html b/projects/addon-editor/components/toolbar-tools/code/code.component.html
index bfe4b8df9888..990728e833b5 100644
--- a/projects/addon-editor/components/toolbar-tools/code/code.component.html
+++ b/projects/addon-editor/components/toolbar-tools/code/code.component.html
@@ -13,7 +13,7 @@
[tuiHint]="hintText$ | async"
[tuiHintId]="codeBtn.id"
[tuiDescribedBy]="codeBtn.id"
- [pseudoPressed]="codes.open || (insideCode$ | async)"
+ [pseudoActive]="codes.open || (insideCode$ | async)"
[focusable]="codes.open"
>
diff --git a/projects/addon-editor/components/toolbar-tools/font-size/font-size.template.html b/projects/addon-editor/components/toolbar-tools/font-size/font-size.template.html
index f4a2870632da..4e60d4c1d4cb 100644
--- a/projects/addon-editor/components/toolbar-tools/font-size/font-size.template.html
+++ b/projects/addon-editor/components/toolbar-tools/font-size/font-size.template.html
@@ -13,7 +13,7 @@
[tuiHint]="fontText$ | async"
[tuiHintId]="fontsBtn.id"
[tuiDescribedBy]="fontsBtn.id"
- [pseudoPressed]="fonts.open"
+ [pseudoActive]="fonts.open"
[focusable]="fonts.open"
>
diff --git a/projects/addon-editor/components/toolbar-tools/font-style/font-style.template.html b/projects/addon-editor/components/toolbar-tools/font-style/font-style.template.html
index 17d4e95c5f4e..830c025fb0ac 100644
--- a/projects/addon-editor/components/toolbar-tools/font-style/font-style.template.html
+++ b/projects/addon-editor/components/toolbar-tools/font-style/font-style.template.html
@@ -17,7 +17,7 @@
[tuiHint]="texts.fontStyle"
[tuiHintId]="formatBtn.id"
[tuiDescribedBy]="formatBtn.id"
- [pseudoPressed]="format.open || state.bold || state.italic || state.underline || state.strike"
+ [pseudoActive]="format.open || state.bold || state.italic || state.underline || state.strike"
[focusable]="format.open"
>
@@ -31,7 +31,7 @@
appearance="icon"
class="t-option t-option_margin"
[tuiHint]="texts.bold"
- [pseudoPressed]="state.bold"
+ [pseudoActive]="state.bold"
(click)="editor.toggleBold()"
>
diff --git a/projects/addon-editor/components/toolbar-tools/highlight-color/highlight-color.template.html b/projects/addon-editor/components/toolbar-tools/highlight-color/highlight-color.template.html
index 50c87f263e7c..1410bb84ac62 100644
--- a/projects/addon-editor/components/toolbar-tools/highlight-color/highlight-color.template.html
+++ b/projects/addon-editor/components/toolbar-tools/highlight-color/highlight-color.template.html
@@ -18,7 +18,7 @@
[tuiHint]="backColorText$ | async"
[tuiHintId]="hiliteBtn.id"
[tuiDescribedBy]="hiliteBtn.id"
- [pseudoPressed]="hilite.open"
+ [pseudoActive]="hilite.open"
[focusable]="hilite.open"
>
@@ -30,7 +30,7 @@
appearance="icon"
class="t-option t-option_margin"
[tuiHint]="texts.unorderedList"
- [pseudoPressed]="listState.unordered"
+ [pseudoActive]="listState.unordered"
(click)="editor.toggleUnorderedList()"
>
diff --git a/projects/addon-editor/components/toolbar-tools/text-color/text-color.template.html b/projects/addon-editor/components/toolbar-tools/text-color/text-color.template.html
index ac171d5e6746..98409166c1e9 100644
--- a/projects/addon-editor/components/toolbar-tools/text-color/text-color.template.html
+++ b/projects/addon-editor/components/toolbar-tools/text-color/text-color.template.html
@@ -18,7 +18,7 @@
[tuiHint]="foreColorText$ | async"
[tuiHintId]="colorBtn.id"
[tuiDescribedBy]="colorBtn.id"
- [pseudoPressed]="color.open"
+ [pseudoActive]="color.open"
[focusable]="color.open"
>
@@ -201,7 +201,7 @@
[tuiHint]="texts.justify"
[tuiHintId]="alignBtn.id"
[tuiDescribedBy]="alignBtn.id"
- [pseudoPressed]="align.open"
+ [pseudoActive]="align.open"
[focusable]="align.open"
(keydown.arrowLeft.prevent)="onArrowLeft()"
(keydown.arrowRight.prevent)="onArrowRight()"
@@ -274,7 +274,7 @@
[tuiHint]="texts.list"
[tuiHintId]="listBtn.id"
[tuiDescribedBy]="listBtn.id"
- [pseudoPressed]="list.open || unorderedList || orderedList"
+ [pseudoActive]="list.open || unorderedList || orderedList"
[focusable]="list.open"
(keydown.arrowLeft.prevent)="onArrowLeft()"
(keydown.arrowRight.prevent)="onArrowRight()"
@@ -292,7 +292,7 @@
appearance="icon"
class="t-button t-button_margin"
[tuiHint]="texts.unorderedList"
- [pseudoPressed]="unorderedList"
+ [pseudoActive]="unorderedList"
(click)="toggleUnorderedList()"
>