From 3eb9d6ac35b3eb93d5c357f5294e1f922ae157f3 Mon Sep 17 00:00:00 2001 From: waterplea Date: Mon, 7 Oct 2024 18:12:51 +0400 Subject: [PATCH] fix(addon-table): drop legacy package dependency --- projects/addon-table/components/table/td/td.component.ts | 8 ++------ projects/legacy/classes/control.ts | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/projects/addon-table/components/table/td/td.component.ts b/projects/addon-table/components/table/td/td.component.ts index 936b8638fdc2..79fdb238205b 100644 --- a/projects/addon-table/components/table/td/td.component.ts +++ b/projects/addon-table/components/table/td/td.component.ts @@ -1,6 +1,5 @@ import {ChangeDetectionStrategy, Component, ContentChild} from '@angular/core'; import {TuiControl} from '@taiga-ui/cdk/classes'; -import {AbstractTuiControl} from '@taiga-ui/legacy/classes'; @Component({ standalone: true, @@ -9,13 +8,10 @@ import {AbstractTuiControl} from '@taiga-ui/legacy/classes'; styleUrls: ['./td.style.less'], changeDetection: ChangeDetectionStrategy.OnPush, host: { - '[class._editable]': 'current || legacy', + '[class._editable]': 'control', }, }) export class TuiTableTd { @ContentChild(TuiControl) - protected readonly current: unknown; - - @ContentChild(AbstractTuiControl) - protected readonly legacy: unknown; + protected readonly control: unknown; } diff --git a/projects/legacy/classes/control.ts b/projects/legacy/classes/control.ts index 63c74417f01d..5157cc31df6b 100644 --- a/projects/legacy/classes/control.ts +++ b/projects/legacy/classes/control.ts @@ -4,7 +4,7 @@ import {ChangeDetectorRef, DestroyRef, Directive, inject, Input} from '@angular/ import {takeUntilDestroyed} from '@angular/core/rxjs-interop'; import type {AbstractControl, ControlValueAccessor} from '@angular/forms'; import {NgControl, NgModel} from '@angular/forms'; -import {TuiValueTransformer} from '@taiga-ui/cdk/classes'; +import {TuiControl, TuiValueTransformer} from '@taiga-ui/cdk/classes'; import {EMPTY_FUNCTION} from '@taiga-ui/cdk/constants'; import {tuiIsPresent, tuiProvide} from '@taiga-ui/cdk/utils/miscellaneous'; import { @@ -255,6 +255,6 @@ export abstract class AbstractTuiControl } } -export function tuiAsControl(control: Type>): Provider { - return tuiProvide(AbstractTuiControl, control); +export function tuiAsControl(control: Type>): Provider[] { + return [tuiProvide(AbstractTuiControl, control), tuiProvide(TuiControl, control)]; }