Skip to content

Commit

Permalink
feat(design)!: shard callout component (#2669)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: `DaffCalloutModule` has moved to its own package. Update imports to `@daffodil/design/callout`
  • Loading branch information
xelaint committed Dec 18, 2023
1 parent 7434000 commit e332b7c
Show file tree
Hide file tree
Showing 32 changed files with 41 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import { DaffCalloutModule } from '@daffodil/design';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';
import { DaffImageModule } from '@daffodil/design/image';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import {
DaffCalloutModule,
DaffCardModule,
} from '@daffodil/design';
import { DaffCardModule } from '@daffodil/design';
import { DaffButtonModule } from '@daffodil/design/button';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';
import { DaffImageModule } from '@daffodil/design/image';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import {
DaffCalloutModule,
DaffCardModule,
} from '@daffodil/design';
import { DaffCardModule } from '@daffodil/design';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { DaffioWhyPwaExamplesComponent } from './why-pwa-examples.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';

import {
DaffCalloutModule,
DaffCardModule,
} from '@daffodil/design';
import { DaffCardModule } from '@daffodil/design';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { DaffioWhyPwaOverviewComponent } from './why-pwa-overview.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import {
DaffCalloutModule,
DaffListModule,
} from '@daffodil/design';
import { DaffListModule } from '@daffodil/design';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { DaffioWhyPwaSolutionComponent } from './why-pwa-solution.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';

import {
DaffCalloutModule,
DaffCardModule,
} from '@daffodil/design';
import { DaffCardModule } from '@daffodil/design';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { DaffioWhyPwaStatsComponent } from './why-pwa-stats.component';
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/app/core/footer/footer.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import {
DaffCopyrightModule,
} from '@daffodil/branding';
import {
DaffCalloutModule,
DaffListModule,
DaffButtonSetModule,
DaffInputModule,
} from '@daffodil/design';
import { DaffButtonModule } from '@daffodil/design/button';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { DaffioSimpleFooterComponent } from './simple-footer/simple-footer.component';
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';

import { DaffCalloutModule } from '@daffodil/design';
import { DaffButtonModule } from '@daffodil/design/button';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { CalloutTextAlignmentComponent } from './callout-text-alignment.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';

import { DaffCalloutModule } from '@daffodil/design';
import { DaffButtonModule } from '@daffodil/design/button';
import { DaffCalloutModule } from '@daffodil/design/callout';

import { CalloutThemingComponent } from './callout-theming.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';

import { DaffCalloutModule } from '@daffodil/design';
import { DaffButtonModule } from '@daffodil/design/button';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { CalloutWithGridComponent } from './callout-with-grid.component';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';

import { DaffCalloutModule } from '@daffodil/design';
import { DaffButtonModule } from '@daffodil/design/button';
import { DaffCalloutModule } from '@daffodil/design/callout';
import { DaffContainerModule } from '@daffodil/design/container';

import { CompactCalloutComponent } from './compact-callout.component';
Expand Down
9 changes: 9 additions & 0 deletions libs/design/callout/ng-package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/design/callout",
"deleteDestPath": false,
"lib": {
"entryFile": "src/index.ts",
"styleIncludePaths": ["../src/scss"]
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:map';
@use '../../../scss/core';
@use '../../../scss/theming';
@use '../../scss/core';
@use '../../scss/theming';

@mixin daff-callout-theme-variant($color) {
background: $color;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '../../../../scss/typography' as t;
@use '../../../../scss/layout';
@use '../../../scss/typography' as t;
@use '../../../scss/layout';

.daff-callout {
$root: &;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ import {
} from '@angular/core/testing';
import { By } from '@angular/platform-browser';

import {
DaffPalette,
DaffTextAlignment,
} from '@daffodil/design';

import {
DaffCalloutComponent,
DaffCalloutLayout,
DaffCalloutSize,
} from './callout.component';
import { DaffPalette } from '../../../core/colorable/public_api';
import { DaffTextAlignment } from '../../../core/text-alignable/text-alignable';

@Component ({
template: `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,16 @@ import {
Renderer2,
} from '@angular/core';

import { daffArticleEncapsulatedMixin } from '../../../core/article-encapsulated/public_api';
import {
daffArticleEncapsulatedMixin,
DaffColorable,
daffColorMixin,
} from '../../../core/colorable/public_api';
import {
DaffCompactable,
daffCompactableMixin,
} from '../../../core/compactable/public_api';
import { daffManageContainerLayoutMixin } from '../../../core/manage-container-layout/public_api';
import { DaffTextAlignable } from '../../../core/text-alignable/text-alignable';
import { daffTextAlignmentMixin } from '../../../core/text-alignable/text-alignable-mixin';
daffManageContainerLayoutMixin,
DaffTextAlignable,
daffTextAlignmentMixin,
} from '@daffodil/design';

/**
* @deprecated See {@link DaffTextAlignable}
Expand Down
1 change: 1 addition & 0 deletions libs/design/callout/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './public_api';
File renamed without changes.
2 changes: 1 addition & 1 deletion libs/design/scss/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@use '../loading-icon/src/loading-icon-theme' as loading-icon;
@use '../src/atoms/progress-indicator/progress-indicator-theme' as progress-indicator;
@use '../accordion/src/accordion-theme' as accordion;
@use '../src/molecules/callout/callout-theme' as callout;
@use '../callout/src/callout-theme' as callout;
@use '../src/molecules/card/card/card-theme' as card;
@use '../src/molecules/hero/hero-theme' as hero;
@use '../src/molecules/list/list/list-theme' as list;
Expand Down
1 change: 0 additions & 1 deletion libs/design/src/public_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export * from './molecules/paginator/public_api';
export * from './molecules/qty-dropdown/public_api';
export * from './molecules/sidebar/public_api';
export * from './molecules/hero/public_api';
export * from './molecules/callout/public_api';
export * from './molecules/feature/public_api';
export * from './molecules/card/public_api';

Expand Down

0 comments on commit e332b7c

Please sign in to comment.