Skip to content

Commit

Permalink
feat(design)!: remove deprecated properties and directives in `DaffAc…
Browse files Browse the repository at this point in the history
…cordionComponent` and update usage (#2868)

BREAKING CHANGE: `[daffAccordionItemContent]` is no longer needed to place content inside the accordion item. `initiallyActive` has been removed in favor of `initiallyExpanded`.
  • Loading branch information
xelaint committed Jun 14, 2024
1 parent 3876145 commit 198d326
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 88 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<daff-container size="md">
<div class="demo-checkout" *ngIf="(loading$ | async) === false">
<daff-accordion class="demo-checkout__mobile-cart">
<daff-accordion-item [initiallyActive]="false">
<daff-accordion-item [initiallyExpanded]="false">
<h3 daffAccordionItemTitle>Cart Summary ({{(cart$ | async) ? (cart$ | async).items.length : 0}})</h3>
<demo-cart-summary-wrapper [cart]="cart$ | async" [loading]="loading$ | async"></demo-cart-summary-wrapper>
</daff-accordion-item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ describe('CheckoutViewComponent', () => {
describe('on <daff-accordion-item>', () => {

it('should set initiallyAction to false', () => {
expect(accordionItem.initiallyActive).toBeFalsy();
expect(accordionItem.initiallyExpanded).toBeFalsy();
});

describe('when cart is null', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ <h1 class="demo-product__name">{{product.name}}</h1>
</div>
<div class="demo-product__accordion">
<daff-accordion>
<daff-accordion-item initiallyActive="true">
<daff-accordion-item initiallyExpanded="true">
<h3 daffAccordionItemTitle>Details</h3>
<div daffAccordionItemContent [innerHtml]="product.description"></div>
<div [innerHtml]="product.description"></div>
</daff-accordion-item>
</daff-accordion>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div order-container #OrderContainer="OrderContainer">
<div class="demo-thank-you-view" *ngIf="(OrderContainer.loading$ | async) === false">
<daff-accordion class="demo-thank-you-view__mobile-cart">
<daff-accordion-item [initiallyActive]="false">
<daff-accordion-item [initiallyExpanded]="false">
<h3 daffAccordionItemTitle>Cart Summary ({{(OrderContainer.order$ | async).items.length}})</h3>
<demo-cart-summary-wrapper [cart]="OrderContainer.order$ | async" [loading]="OrderContainer.loading$ | async"></demo-cart-summary-wrapper>
</daff-accordion-item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe('ThankYouViewComponent', () => {
describe('on <daff-accordion-item>', () => {

it('should set initiallyAction to false', () => {
expect(accordionItem.initiallyActive).toBeFalsy();
expect(accordionItem.initiallyExpanded).toBeFalsy();
});

it('should show the number of cart items in the accordion title', () => {
Expand Down
3 changes: 0 additions & 3 deletions libs/design/accordion/src/accordion.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { DaffPrefixSuffixModule } from '@daffodil/design';

import { DaffAccordionComponent } from './accordion/accordion/accordion.component';
import { DaffAccordionItemComponent } from './accordion/accordion-item/accordion-item.component';
import { DaffAccordionItemContentDirective } from './accordion/accordion-item-content/accordion-item-content.directive';
import { DaffAccordionItemTitleDirective } from './accordion/accordion-item-title/accordion-item-title.directive';

@NgModule({
Expand All @@ -20,13 +19,11 @@ import { DaffAccordionItemTitleDirective } from './accordion/accordion-item-titl
DaffAccordionComponent,
DaffAccordionItemComponent,
DaffAccordionItemTitleDirective,
DaffAccordionItemContentDirective,
],
exports: [
DaffAccordionComponent,
DaffAccordionItemComponent,
DaffAccordionItemTitleDirective,
DaffAccordionItemContentDirective,
],
})
export class DaffAccordionModule { }

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { DaffAccordionItemComponent } from './accordion-item.component';
@Component({ template: `
<daff-accordion-item [initiallyExpanded]="initiallyExpandedValue">
<h3 daffAccordionItemTitle>Size and Fit</h3>
<div daffAccordionItemContent>no content</div>
<div>no content</div>
</daff-accordion-item>
` })
class WrapperComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ export class DaffAccordionItemComponent implements OnInit {

@Input() id: string = this._daffAccordionItemId;

/** @deprecated in v1.0.0 in favor of `initiallyExpanded` */
@Input() initiallyActive: boolean;

/** Whether or not the item is initiallyExpanded by default. */
@Input() initiallyExpanded = false;

Expand All @@ -68,7 +65,6 @@ export class DaffAccordionItemComponent implements OnInit {
* @docs-private
*/
ngOnInit() {
this._open = this.initiallyActive ? this.initiallyActive : this._open;
this._open = this.initiallyExpanded ? this.initiallyExpanded : this._open;
this._animationState = getAnimationState(this._open);
}
Expand Down
1 change: 0 additions & 1 deletion libs/design/accordion/src/public_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ export { DaffAccordionModule } from './accordion.module';
export * from './accordion/accordion/accordion.component';
export * from './accordion/accordion-item/accordion-item.component';
export * from './accordion/accordion-item-title/accordion-item-title.directive';
export * from './accordion/accordion-item-content/accordion-item-content.directive';

0 comments on commit 198d326

Please sign in to comment.