Skip to content
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.

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

fix(selection-list): remove selected option from model value on destroy #9106

Merged
merged 1 commit into from
Jan 4, 2018
Merged
Show file tree
Hide file tree
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
19 changes: 18 additions & 1 deletion src/lib/list/selection-list.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,22 @@ describe('MatSelectionList with forms', () => {
expect(ngModel.pristine)
.toBe(false, 'Expected the selection-list to be dirty after state change.');
}));

it('should remove a selected option from the value on destroy', fakeAsync(() => {
listOptions[1].selected = true;
listOptions[2].selected = true;

fixture.detectChanges();

expect(fixture.componentInstance.selectedOptions).toEqual(['opt2', 'opt3']);

fixture.componentInstance.renderLastOption = false;
fixture.detectChanges();
tick();

expect(fixture.componentInstance.selectedOptions).toEqual(['opt2']);
}));

});

describe('and formControl', () => {
Expand Down Expand Up @@ -800,11 +816,12 @@ class SelectionListWithTabindexBinding {
<mat-selection-list [(ngModel)]="selectedOptions">
<mat-list-option value="opt1">Option 1</mat-list-option>
<mat-list-option value="opt2">Option 2</mat-list-option>
<mat-list-option value="opt3">Option 3</mat-list-option>
<mat-list-option value="opt3" *ngIf="renderLastOption">Option 3</mat-list-option>
</mat-selection-list>`
})
class SelectionListWithModel {
selectedOptions: string[] = [];
renderLastOption = true;
}

@Component({
Expand Down
6 changes: 6 additions & 0 deletions src/lib/list/selection-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@ export class MatListOption extends _MatListOptionMixinBase
}

ngOnDestroy(): void {
if (this.selected) {
// We have to delay this until the next tick in order
// to avoid changed after checked errors.
Promise.resolve().then(() => this.selected = false);
}

this.selectionList._removeOptionFromList(this);
}

Expand Down