fix(select): error if triggerValue is accessed from an empty select (#…

…6575)
angular · Aug 23, 2017 · 0526689 · 0526689
1 parent ea143a0
commit 0526689
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
@@ -2184,6 +2184,13 @@ describe('MdSelect', () => {
         expect(() => fixture.detectChanges()).not.toThrow();
       }));
 
+
+    it('should not throw when the triggerValue is accessed when there is no selected value', () => {
+      const fixture = TestBed.createComponent(BasicSelect);
+      fixture.detectChanges();
+
+      expect(() => fixture.componentInstance.select.triggerValue).not.toThrow();
+    });
   });
 
   describe('change event', () => {

diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
@@ -568,8 +568,12 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
   /** The value displayed in the trigger. */
   get triggerValue(): string {
+    if (!this._selectionModel || this._selectionModel.isEmpty()) {
+      return '';
+    }
+
     if (this._multiple) {
-      let selectedOptions = this._selectionModel.selected.map(option => option.viewValue);
+      const selectedOptions = this._selectionModel.selected.map(option => option.viewValue);
 
       if (this._isRtl()) {
         selectedOptions.reverse();