diff --git a/apps/design-land/src/app/paginator/paginator.component.spec.ts b/apps/design-land/src/app/paginator/paginator.component.spec.ts index ba36be6b7d..e13f07da61 100644 --- a/apps/design-land/src/app/paginator/paginator.component.spec.ts +++ b/apps/design-land/src/app/paginator/paginator.component.spec.ts @@ -4,7 +4,7 @@ import { TestBed, } from '@angular/core/testing'; -import { DaffPaginatorModule } from '@daffodil/design'; +import { DaffPaginatorModule } from '@daffodil/design/paginator'; import { DesignLandPaginatorComponent } from './paginator.component'; diff --git a/apps/design-land/src/app/paginator/paginator.module.ts b/apps/design-land/src/app/paginator/paginator.module.ts index 6f08ccddb9..02cd8881c0 100644 --- a/apps/design-land/src/app/paginator/paginator.module.ts +++ b/apps/design-land/src/app/paginator/paginator.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffPaginatorModule } from '@daffodil/design'; import { DaffArticleModule } from '@daffodil/design/article'; +import { DaffPaginatorModule } from '@daffodil/design/paginator'; import { DesignLandPaginatorRoutingModule } from './paginator-routing.module'; import { DesignLandPaginatorComponent } from './paginator.component'; diff --git a/libs/design/src/molecules/paginator/README.md b/libs/design/paginator/README.md similarity index 100% rename from libs/design/src/molecules/paginator/README.md rename to libs/design/paginator/README.md diff --git a/libs/design/paginator/examples/src/basic-paginator/basic-paginator.module.ts b/libs/design/paginator/examples/src/basic-paginator/basic-paginator.module.ts index 1c1299d085..514029c7a2 100644 --- a/libs/design/paginator/examples/src/basic-paginator/basic-paginator.module.ts +++ b/libs/design/paginator/examples/src/basic-paginator/basic-paginator.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; -import { DaffPaginatorModule } from '@daffodil/design'; +import { DaffPaginatorModule } from '@daffodil/design/paginator'; import { BasicPaginatorComponent } from './basic-paginator.component'; diff --git a/libs/design/paginator/examples/src/link-paginator/link-paginator.module.ts b/libs/design/paginator/examples/src/link-paginator/link-paginator.module.ts index 891d83bc7e..504c66157f 100644 --- a/libs/design/paginator/examples/src/link-paginator/link-paginator.module.ts +++ b/libs/design/paginator/examples/src/link-paginator/link-paginator.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; -import { DaffPaginatorModule } from '@daffodil/design'; +import { DaffPaginatorModule } from '@daffodil/design/paginator'; import { LinkPaginatorComponent } from './link-paginator.component'; diff --git a/libs/design/paginator/examples/src/paginator-examples.module.ts b/libs/design/paginator/examples/src/paginator-examples.module.ts index a5be275501..3e03925bb3 100644 --- a/libs/design/paginator/examples/src/paginator-examples.module.ts +++ b/libs/design/paginator/examples/src/paginator-examples.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { DaffPaginatorModule } from '@daffodil/design'; +import { DaffPaginatorModule } from '@daffodil/design/paginator'; import { PAGINATOR_EXAMPLES } from './examples'; diff --git a/libs/design/paginator/ng-package.json b/libs/design/paginator/ng-package.json new file mode 100644 index 0000000000..88c361f163 --- /dev/null +++ b/libs/design/paginator/ng-package.json @@ -0,0 +1,8 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/design/paginator", + "lib": { + "entryFile": "src/public_api.ts", + "styleIncludePaths": ["../scss"] + } +} \ No newline at end of file diff --git a/libs/design/src/molecules/paginator/paginator-theme.scss b/libs/design/paginator/src/paginator-theme.scss similarity index 97% rename from libs/design/src/molecules/paginator/paginator-theme.scss rename to libs/design/paginator/src/paginator-theme.scss index c5410494f1..f758ce1f0f 100644 --- a/libs/design/src/molecules/paginator/paginator-theme.scss +++ b/libs/design/paginator/src/paginator-theme.scss @@ -1,6 +1,6 @@ @use 'sass:map'; -@use '../../../scss/core'; -@use '../../../scss/theming'; +@use '../../scss/core'; +@use '../../scss/theming'; @mixin daff-paginator-theme-variant($active-color) { color: currentColor; diff --git a/libs/design/src/molecules/paginator/paginator.module.ts b/libs/design/paginator/src/paginator.module.ts similarity index 85% rename from libs/design/src/molecules/paginator/paginator.module.ts rename to libs/design/paginator/src/paginator.module.ts index 4bf49976f5..ec1c5cb3ab 100644 --- a/libs/design/src/molecules/paginator/paginator.module.ts +++ b/libs/design/paginator/src/paginator.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffPaginatorComponent } from './paginator.component'; +import { DaffPaginatorComponent } from './paginator/paginator.component'; @NgModule({ imports: [ diff --git a/libs/design/src/molecules/paginator/paginator.component.html b/libs/design/paginator/src/paginator/paginator.component.html similarity index 100% rename from libs/design/src/molecules/paginator/paginator.component.html rename to libs/design/paginator/src/paginator/paginator.component.html diff --git a/libs/design/src/molecules/paginator/paginator.component.scss b/libs/design/paginator/src/paginator/paginator.component.scss similarity index 100% rename from libs/design/src/molecules/paginator/paginator.component.scss rename to libs/design/paginator/src/paginator/paginator.component.scss diff --git a/libs/design/src/molecules/paginator/paginator.component.spec.ts b/libs/design/paginator/src/paginator/paginator.component.spec.ts similarity index 99% rename from libs/design/src/molecules/paginator/paginator.component.spec.ts rename to libs/design/paginator/src/paginator/paginator.component.spec.ts index aa5b4c2e20..6862dd7129 100644 --- a/libs/design/src/molecules/paginator/paginator.component.spec.ts +++ b/libs/design/paginator/src/paginator/paginator.component.spec.ts @@ -14,13 +14,12 @@ import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { DaffPaginatorComponent } from './paginator.component'; +import { DaffPaginatorModule } from '../paginator.module'; import { DaffPaginatorNumberOfPagesErrorMessage, DaffPaginatorPageOutOfRangeErrorMessage, -} from './paginator-errors'; -import { DaffPaginatorComponent } from './paginator.component'; -import { DaffPaginatorModule } from './paginator.module'; - +} from '../utils/paginator-errors'; @Component({ template: '' }) class TestComponent {} diff --git a/libs/design/src/molecules/paginator/paginator.component.ts b/libs/design/paginator/src/paginator/paginator.component.ts similarity index 98% rename from libs/design/src/molecules/paginator/paginator.component.ts rename to libs/design/paginator/src/paginator/paginator.component.ts index cbd96519ef..3a5d22e387 100644 --- a/libs/design/src/molecules/paginator/paginator.component.ts +++ b/libs/design/paginator/src/paginator/paginator.component.ts @@ -15,14 +15,15 @@ import { faChevronLeft, } from '@fortawesome/free-solid-svg-icons'; -import { - DaffPaginatorNumberOfPagesErrorMessage, - DaffPaginatorPageOutOfRangeErrorMessage, -} from './paginator-errors'; import { daffColorMixin, DaffColorable, -} from '../../core/colorable/public_api'; +} from '@daffodil/design'; + +import { + DaffPaginatorNumberOfPagesErrorMessage, + DaffPaginatorPageOutOfRangeErrorMessage, +} from '../utils/paginator-errors'; /** * An _elementRef and an instance of renderer2 are needed for the Colorable mixin diff --git a/libs/design/paginator/src/public_api.ts b/libs/design/paginator/src/public_api.ts new file mode 100644 index 0000000000..652bb90ae1 --- /dev/null +++ b/libs/design/paginator/src/public_api.ts @@ -0,0 +1,2 @@ +export { DaffPaginatorModule } from './paginator.module'; +export { DaffPaginatorComponent } from './paginator/paginator.component'; diff --git a/libs/design/src/molecules/paginator/paginator-errors.ts b/libs/design/paginator/src/utils/paginator-errors.ts similarity index 100% rename from libs/design/src/molecules/paginator/paginator-errors.ts rename to libs/design/paginator/src/utils/paginator-errors.ts diff --git a/libs/design/scss/theme.scss b/libs/design/scss/theme.scss index 7167e04c38..fb39ddf6f5 100644 --- a/libs/design/scss/theme.scss +++ b/libs/design/scss/theme.scss @@ -36,7 +36,7 @@ @use '../modal/src/modal-theme' as modal; @use '../navbar/src/navbar-theme' as navbar; @use '../notification/src/notification-theme' as notification; -@use '../src/molecules/paginator/paginator-theme' as paginator; +@use '../paginator/src/paginator-theme' as paginator; @use '../sidebar/src/sidebar-theme' as sidebar; @use '../scss/state/skeleton/mixins' as skeleton; @use '../tree/src/tree-theme' as tree; diff --git a/libs/design/src/molecules/paginator/public_api.ts b/libs/design/src/molecules/paginator/public_api.ts deleted file mode 100644 index 916da09ffd..0000000000 --- a/libs/design/src/molecules/paginator/public_api.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { DaffPaginatorModule } from './paginator.module'; -export { DaffPaginatorComponent } from './paginator.component'; diff --git a/libs/design/src/public_api.ts b/libs/design/src/public_api.ts index b5da74ead6..40b4a58c57 100644 --- a/libs/design/src/public_api.ts +++ b/libs/design/src/public_api.ts @@ -19,7 +19,6 @@ export * from './molecules/backdrop/public_api'; export * from './molecules/button-set/public_api'; export * from './molecules/image-gallery/public_api'; export * from './molecules/image-list/public_api'; -export * from './molecules/paginator/public_api'; export * from './molecules/qty-dropdown/public_api'; export * from './molecules/feature/public_api';