From 778752a90966dcc2bd4eade667bc8249ee656c95 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 10 Nov 2023 07:50:53 +0300 Subject: [PATCH 1/2] feat(components/input-carousel): to standalone --- .../input-carousel/examples/setup-module.md | 5 +++-- .../input-carousel-auxiliary-left.component.ts | 4 ++++ .../input-carousel-auxiliary-right.component.ts | 4 ++++ .../input/carousel/input-carousel.component.ts | 17 ++++++++++++++++- .../input/carousel/input-carousel.module.ts | 7 +++++-- .../input-layout/input-layout-left.directive.ts | 1 + .../input-layout-right.directive.ts | 1 + 7 files changed, 34 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/components/input/input-carousel/examples/setup-module.md b/apps/doc/src/app/components/input/input-carousel/examples/setup-module.md index 9ea6763887..31b0a6d6b7 100644 --- a/apps/doc/src/app/components/input/input-carousel/examples/setup-module.md +++ b/apps/doc/src/app/components/input/input-carousel/examples/setup-module.md @@ -1,13 +1,14 @@ ```ts import { NgModule } from '@angular/core'; -import { PrizmInputCarouselModule } from '@prizm-ui/components'; +import { PrizmInputCarouselComponent, PrizmInputCommonModule } from '@prizm-ui/components'; // ... @NgModule({ imports: [ // ... - PrizmInputCarouselModule, + PrizmInputCarouselComponent, + PrizmInputCommonModule, ], }) export class MyModule {} diff --git a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts index 9c0f97afd9..6427db091e 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts @@ -1,5 +1,7 @@ import { Component, Input } from '@angular/core'; import { PrizmInputCarousel } from './types'; +import { NgIf } from '@angular/common'; +import { PrizmInputCommonModule } from '../common'; @Component({ selector: 'prizm-input-carousel-auxiliary-left', @@ -27,6 +29,8 @@ import { PrizmInputCarousel } from './types'; } `, ], + standalone: true, + imports: [NgIf, PrizmInputCommonModule], }) export class PrizmInputCarouselAuxiliaryLeftComponent { @Input() carousel!: PrizmInputCarousel; diff --git a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts index 208313885f..62eb34cbbf 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts @@ -1,5 +1,7 @@ import { Component, Input } from '@angular/core'; import { PrizmInputCarousel } from './types'; +import { NgIf } from '@angular/common'; +import { PrizmInputCommonModule } from '../common'; @Component({ selector: 'prizm-input-carousel-auxiliary-right', @@ -27,6 +29,8 @@ import { PrizmInputCarousel } from './types'; } `, ], + standalone: true, + imports: [NgIf, PrizmInputCommonModule], }) export class PrizmInputCarouselAuxiliaryRightComponent { @Input() carousel!: PrizmInputCarousel; diff --git a/libs/components/src/lib/components/input/carousel/input-carousel.component.ts b/libs/components/src/lib/components/input/carousel/input-carousel.component.ts index 6c614d2b00..d01559417b 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel.component.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel.component.ts @@ -15,9 +15,16 @@ import { PrizmDestroyService } from '@prizm-ui/helpers'; import { PrizmInputControl } from '../common/base/input-control.class'; import { PrizmInputCarouselContent } from './carousel-content/carousel-content.interface'; -import { PrizmInputNgControl } from '../common'; +import { + PrizmInputLayoutLeftDirective, + PrizmInputLayoutRightDirective, + PrizmInputNgControl, +} from '../common'; import { takeUntil, tap } from 'rxjs/operators'; import { PrizmInputCarousel } from './types'; +import { NgIf } from '@angular/common'; +import { PrizmInputCarouselAuxiliaryLeftComponent } from './input-carousel-auxiliary-left.component'; +import { PrizmInputCarouselAuxiliaryRightComponent } from './input-carousel-auxiliary-right.component'; @Component({ selector: 'prizm-input-carousel', @@ -42,6 +49,14 @@ import { PrizmInputCarousel } from './types'; class: 'prizm-carousel', '[attr.tabindex]': "disabled ? null : '0'", }, + standalone: true, + imports: [ + NgIf, + PrizmInputLayoutLeftDirective, + PrizmInputLayoutRightDirective, + PrizmInputCarouselAuxiliaryLeftComponent, + PrizmInputCarouselAuxiliaryRightComponent, + ], }) export class PrizmInputCarouselComponent extends PrizmInputNgControl diff --git a/libs/components/src/lib/components/input/carousel/input-carousel.module.ts b/libs/components/src/lib/components/input/carousel/input-carousel.module.ts index bcd6732342..56160bcaee 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel.module.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel.module.ts @@ -5,9 +5,12 @@ import { PrizmInputCarouselComponent } from './input-carousel.component'; import { PrizmInputCarouselAuxiliaryLeftComponent } from './input-carousel-auxiliary-left.component'; import { PrizmInputCarouselAuxiliaryRightComponent } from './input-carousel-auxiliary-right.component'; +/** + * @deprecated + * use standalone + * */ @NgModule({ - imports: [PrizmInputCommonModule], - declarations: [ + imports: [ PrizmInputCarouselComponent, PrizmInputCarouselAuxiliaryLeftComponent, PrizmInputCarouselAuxiliaryRightComponent, diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts b/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts index 9c23165d8a..f7e92f6f65 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts @@ -2,6 +2,7 @@ import { Directive, TemplateRef, ViewContainerRef } from '@angular/core'; @Directive({ selector: 'ng-template[prizmInputLayoutLeft]', + standalone: true, }) export class PrizmInputLayoutLeftDirective { constructor(public readonly templateRef: TemplateRef, public readonly view: ViewContainerRef) {} diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts b/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts index bd367364b9..52650a08e8 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts @@ -2,6 +2,7 @@ import { Directive, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/co @Directive({ selector: 'ng-template[prizmInputLayoutRight]', + standalone: true, }) export class PrizmInputLayoutRightDirective implements OnDestroy { constructor(public readonly templateRef: TemplateRef, public readonly view: ViewContainerRef) {} From 26bbf42ffe28d0ea3872316e937aef37eb22e101 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 10 Nov 2023 08:15:12 +0300 Subject: [PATCH 2/2] feat(components/input-carousel): to standalone --- .../input/carousel/input-carousel.component.ts | 10 ++-------- .../components/input/carousel/input-carousel.module.ts | 1 + .../lib/components/input/common/input-common.module.ts | 4 ++-- .../common/input-layout/input-layout-left.directive.ts | 1 - .../input-layout/input-layout-right.directive.ts | 1 - 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/libs/components/src/lib/components/input/carousel/input-carousel.component.ts b/libs/components/src/lib/components/input/carousel/input-carousel.component.ts index d01559417b..d6bc8d0dd4 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel.component.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel.component.ts @@ -4,7 +4,6 @@ import { Component, ElementRef, forwardRef, - HostBinding, HostListener, Inject, Injector, @@ -15,11 +14,7 @@ import { PrizmDestroyService } from '@prizm-ui/helpers'; import { PrizmInputControl } from '../common/base/input-control.class'; import { PrizmInputCarouselContent } from './carousel-content/carousel-content.interface'; -import { - PrizmInputLayoutLeftDirective, - PrizmInputLayoutRightDirective, - PrizmInputNgControl, -} from '../common'; +import { PrizmInputCommonModule, PrizmInputNgControl } from '../common'; import { takeUntil, tap } from 'rxjs/operators'; import { PrizmInputCarousel } from './types'; import { NgIf } from '@angular/common'; @@ -52,8 +47,7 @@ import { PrizmInputCarouselAuxiliaryRightComponent } from './input-carousel-auxi standalone: true, imports: [ NgIf, - PrizmInputLayoutLeftDirective, - PrizmInputLayoutRightDirective, + PrizmInputCommonModule, PrizmInputCarouselAuxiliaryLeftComponent, PrizmInputCarouselAuxiliaryRightComponent, ], diff --git a/libs/components/src/lib/components/input/carousel/input-carousel.module.ts b/libs/components/src/lib/components/input/carousel/input-carousel.module.ts index 56160bcaee..b8fc6e42d3 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel.module.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel.module.ts @@ -11,6 +11,7 @@ import { PrizmInputCarouselAuxiliaryRightComponent } from './input-carousel-auxi * */ @NgModule({ imports: [ + PrizmInputCommonModule, PrizmInputCarouselComponent, PrizmInputCarouselAuxiliaryLeftComponent, PrizmInputCarouselAuxiliaryRightComponent, diff --git a/libs/components/src/lib/components/input/common/input-common.module.ts b/libs/components/src/lib/components/input/common/input-common.module.ts index 63f3c028f6..ec87cb2bcf 100644 --- a/libs/components/src/lib/components/input/common/input-common.module.ts +++ b/libs/components/src/lib/components/input/common/input-common.module.ts @@ -32,12 +32,12 @@ import { PrizmInputCorrectorModule } from './input-corrector'; PrizmInputCorrectorModule, ], declarations: [ + PrizmInputLayoutRightDirective, + PrizmInputLayoutLeftDirective, PrizmInputLayoutComponent, PrizmInputStatusSubtextComponent, PrizmInputStatusTextDirective, PrizmInputLayoutBottomDirective, - PrizmInputLayoutRightDirective, - PrizmInputLayoutLeftDirective, PrizmInputLayoutInBodyDirective, PrizmInputLayoutSubtextDirective, ], diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts b/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts index f7e92f6f65..9c23165d8a 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout-left.directive.ts @@ -2,7 +2,6 @@ import { Directive, TemplateRef, ViewContainerRef } from '@angular/core'; @Directive({ selector: 'ng-template[prizmInputLayoutLeft]', - standalone: true, }) export class PrizmInputLayoutLeftDirective { constructor(public readonly templateRef: TemplateRef, public readonly view: ViewContainerRef) {} diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts b/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts index 52650a08e8..bd367364b9 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout-right.directive.ts @@ -2,7 +2,6 @@ import { Directive, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/co @Directive({ selector: 'ng-template[prizmInputLayoutRight]', - standalone: true, }) export class PrizmInputLayoutRightDirective implements OnDestroy { constructor(public readonly templateRef: TemplateRef, public readonly view: ViewContainerRef) {}