Skip to content

Commit

Permalink
fix(autocomplete): error if panel is added asynchronously (#7078)
Browse files Browse the repository at this point in the history
Fixes an error that was thrown when an autocomplete trigger is initialized without a panel. Note that an error will still be thrown, but only if the user attempts to open the panel.

Fixes #7069.
  • Loading branch information
crisbeto authored and andrewseguin committed Sep 29, 2017
1 parent 8e77261 commit 504ba70
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/lib/autocomplete/autocomplete-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,9 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
}

private _setTriggerValue(value: any): void {
const toDisplay = this.autocomplete.displayWith ? this.autocomplete.displayWith(value) : value;
const toDisplay = this.autocomplete && this.autocomplete.displayWith ?
this.autocomplete.displayWith(value) :
value;

// Simply falling back to an empty string if the display value is falsy does not work properly.
// The display value can also be the number zero and shouldn't fall back to an empty string.
Expand Down
12 changes: 11 additions & 1 deletion src/lib/autocomplete/autocomplete.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1512,6 +1512,15 @@ describe('MatAutocomplete', () => {
}).toThrow(getMatAutocompleteMissingPanelError());
}));

it('should not throw on init, even if the panel is not defined', fakeAsync(() => {
expect(() => {
const fixture = TestBed.createComponent(AutocompleteWithoutPanel);
fixture.componentInstance.control.setValue('Something');
fixture.detectChanges();
tick();
}).not.toThrow();
}));

it('should hide the placeholder with a preselected form control value ' +
'and a disabled floating placeholder', fakeAsync(() => {
const fixture = TestBed.createComponent(AutocompleteWithFormsAndNonfloatingPlaceholder);
Expand Down Expand Up @@ -1885,10 +1894,11 @@ class AutocompleteWithNativeInput {


@Component({
template: `<input placeholder="Choose" [matAutocomplete]="auto">`
template: `<input placeholder="Choose" [matAutocomplete]="auto" [formControl]="control">`
})
class AutocompleteWithoutPanel {
@ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
control = new FormControl();
}


Expand Down

0 comments on commit 504ba70

Please sign in to comment.