fix(autocomplete): panel not resetting properly in certain scenarios (#5911)

This fixes a regression caused by the changes from 880e6d513d which prevented the panel from closing and reopening in certain cases.

Fixes #5910.
This commit is contained in:
Kristiyan Kostadinov
2017-07-26 02:23:49 +03:00
committed by Andrew Seguin
parent ca3a3b84b4
commit ebb5e9e23f
2 changed files with 40 additions and 10 deletions
+9 -10
View File
@@ -198,23 +198,22 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
/** Closes the autocomplete suggestion panel. */
closePanel(): void {
if (!this.panelOpen) {
return;
}
if (this._overlayRef && this._overlayRef.hasAttached()) {
this._overlayRef.detach();
this._closingActionsSubscription.unsubscribe();
}
this._panelOpen = false;
this._resetPlaceholder();
// We need to trigger change detection manually, because
// `fromEvent` doesn't seem to do it at the proper time.
// This ensures that the placeholder is reset when the
// user clicks outside.
this._changeDetectorRef.detectChanges();
if (this._panelOpen) {
this._panelOpen = false;
// We need to trigger change detection manually, because
// `fromEvent` doesn't seem to do it at the proper time.
// This ensures that the placeholder is reset when the
// user clicks outside.
this._changeDetectorRef.detectChanges();
}
}
/**
+31
View File
@@ -344,6 +344,37 @@ describe('MdAutocomplete', () => {
});
}));
it('should toggle the visibility when typing and closing the panel', fakeAsync(() => {
fixture.componentInstance.trigger.openPanel();
tick();
fixture.detectChanges();
expect(overlayContainerElement.querySelector('.mat-autocomplete-panel')!.classList)
.toContain('mat-autocomplete-visible', 'Expected panel to be visible.');
typeInElement('x', input);
fixture.detectChanges();
tick();
fixture.detectChanges();
expect(overlayContainerElement.querySelector('.mat-autocomplete-panel')!.classList)
.toContain('mat-autocomplete-hidden', 'Expected panel to be hidden.');
fixture.componentInstance.trigger.closePanel();
fixture.detectChanges();
fixture.componentInstance.trigger.openPanel();
fixture.detectChanges();
typeInElement('al', input);
fixture.detectChanges();
tick();
fixture.detectChanges();
expect(overlayContainerElement.querySelector('.mat-autocomplete-panel')!.classList)
.toContain('mat-autocomplete-visible', 'Expected panel to be visible.');
}));
});
it('should have the correct text direction in RTL', () => {