Skip to content

Commit 7b3a797

Browse files
committed
refactor(accordion): enforce stricter types for inputs
BREAKING CHANGE: The `disabled` and `expanded` properties in the `AccordionItem` are now strict to `boolean`.
1 parent cb8de61 commit 7b3a797

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

src/cdk/accordion/accordion-item.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ export class CdkAccordionItem implements OnDestroy {
6060

6161
/** Whether the AccordionItem is expanded. */
6262
@Input()
63-
get expanded(): any { return this._expanded; }
64-
set expanded(expanded: any) {
63+
get expanded(): boolean { return this._expanded; }
64+
set expanded(expanded: boolean) {
6565
expanded = coerceBooleanProperty(expanded);
6666

6767
// Only emit events and update the internal value if the value changes.
@@ -90,9 +90,9 @@ export class CdkAccordionItem implements OnDestroy {
9090

9191
/** Whether the AccordionItem is disabled. */
9292
@Input()
93-
get disabled() { return this._disabled; }
94-
set disabled(disabled: any) { this._disabled = coerceBooleanProperty(disabled); }
95-
private _disabled: boolean = false;
93+
get disabled(): boolean { return this._disabled; }
94+
set disabled(disabled: boolean) { this._disabled = coerceBooleanProperty(disabled); }
95+
private _disabled = false;
9696

9797
/** Unregister function for _expansionDispatcher. */
9898
private _removeUniqueSelectionListener: () => void = () => {};

src/material/expansion/expansion-panel-header.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export class MatExpansionPanelHeader implements AfterViewInit, OnDestroy, Focusa
116116
* Whether the associated panel is disabled. Implemented as a part of `FocusableOption`.
117117
* @docs-private
118118
*/
119-
get disabled() {
119+
get disabled(): boolean {
120120
return this.panel.disabled;
121121
}
122122

src/material/expansion/expansion-panel.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ export class MatExpansionPanel extends CdkAccordionItem implements AfterContentI
242242
}
243243

244244
static ngAcceptInputType_hideToggle: BooleanInput;
245-
static ngAcceptInputType_expanded: BooleanInput;
246-
static ngAcceptInputType_disabled: BooleanInput;
247245
}
248246

249247
@Directive({

tools/public_api_guard/cdk/accordion.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ export declare class CdkAccordionItem implements OnDestroy {
1818
accordion: CdkAccordion;
1919
closed: EventEmitter<void>;
2020
destroyed: EventEmitter<void>;
21-
get disabled(): any;
22-
set disabled(disabled: any);
23-
get expanded(): any;
24-
set expanded(expanded: any);
21+
get disabled(): boolean;
22+
set disabled(disabled: boolean);
23+
get expanded(): boolean;
24+
set expanded(expanded: boolean);
2525
expandedChange: EventEmitter<boolean>;
2626
readonly id: string;
2727
opened: EventEmitter<void>;

tools/public_api_guard/material/expansion.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ export declare class MatExpansionPanel extends CdkAccordionItem implements After
6565
ngOnDestroy(): void;
6666
open(): void;
6767
toggle(): void;
68-
static ngAcceptInputType_disabled: BooleanInput;
69-
static ngAcceptInputType_expanded: BooleanInput;
7068
static ngAcceptInputType_hideToggle: BooleanInput;
7169
static ɵcmp: i0.ɵɵComponentDefWithMeta<MatExpansionPanel, "mat-expansion-panel", ["matExpansionPanel"], { "disabled": "disabled"; "expanded": "expanded"; "hideToggle": "hideToggle"; "togglePosition": "togglePosition"; }, { "opened": "opened"; "closed": "closed"; "expandedChange": "expandedChange"; "afterExpand": "afterExpand"; "afterCollapse": "afterCollapse"; }, ["_lazyContent"], ["mat-expansion-panel-header", "*", "mat-action-row"]>;
7270
static ɵfac: i0.ɵɵFactoryDef<MatExpansionPanel, [{ optional: true; skipSelf: true; }, null, null, null, null, { optional: true; }, { optional: true; }]>;
@@ -98,7 +96,7 @@ export declare class MatExpansionPanelDescription {
9896
export declare class MatExpansionPanelHeader implements AfterViewInit, OnDestroy, FocusableOption {
9997
_animationMode?: string | undefined;
10098
collapsedHeight: string;
101-
get disabled(): any;
99+
get disabled(): boolean;
102100
expandedHeight: string;
103101
panel: MatExpansionPanel;
104102
constructor(panel: MatExpansionPanel, _element: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, defaultOptions?: MatExpansionPanelDefaultOptions, _animationMode?: string | undefined);

0 commit comments

Comments
 (0)