Skip to content

Commit

Permalink
fix(selection-list): remove selected option from model value on destroy
Browse files Browse the repository at this point in the history
Fixes selected options that are removed from the DOM not being removed from the model.

Relates to #9104.
  • Loading branch information
crisbeto committed Dec 23, 2017
1 parent 5414480 commit 4fdb546
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
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

0 comments on commit 4fdb546

Please sign in to comment.