fix(select): active item not being updated on click in multiple mode (#…

…7808)

Fixes the active option not being updated when the user clicks inside a multi-select, causing it to be stuck on the first option.

src/lib/select/select.spec.ts

@@ -3418,6 +3418,22 @@ describe('MatSelect', () => {
           'Expected `multiple` to have been set on dynamically-added option.');
     }));
 
+    it('should update the active item index on click', fakeAsync(() => {
+      trigger.click();
+      fixture.detectChanges();
+      flush();
+
+      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(0);
+
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
+
+      options[2].click();
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(2);
+    }));
+
   });
 });
 

src/lib/select/select.ts

@@ -858,6 +858,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
       this._selectionModel.toggle(option);
       this.stateChanges.next();
       wasSelected ? option.deselect() : option.select();
+      this._keyManager.setActiveItem(this._getOptionIndex(option)!);
       this._sortValues();
     } else {
       this._clearSelection(option.value == null ? undefined : option);