diff --git a/libs/design/button/src/button/button.component.ts b/libs/design/button/src/button/button.component.ts index 73a3467b8b..b121e8a486 100644 --- a/libs/design/button/src/button/button.component.ts +++ b/libs/design/button/src/button/button.component.ts @@ -17,7 +17,7 @@ import { DaffSuffixable, daffPrefixableMixin, daffSuffixableMixin, - DaffSizeable, + DaffSizable, DaffSizeSmallType, DaffSizeMediumType, DaffSizeLargeType, @@ -51,7 +51,7 @@ const _daffButtonBase = daffArticleEncapsulatedMixin(daffPrefixableMixin(daffSuf export type DaffButtonType = 'daff-button' | 'daff-stroked-button' | 'daff-raised-button' | 'daff-flat-button' | 'daff-icon-button' | 'daff-underline-button' | undefined; /** - * The DaffSizeable types that the DaffButtonComponent can implement + * The DaffSizable types that the DaffButtonComponent can implement */ export type DaffButtonSize = DaffSizeSmallType | DaffSizeMediumType | DaffSizeLargeType; @@ -92,7 +92,7 @@ enum DaffButtonTypeEnum { }) export class DaffButtonComponent extends _daffButtonBase - implements OnInit, DaffPrefixable, DaffSuffixable, DaffColorable, DaffSizeable, DaffStatusable { + implements OnInit, DaffPrefixable, DaffSuffixable, DaffColorable, DaffSizable, DaffStatusable { private buttonType: DaffButtonType; diff --git a/libs/design/container/src/container/container.component.ts b/libs/design/container/src/container/container.component.ts index ad369b4267..d01d27b453 100644 --- a/libs/design/container/src/container/container.component.ts +++ b/libs/design/container/src/container/container.component.ts @@ -8,7 +8,7 @@ import { } from '@angular/core'; import { - DaffSizeable, + DaffSizable, DaffSizeAllType, daffSizeMixin, } from '@daffodil/design'; @@ -34,7 +34,7 @@ const _daffContainerBase = daffSizeMixin(DaffContainerBase); inputs: ['size'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class DaffContainerComponent extends _daffContainerBase implements DaffSizeable { +export class DaffContainerComponent extends _daffContainerBase implements DaffSizable { /** * @docs-private diff --git a/libs/design/src/core/public_api.ts b/libs/design/src/core/public_api.ts index 56e8ba84df..32a6dc4ba2 100644 --- a/libs/design/src/core/public_api.ts +++ b/libs/design/src/core/public_api.ts @@ -14,4 +14,4 @@ export * from './article-encapsulated/public_api'; export * from './theming/public_api'; export * from './lazy/public_api'; export * from './focus/public_api'; -export * from './sizeable/public_api'; +export * from './sizable/public_api'; diff --git a/libs/design/src/core/sizeable/public_api.ts b/libs/design/src/core/sizable/public_api.ts similarity index 55% rename from libs/design/src/core/sizeable/public_api.ts rename to libs/design/src/core/sizable/public_api.ts index 67f6d1cfbb..83dccadf1d 100644 --- a/libs/design/src/core/sizeable/public_api.ts +++ b/libs/design/src/core/sizable/public_api.ts @@ -1,11 +1,11 @@ export { - DaffSizeable, + DaffSizable, DaffSizeAllType, - DaffSizeableEnum, + DaffSizableEnum, DaffSizeXSmallType, DaffSizeSmallType, DaffSizeMediumType, DaffSizeLargeType, DaffSizeXLargeType, -} from './sizeable'; -export { daffSizeMixin } from './sizeable-mixin'; +} from './sizable'; +export { daffSizeMixin } from './sizable-mixin'; diff --git a/libs/design/src/core/sizeable/sizeable-mixin.ts b/libs/design/src/core/sizable/sizable-mixin.ts similarity index 96% rename from libs/design/src/core/sizeable/sizeable-mixin.ts rename to libs/design/src/core/sizable/sizable-mixin.ts index 294ff183df..aec679495d 100644 --- a/libs/design/src/core/sizeable/sizeable-mixin.ts +++ b/libs/design/src/core/sizable/sizable-mixin.ts @@ -4,7 +4,7 @@ import { Renderer2, } from '@angular/core'; -import { DaffSizeAllType } from './sizeable'; +import { DaffSizeAllType } from './sizable'; import { Constructor } from '../constructor/constructor'; export interface HasElementRef { diff --git a/libs/design/src/core/sizeable/sizeable.spec.ts b/libs/design/src/core/sizable/sizable.spec.ts similarity index 98% rename from libs/design/src/core/sizeable/sizeable.spec.ts rename to libs/design/src/core/sizable/sizable.spec.ts index b4446628da..5fa1cd6208 100644 --- a/libs/design/src/core/sizeable/sizeable.spec.ts +++ b/libs/design/src/core/sizable/sizable.spec.ts @@ -1,6 +1,6 @@ import { ElementRef } from '@angular/core'; -import { daffSizeMixin } from './sizeable-mixin'; +import { daffSizeMixin } from './sizable-mixin'; class TestingClass { element: HTMLElement = document.createElement('div'); diff --git a/libs/design/src/core/sizeable/sizeable.ts b/libs/design/src/core/sizable/sizable.ts similarity index 85% rename from libs/design/src/core/sizeable/sizeable.ts rename to libs/design/src/core/sizable/sizable.ts index dc6783a025..0b52063f41 100644 --- a/libs/design/src/core/sizeable/sizeable.ts +++ b/libs/design/src/core/sizable/sizable.ts @@ -3,12 +3,12 @@ * In order to be sizable, a component class must implement this property. */ -export interface DaffSizeable { +export interface DaffSizable { size: T; } /** - * The possible types that can be passed to a component that implements DaffSizeable + * The possible types that can be passed to a component that implements DaffSizable */ export type DaffSizeXSmallType = 'xs'; @@ -19,7 +19,7 @@ export type DaffSizeXLargeType = 'xl'; export type DaffSizeAllType = DaffSizeXSmallType | DaffSizeSmallType | DaffSizeMediumType | DaffSizeLargeType | DaffSizeXLargeType; -export enum DaffSizeableEnum { +export enum DaffSizableEnum { XSmall = 'xs', Small = 'sm', Medium = 'md',