Skip to content

Commit

Permalink
Revert "fix(autocomplete): auto-highlighted first option not display …
Browse files Browse the repository at this point in the history
…correctly if the floating label is disabled" (#14505)

* Revert "Revert "fix(snack-bar): announcing same message twice to screen readers" (#14494)"

This reverts commit e9466a4.

* Revert "Revert "fix(dialog,bottom-sheet): invert backdrop color on dark themes" (#14492)"

This reverts commit 3eb7e9c.

* Revert "Revert "fix(menu): allow text wrapping in menu items" (#14493)"

This reverts commit a3da8d2.

* Revert "build: update nodejs bazel rules (#14466)"

This reverts commit a3fef46.

* Revert "docs(form-field): native select reset values not working in examples (#14236)"

This reverts commit 97f52c0.

* Revert "fix(menu): allow text wrapping in menu items (#11430)"

This reverts commit 3661abe.

* Revert "fix(dialog,bottom-sheet): invert backdrop color on dark themes (#13065)"

This reverts commit fe96f38.

* Revert "build: replace deprecated tslint rule with compiler option (#13186)"

This reverts commit 5dfa45f.

* Revert "fix(snack-bar): announcing same message twice to screen readers (#13298)"

This reverts commit 3fb4b23.

* Revert "feat(drag-drop): allow entire group of drop lists to be disabled (#14179)"

This reverts commit 94e76de.

* Revert "fix(drag-drop): prevent text selection while dragging on Safari (#14405)"

This reverts commit 220e388.

* Revert "fix(autocomplete): auto-highlighted first option not display correctly if the floating label is disabled (#14414)"

This reverts commit 53d2b58.
  • Loading branch information
vivian-hu-zz authored Dec 13, 2018
1 parent e9466a4 commit 4d42a90
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
1 change: 0 additions & 1 deletion src/lib/autocomplete/autocomplete-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,6 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
switchMap(() => {
this._resetActiveItem();
this.autocomplete._setVisibility();
this._changeDetectorRef.detectChanges();

if (this.panelOpen) {
this._overlayRef!.updatePosition();
Expand Down
16 changes: 0 additions & 16 deletions src/lib/autocomplete/autocomplete.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1644,22 +1644,6 @@ describe('MatAutocomplete', () => {
.toContain('mat-active', 'Expected first option to be highlighted.');
}));

it('should be able to preselect the first option when the floating label is disabled',
fakeAsync(() => {
fixture.componentInstance.floatLabel = 'never';
fixture.componentInstance.trigger.autocomplete.autoActiveFirstOption = true;
fixture.detectChanges();

fixture.componentInstance.trigger.openPanel();
fixture.detectChanges();
zone.simulateZoneExit();
// Note: should not have a detectChanges call here
// in order for the test to fail when it's supposed to.

expect(overlayContainerElement.querySelectorAll('mat-option')[0].classList)
.toContain('mat-active', 'Expected first option to be highlighted.');
}));

it('should be able to configure preselecting the first option globally', fakeAsync(() => {
overlayContainer.ngOnDestroy();
fixture.destroy();
Expand Down

0 comments on commit 4d42a90

Please sign in to comment.