Skip to content

fix(material/expansion): not clearing custom query list #21222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2020
Merged

fix(material/expansion): not clearing custom query list #21222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/material/expansion/accordion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@
* found in the LICENSE file at https://angular.io/license
*/

import {Directive, Input, ContentChildren, QueryList, AfterContentInit} from '@angular/core';
import {
Directive,
Input,
ContentChildren,
QueryList,
AfterContentInit,
OnDestroy,
} from '@angular/core';
import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
import {CdkAccordion} from '@angular/cdk/accordion';
import {FocusKeyManager} from '@angular/cdk/a11y';
Expand Down Expand Up @@ -37,7 +44,8 @@ import {MatExpansionPanelHeader} from './expansion-panel-header';
'[class.mat-accordion-multi]': 'this.multi',
}
})
export class MatAccordion extends CdkAccordion implements MatAccordionBase, AfterContentInit {
export class MatAccordion extends CdkAccordion implements MatAccordionBase,
AfterContentInit, OnDestroy {
private _keyManager: FocusKeyManager<MatExpansionPanelHeader>;

/** Headers belonging to this accordion. */
Expand Down Expand Up @@ -86,5 +94,10 @@ export class MatAccordion extends CdkAccordion implements MatAccordionBase, Afte
this._keyManager.updateActiveItem(header);
}

ngOnDestroy() {
super.ngOnDestroy();
this._ownHeaders.destroy();
}

static ngAcceptInputType_hideToggle: BooleanInput;
}
3 changes: 2 additions & 1 deletion tools/public_api_guard/material/expansion.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export declare const MAT_ACCORDION: InjectionToken<MatAccordionBase>;

export declare const MAT_EXPANSION_PANEL_DEFAULT_OPTIONS: InjectionToken<MatExpansionPanelDefaultOptions>;

export declare class MatAccordion extends CdkAccordion implements MatAccordionBase, AfterContentInit {
export declare class MatAccordion extends CdkAccordion implements MatAccordionBase, AfterContentInit, OnDestroy {
_headers: QueryList<MatExpansionPanelHeader>;
displayMode: MatAccordionDisplayMode;
get hideToggle(): boolean;
Expand All @@ -13,6 +13,7 @@ export declare class MatAccordion extends CdkAccordion implements MatAccordionBa
_handleHeaderFocus(header: MatExpansionPanelHeader): void;
_handleHeaderKeydown(event: KeyboardEvent): void;
ngAfterContentInit(): void;
ngOnDestroy(): void;
static ngAcceptInputType_hideToggle: BooleanInput;
static ɵdir: i0.ɵɵDirectiveDefWithMeta<MatAccordion, "mat-accordion", ["matAccordion"], { "multi": "multi"; "hideToggle": "hideToggle"; "displayMode": "displayMode"; "togglePosition": "togglePosition"; }, {}, ["_headers"]>;
static ɵfac: i0.ɵɵFactoryDef<MatAccordion, never>;
Expand Down