fix(select): reset option being marked as selected (#11934)

angular · Jun 26, 2018 · cd32d78 · cd32d78
1 parent 548266b
commit cd32d78
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
@@ -2580,6 +2580,18 @@ describe('MatSelect', () => {
       expect(trigger.textContent).not.toContain('None');
     }));
 
+    it('should not mark the reset option as selected ', fakeAsync(() => {
+      options[5].click();
+      fixture.detectChanges();
+      flush();
+
+      fixture.componentInstance.select.open();
+      fixture.detectChanges();
+      flush();
+
+      expect(options[5].classList).not.toContain('mat-selected');
+    }));
+
     it('should not reset when any other falsy option is selected', fakeAsync(() => {
       options[3].click();
       fixture.detectChanges();

diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
@@ -881,6 +881,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     const wasSelected = this._selectionModel.isSelected(option);
 
     if (option.value == null && !this._multiple) {
+      option.deselect();
       this._selectionModel.clear();
       this._propagateChanges(option.value);
     } else {