From 487c8fdb2297a7c975d8656b7bbd4c906678ccf2 Mon Sep 17 00:00:00 2001 From: xelaint Date: Fri, 15 Dec 2023 12:05:21 -0600 Subject: [PATCH] update action size properties and fix imports --- apps/design-land/src/app/toast/toast.module.ts | 2 +- .../examples/src/default-toast/default-toast.component.ts | 1 - .../examples/src/default-toast/default-toast.module.ts | 2 +- .../examples/src/toast-positions/toast-positions.module.ts | 2 +- .../toast/examples/src/toast-status/toast-status.module.ts | 2 +- .../toast-with-custom-duration.module.ts | 2 +- libs/design/toast/src/interfaces/toast-action.ts | 6 ++++-- libs/design/toast/src/toast.module.ts | 6 ++---- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/design-land/src/app/toast/toast.module.ts b/apps/design-land/src/app/toast/toast.module.ts index 7500d7a88d..35b22d28c7 100644 --- a/apps/design-land/src/app/toast/toast.module.ts +++ b/apps/design-land/src/app/toast/toast.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { DaffArticleModule } from '@daffodil/design'; +import { DaffArticleModule } from '@daffodil/design/article'; import { DaffToastModule } from '@daffodil/design/toast'; import { DesignLandToastRoutingModule } from './toast-routing-module'; diff --git a/libs/design/toast/examples/src/default-toast/default-toast.component.ts b/libs/design/toast/examples/src/default-toast/default-toast.component.ts index 81ddd004ff..8242d53638 100644 --- a/libs/design/toast/examples/src/default-toast/default-toast.component.ts +++ b/libs/design/toast/examples/src/default-toast/default-toast.component.ts @@ -8,7 +8,6 @@ import { import { DaffToast, DaffToastAction, - DaffToastPositionService, DaffToastService, } from '@daffodil/design/toast'; diff --git a/libs/design/toast/examples/src/default-toast/default-toast.module.ts b/libs/design/toast/examples/src/default-toast/default-toast.module.ts index 5eb1d3716f..8e8de2c3dc 100644 --- a/libs/design/toast/examples/src/default-toast/default-toast.module.ts +++ b/libs/design/toast/examples/src/default-toast/default-toast.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffToastModule } from '@daffodil/design/toast'; import { DefaultToastComponent } from './default-toast.component'; diff --git a/libs/design/toast/examples/src/toast-positions/toast-positions.module.ts b/libs/design/toast/examples/src/toast-positions/toast-positions.module.ts index ee37caf698..7e3b403713 100644 --- a/libs/design/toast/examples/src/toast-positions/toast-positions.module.ts +++ b/libs/design/toast/examples/src/toast-positions/toast-positions.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffToastModule, provideDaffToastOptions, diff --git a/libs/design/toast/examples/src/toast-status/toast-status.module.ts b/libs/design/toast/examples/src/toast-status/toast-status.module.ts index 147ffdbaec..8a58c6709a 100644 --- a/libs/design/toast/examples/src/toast-status/toast-status.module.ts +++ b/libs/design/toast/examples/src/toast-status/toast-status.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffToastModule } from '@daffodil/design/toast'; import { ToastStatusComponent } from './toast-status.component'; diff --git a/libs/design/toast/examples/src/toast-with-custom-duration/toast-with-custom-duration.module.ts b/libs/design/toast/examples/src/toast-with-custom-duration/toast-with-custom-duration.module.ts index c565e88e4c..5b343c62cd 100644 --- a/libs/design/toast/examples/src/toast-with-custom-duration/toast-with-custom-duration.module.ts +++ b/libs/design/toast/examples/src/toast-with-custom-duration/toast-with-custom-duration.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffButtonModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffToastModule } from '@daffodil/design/toast'; import { ToastWithCustomDurationComponent } from './toast-with-custom-duration.component'; diff --git a/libs/design/toast/src/interfaces/toast-action.ts b/libs/design/toast/src/interfaces/toast-action.ts index 52b03633a5..23a24c9bf5 100644 --- a/libs/design/toast/src/interfaces/toast-action.ts +++ b/libs/design/toast/src/interfaces/toast-action.ts @@ -1,7 +1,6 @@ import { EventEmitter } from '@angular/core'; import { - DaffButtonSize, DaffPalette, DaffStatus, } from '@daffodil/design'; @@ -14,7 +13,10 @@ export interface DaffToastAction { content: string; - size?: DaffButtonSize; + /** + * The size of the button, as defined in the {@link DaffButtonComponent}. + */ + size?: 'sm' | 'md' | 'lg' | undefined; color?: DaffPalette; diff --git a/libs/design/toast/src/toast.module.ts b/libs/design/toast/src/toast.module.ts index 6e17a27166..d5d9c36d06 100644 --- a/libs/design/toast/src/toast.module.ts +++ b/libs/design/toast/src/toast.module.ts @@ -4,10 +4,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffButtonModule, - DaffPrefixSuffixModule, -} from '@daffodil/design'; +import { DaffPrefixSuffixModule } from '@daffodil/design'; +import { DaffButtonModule } from '@daffodil/design/button'; import { DaffToastPositionService } from './service/position.service'; import { DaffToastTemplateComponent } from './toast/toast-template.component';