Skip to content
This repository was archived by the owner on Jun 16, 2019. It is now read-only.

Emit 'expandedIndex' on changing expansion panel #1123

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions src/components/expansion-panel/expansion-panel.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ export class MdlExpansionPanelComponent implements AfterContentInit {
this._toggle(true);
}

collapse() {
this._toggle(false);
collapse(emitOnChange?: boolean) {
this._toggle(false, emitOnChange);
}

disableToggle() {
Expand All @@ -152,11 +152,11 @@ export class MdlExpansionPanelComponent implements AfterContentInit {
this.disabled = false;
}

private _toggle(isExpanded: boolean) {
private _toggle(isExpanded: boolean, emitOnChange: boolean = true) {
this.isExpanded = isExpanded;
this.content.isExpanded = `${isExpanded}`;
this.header.isExpanded = isExpanded;
this.onChange.emit(isExpanded);
if (emitOnChange) this.onChange.emit(isExpanded);
}
}

Expand All @@ -169,6 +169,7 @@ export class MdlExpansionPanelComponent implements AfterContentInit {
})
export class MdlExpansionPanelGroupComponent implements AfterContentInit {
@ContentChildren(MdlExpansionPanelComponent) panels: QueryList<MdlExpansionPanelComponent>;
@Output('mdl-panel-active-changed') selectedPanelEmitter = new EventEmitter();
expandedIndex: number = -1;

ngAfterContentInit() {
Expand Down Expand Up @@ -199,13 +200,14 @@ export class MdlExpansionPanelGroupComponent implements AfterContentInit {
panel.onChange.subscribe((isExpanded: boolean) => {
if (isExpanded) {
if (i !== this.expandedIndex && this.expandedIndex >= 0) {
this.panels.toArray()[this.expandedIndex].collapse();
this.panels.toArray()[this.expandedIndex].collapse(false);
}
this.expandedIndex = i;
}
if (!isExpanded && i === this.expandedIndex) {
this.expandedIndex = -1;
}
this.selectedPanelEmitter.emit({ index: this.expandedIndex});
});
});
}
Expand Down