fix(autocomplete): close panel when options list is empty

angular · Jan 27, 2017 · bd8dbdb · bd8dbdb
1 parent 2f70a0e
commit bd8dbdb
Show file tree

Hide file tree

Showing 2 changed files with 289 additions and 267 deletions.
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -4,8 +4,10 @@ import {
     ElementRef,
     forwardRef,
     Input,
+    NgZone,
     Optional,
     OnDestroy,
+    QueryList,
     ViewContainerRef,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
@@ -18,6 +20,7 @@ import {MdOptionSelectEvent, MdOption} from '../core/option/option';
 import {ActiveDescendantKeyManager} from '../core/a11y/activedescendant-key-manager';
 import {ENTER, UP_ARROW, DOWN_ARROW} from '../core/keyboard/keycodes';
 import {Subscription} from 'rxjs/Subscription';
+import 'rxjs/add/observable/of';
 import 'rxjs/add/observable/merge';
 import {Dir} from '../core/rtl/dir';
 import 'rxjs/add/operator/startWith';
@@ -57,7 +60,7 @@ export const MD_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
     '[attr.aria-owns]': 'autocomplete?.id',
     '(focus)': 'openPanel()',
     '(blur)': '_onTouched()',
-    '(input)': '_onChange($event.target.value)',
+    '(input)': '_handleInput($event.target.value)',
     '(keydown)': '_handleKeydown($event)',
   },
   providers: [MD_AUTOCOMPLETE_VALUE_ACCESSOR]
@@ -85,7 +88,7 @@ export class MdAutocompleteTrigger implements AfterContentInit, ControlValueAcce
 
   constructor(private _element: ElementRef, private _overlay: Overlay,
               private _viewContainerRef: ViewContainerRef,
-              @Optional() private _dir: Dir) {}
+              @Optional() private _dir: Dir, private _zone: NgZone) {}
 
   ngAfterContentInit() {
     this._keyManager = new ActiveDescendantKeyManager(this.autocomplete.options).withWrap();
@@ -131,7 +134,7 @@ export class MdAutocompleteTrigger implements AfterContentInit, ControlValueAcce
    * A stream of actions that should close the autocomplete panel, including
    * when an option is selected and when the backdrop is clicked.
    */
-  get panelClosingActions(): Observable<any> {
+  get panelClosingActions(): Observable<MdOptionSelectEvent | null> {
     return Observable.merge(
         ...this.optionSelections,
         this._overlayRef.backdropClick(),
@@ -140,7 +143,7 @@ export class MdAutocompleteTrigger implements AfterContentInit, ControlValueAcce
   }
 
   /** Stream of autocomplete option selections. */
-  get optionSelections(): Observable<any>[] {
+  get optionSelections(): Observable<MdOptionSelectEvent>[] {
     return this.autocomplete.options.map(option => option.onSelect);
   }
 
@@ -149,6 +152,11 @@ export class MdAutocompleteTrigger implements AfterContentInit, ControlValueAcce
     return this._keyManager.activeItem as MdOption;
   }
 
+  /** The initial list of autocomplete options, as soon as the zone has stabilized */
+  get initialOptionList(): Observable<QueryList<MdOption>> {
+    return this._zone.onStable.first().map(() => this.autocomplete.options);
+  }
+
   /**
    * Sets the autocomplete's value. Part of the ControlValueAccessor interface
    * required to integrate with Angular's core forms API.
@@ -185,14 +193,19 @@ export class MdAutocompleteTrigger implements AfterContentInit, ControlValueAcce
     if (this.activeOption && event.keyCode === ENTER) {
       this.activeOption._selectViaInteraction();
     } else {
-      this.openPanel();
       this._keyManager.onKeydown(event);
       if (event.keyCode === UP_ARROW || event.keyCode === DOWN_ARROW) {
+        this.openPanel();
         this._scrollToOption();
       }
     }
   }
 
+  _handleInput(value: string): void {
+    this._onChange(value);
+    this.openPanel();
+  }
+
   /**
    * Given that we are not actually focusing active options, we must manually adjust scroll
    * to reveal options below the fold. First, we find the offset of the option from the top
@@ -211,15 +224,15 @@ export class MdAutocompleteTrigger implements AfterContentInit, ControlValueAcce
    * stream every time the option list changes.
    */
   private _subscribeToClosingActions(): void {
-    // Every time the option list changes...
-    this.autocomplete.options.changes
-    // and also at initialization, before there are any option changes...
-        .startWith(null)
+    // When the zone is stable initially, and when the option list changes...
+    Observable.merge(this.initialOptionList, this.autocomplete.options.changes)
         // create a new stream of panelClosingActions, replacing any previous streams
         // that were created, and flatten it so our stream only emits closing events...
-        .switchMap(() => {
+        .switchMap(options => {
           this._resetPanel();
-          return this.panelClosingActions;
+          // If the options list is empty, emit close event immediately.
+          // Otherwise, listen for panel closing actions...
+          return options.length ? this.panelClosingActions : Observable.of(null);
         })
         // when the first closing event occurs...
         .first()