Skip to content

Commit

Permalink
refactor: use only TuiDropdown
Browse files Browse the repository at this point in the history
  • Loading branch information
splincode committed Jun 18, 2024
1 parent 9a9f71d commit c3d943e
Show file tree
Hide file tree
Showing 110 changed files with 306 additions and 528 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import {
tuiAppearanceOptionsProvider,
tuiAsDataListHost,
TuiDropdownDirective,
TuiDropdownOpenDirective,
TuiDropdownOpen,
tuiDropdownOptionsProvider,
TuiIcon,
TuiIconPipe,
Expand Down Expand Up @@ -103,7 +103,7 @@ export interface TuiCard {
TuiDropdownDirective,
TuiWithDataList,
{
directive: TuiDropdownOpenDirective,
directive: TuiDropdownOpen,
inputs: ['tuiDropdownOpen: open'],
outputs: ['tuiDropdownOpenChange: openChange'],
},
Expand Down Expand Up @@ -150,7 +150,7 @@ export class TuiInputCardGroup
protected readonly texts = toSignal(inject(TUI_INPUT_CARD_GROUPED_TEXTS));

protected readonly open: WritableSignal<boolean> = tuiDirectiveBinding(
TuiDropdownOpenDirective,
TuiDropdownOpen,
'tuiDropdownOpen',
false,
);
Expand All @@ -168,7 +168,7 @@ export class TuiInputCardGroup
computed(() => this.open() || this.focusedIn()),
);

protected readonly sub = inject(TuiDropdownOpenDirective)
protected readonly sub = inject(TuiDropdownOpen)
.tuiDropdownOpenChange.pipe(takeUntilDestroyed())
.subscribe(open => {
this.open.set(open);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
tuiWatch,
} from '@taiga-ui/cdk';
import {
TuiDropdownOptionsDirective,
TuiDropdown,
TuiGroupDirective,
TuiNotificationComponent,
TuiTextfield,
Expand Down Expand Up @@ -72,7 +72,7 @@ import {TuiDocTypeReferencePipe} from './pipes/type-reference.pipe';
TuiDocTypeReferencePipe,
TuiSelectModule,
FormsModule,
TuiDropdownOptionsDirective,
TuiDropdown,
TuiShowCleanerPipe,
TuiDataListWrapper,
TuiInspectPipe,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
TuiButton,
TuiDataList,
TuiDropdownDirective,
TuiDropdownOpenDirective,
TuiDropdownOpen,
TuiIcon,
TuiLink,
} from '@taiga-ui/core';
Expand All @@ -41,7 +41,7 @@ export interface TuiTablePagination {
PolymorpheusOutlet,
PolymorpheusTemplate,
NgForOf,
TuiDropdownOpenDirective,
TuiDropdownOpen,
TuiIcon,
TuiButton,
],
Expand Down
8 changes: 4 additions & 4 deletions projects/cdk/schematics/ng-update/v3/constants/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const CONSTANTS_TO_REPLACE: ReplacementIdentifier[] = [
moduleSpecifier: '@taiga-ui/core',
},
to: {
name: 'TuiDropdownModule',
name: 'TuiDropdown',
moduleSpecifier: '@taiga-ui/core',
},
},
Expand All @@ -108,7 +108,7 @@ export const CONSTANTS_TO_REPLACE: ReplacementIdentifier[] = [
moduleSpecifier: '@taiga-ui/kit',
},
to: {
name: 'TuiDropdownModule',
name: 'TuiDropdown',
moduleSpecifier: '@taiga-ui/core',
},
},
Expand All @@ -118,7 +118,7 @@ export const CONSTANTS_TO_REPLACE: ReplacementIdentifier[] = [
moduleSpecifier: '@taiga-ui/kit',
},
to: {
name: 'TuiDropdownModule',
name: 'TuiDropdown',
moduleSpecifier: '@taiga-ui/core',
},
},
Expand All @@ -128,7 +128,7 @@ export const CONSTANTS_TO_REPLACE: ReplacementIdentifier[] = [
moduleSpecifier: '@taiga-ui/kit',
},
to: {
name: 'TuiDropdownModule',
name: 'TuiDropdown',
moduleSpecifier: '@taiga-ui/core',
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ export const IDENTIFIERS_TO_REPLACE: ReplacementIdentifierMulti[] = [
},
{
from: {name: 'TuiHostedDropdownModule', moduleSpecifier: '@taiga-ui/core'},
to: {name: 'TuiDropdownModule', moduleSpecifier: '@taiga-ui/core'},
to: {name: 'TuiDropdown', moduleSpecifier: '@taiga-ui/core'},
},
{
from: {name: 'TuiTitleModule', moduleSpecifier: '@taiga-ui/experimental'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import { TuiHostedDropdownModule } from "@taiga-ui/core";
export class Test {
}`;

const COMPONENT_AFTER = `import { TuiDropdownModule } from "@taiga-ui/core";
const COMPONENT_AFTER = `import { TuiDropdown } from "@taiga-ui/core";
@Component({
standalone: true,
templateUrl: './test.template.html',
imports: [TuiDropdownModule]
imports: [TuiDropdown]
})
export class Test {
}`;
Expand Down
6 changes: 3 additions & 3 deletions projects/core/components/textfield/textfield.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {TuiLabel} from '@taiga-ui/core/components/label';
import {tuiAppearanceOptionsProvider} from '@taiga-ui/core/directives/appearance';
import {
TuiDropdownDirective,
TuiDropdownOpenDirective,
TuiDropdownOpen,
tuiDropdownOptionsProvider,
} from '@taiga-ui/core/directives/dropdown';
import {TuiIcons} from '@taiga-ui/core/directives/icons';
Expand Down Expand Up @@ -56,7 +56,7 @@ export interface TuiTextfieldContext<T> extends TuiContext<T> {
TuiDropdownDirective,
TuiWithDataList,
{
directive: TuiDropdownOpenDirective,
directive: TuiDropdownOpen,
inputs: ['tuiDropdownOpen: open'],
outputs: ['tuiDropdownOpenChange: openChange'],
},
Expand All @@ -70,7 +70,7 @@ export class TuiTextfieldComponent<T> implements TuiDataListHost<T> {
@ContentChild(forwardRef(() => TuiTextfieldDirective), {read: ElementRef})
private readonly el?: ElementRef<HTMLInputElement>;

private readonly dropdown = inject(TuiDropdownOpenDirective, {
private readonly dropdown = inject(TuiDropdownOpen, {
optional: true,
self: true,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {shouldCall} from '@taiga-ui/event-plugins';

import {TuiDropdownDriver} from './dropdown.driver';

function activeZoneFilter(this: TuiDropdownContextDirective, target: Element): boolean {
function activeZoneFilter(this: TuiDropdownContext, target: Element): boolean {
return !this.activeZone.contains(target);
}

Expand All @@ -16,10 +16,10 @@ function activeZoneFilter(this: TuiDropdownContextDirective, target: Element): b
TuiActiveZone,
TuiDropdownDriver,
tuiAsDriver(TuiDropdownDriver),
tuiAsRectAccessor(TuiDropdownContextDirective),
tuiAsRectAccessor(TuiDropdownContext),
],
})
export class TuiDropdownContextDirective extends TuiRectAccessor {
export class TuiDropdownContext extends TuiRectAccessor {
private readonly driver = inject(TuiDropdownDriver);
private currentRect = EMPTY_CLIENT_RECT;

Expand Down
8 changes: 4 additions & 4 deletions projects/core/directives/dropdown/dropdown-hover.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ import {tuiAsDriver, TuiDriver} from '@taiga-ui/core/classes';
import {delay, distinctUntilChanged, map, merge, of, share, switchMap, tap} from 'rxjs';

import {TUI_DROPDOWN_HOVER_OPTIONS} from './dropdown-hover.options';
import {TuiDropdownOpenDirective} from './dropdown-open.directive';
import {TuiDropdownOpen} from './dropdown-open.directive';

@Directive({
standalone: true,
selector: '[tuiDropdownHover]',
providers: [TuiActiveZone, tuiAsDriver(TuiDropdownHoverDirective)],
providers: [TuiActiveZone, tuiAsDriver(TuiDropdownHover)],
})
export class TuiDropdownHoverDirective extends TuiDriver {
export class TuiDropdownHover extends TuiDriver {
@ContentChild('tuiDropdownHost', {descendants: true, read: ElementRef})
private readonly dropdownHost?: ElementRef<HTMLElement>;

private readonly el = tuiInjectElement();
private readonly doc = inject(DOCUMENT);
private readonly options = inject(TUI_DROPDOWN_HOVER_OPTIONS);
private readonly activeZone = inject(TuiActiveZone);
private readonly open = inject(TuiDropdownOpenDirective, {optional: true});
private readonly open = inject(TuiDropdownOpen, {optional: true});
private readonly stream$ = merge(
tuiTypedFromEvent(this.doc, 'mouseover').pipe(map(tuiGetActualTarget)),
tuiTypedFromEvent(this.doc, 'mouseout').pipe(map(e => e.relatedTarget)),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {TuiDropdownDriver} from './dropdown.driver';
selector: '[tuiDropdownManual]',
providers: [TuiDropdownDriver, tuiAsDriver(TuiDropdownDriver)],
})
export class TuiDropdownManualDirective implements OnChanges {
export class TuiDropdownManual implements OnChanges {
private readonly driver = inject(TuiDropdownDriver);

@Input()
Expand Down
7 changes: 2 additions & 5 deletions projects/core/directives/dropdown/dropdown-open.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ import {filter, fromEvent, map, merge} from 'rxjs';
import {TuiDropdownDirective} from './dropdown.directive';
import {TuiDropdownDriver} from './dropdown.driver';

function shouldClose(
this: TuiDropdownOpenDirective,
event: Event | KeyboardEvent,
): boolean {
function shouldClose(this: TuiDropdownOpen, event: Event | KeyboardEvent): boolean {
return (
'key' in event &&
event.key.toLowerCase() === 'escape' &&
Expand All @@ -58,7 +55,7 @@ function shouldClose(
],
providers: [TuiDropdownDriver, tuiAsDriver(TuiDropdownDriver)],
})
export class TuiDropdownOpenDirective implements OnChanges {
export class TuiDropdownOpen implements OnChanges {
@ContentChild('tuiDropdownHost', {descendants: true, read: ElementRef})
private readonly dropdownHost?: ElementRef<HTMLElement>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {TuiDropdownService} from './dropdown.service';
standalone: true,
selector: 'ng-template[tuiDropdown]',
})
export class TuiDropdownPortalDirective implements OnDestroy {
export class TuiDropdownPortal implements OnDestroy {
private readonly template = inject(TemplateRef);
private readonly service = inject(TuiDropdownService);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@ import {TUI_VIEWPORT} from '@taiga-ui/core/tokens';
import type {TuiPoint} from '@taiga-ui/core/types';

import {TUI_DROPDOWN_OPTIONS} from './dropdown-options.directive';
import {TuiDropdownPositionDirective} from './dropdown-position.directive';
import {TuiDropdownPosition} from './dropdown-position.directive';

@Directive({
standalone: true,
selector: '[tuiDropdownSided]',
providers: [
TuiDropdownPositionDirective,
tuiAsPositionAccessor(TuiDropdownPositionSidedDirective),
],
providers: [TuiDropdownPosition, tuiAsPositionAccessor(TuiDropdownPositionSided)],
})
export class TuiDropdownPositionSidedDirective extends TuiPositionAccessor {
export class TuiDropdownPositionSided extends TuiPositionAccessor {
private readonly options = inject(TUI_DROPDOWN_OPTIONS);
private readonly viewport = inject(TUI_VIEWPORT);
private readonly vertical = inject(TuiDropdownPositionDirective);
private readonly vertical = inject(TuiDropdownPosition);

private previous = this.options.direction || 'bottom';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ import type {TuiPoint, TuiVerticalDirection} from '@taiga-ui/core/types';
import {TuiDropdownDirective} from './dropdown.directive';
import {TUI_DROPDOWN_OPTIONS} from './dropdown-options.directive';

@Directive({standalone: true, selector: '[tuiDropdownPosition]'})
export class TuiDropdownPositionDirective extends TuiPositionAccessor {
@Directive({
standalone: true,
selector: '[tuiDropdownPosition]',
})
export class TuiDropdownPosition extends TuiPositionAccessor {
private readonly options = inject(TUI_DROPDOWN_OPTIONS);
private readonly viewport = inject(TUI_VIEWPORT);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import {TuiDropdownDirective} from './dropdown.directive';
standalone: true,
selector: '[tuiDropdownSelection]',
providers: [
tuiAsDriver(TuiDropdownSelectionDirective),
tuiAsRectAccessor(TuiDropdownSelectionDirective),
tuiAsDriver(TuiDropdownSelection),
tuiAsRectAccessor(TuiDropdownSelection),
],
})
export class TuiDropdownSelectionDirective
export class TuiDropdownSelection
extends TuiDriver
implements TuiRectAccessor, OnDestroy
{
Expand Down
6 changes: 3 additions & 3 deletions projects/core/directives/dropdown/dropdown.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {map} from 'rxjs';
import {TuiDropdownDirective} from './dropdown.directive';
import {TUI_DROPDOWN_CONTEXT} from './dropdown.providers';
import {TUI_DROPDOWN_OPTIONS} from './dropdown-options.directive';
import {TuiDropdownPositionDirective} from './dropdown-position.directive';
import {TuiDropdownPosition} from './dropdown-position.directive';

/**
* @description:
Expand All @@ -37,16 +37,16 @@ import {TuiDropdownPositionDirective} from './dropdown-position.directive';
changeDetection: ChangeDetectionStrategy.Default,
providers: [
TuiPositionService,
tuiPositionAccessorFor('dropdown', TuiDropdownPositionDirective),
tuiPositionAccessorFor('dropdown', TuiDropdownPosition),
tuiRectAccessorFor('dropdown', TuiDropdownDirective),
],
animations: [tuiDropdownAnimation],
host: {
'[@tuiDropdownAnimation]': 'animation',
'[attr.data-appearance]': 'options.appearance',
'[attr.tuiTheme]': 'theme',
},
hostDirectives: [TuiActiveZone],
animations: [tuiDropdownAnimation],
})
export class TuiDropdownComponent implements OnInit {
private readonly el = tuiInjectElement();
Expand Down
4 changes: 2 additions & 2 deletions projects/core/directives/dropdown/dropdown.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {Subject, throttleTime} from 'rxjs';
import {TuiDropdownDriverDirective} from './dropdown.driver';
import {TUI_DROPDOWN_COMPONENT} from './dropdown.providers';
import {TuiDropdownService} from './dropdown.service';
import {TuiDropdownPositionDirective} from './dropdown-position.directive';
import {TuiDropdownPosition} from './dropdown-position.directive';

@Directive({
standalone: true,
Expand All @@ -31,7 +31,7 @@ import {TuiDropdownPositionDirective} from './dropdown-position.directive';
tuiAsVehicle(TuiDropdownDirective),
],
exportAs: 'tuiDropdown',
hostDirectives: [TuiDropdownDriverDirective, TuiDropdownPositionDirective],
hostDirectives: [TuiDropdownDriverDirective, TuiDropdownPosition],
})
export class TuiDropdownDirective
implements
Expand Down
46 changes: 0 additions & 46 deletions projects/core/directives/dropdown/dropdown.module.ts

This file was deleted.

Loading

0 comments on commit c3d943e

Please sign in to comment.