From 82105a2434c93098489f52faa475c224bffee24b Mon Sep 17 00:00:00 2001 From: mmalerba Date: Wed, 5 Dec 2018 14:30:43 -0800 Subject: [PATCH 1/4] Revert "fix(drag-drop): error on touch end (#14392)" This reverts commit 53cecbb5f930c6d3795dca155fea60838594ff9a. From b82ba8813f998321711a8956f73eb84d658743ee Mon Sep 17 00:00:00 2001 From: mmalerba Date: Wed, 5 Dec 2018 14:30:43 -0800 Subject: [PATCH 2/4] Revert "fix(menu): reduce specificity of icon selector (#14389)" This reverts commit 74e945adc91df1e0328cc5b7ee5992fabb18ca7e. From fa8216debf991674553a3fe0fd65616e8aa60514 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Wed, 5 Dec 2018 14:30:43 -0800 Subject: [PATCH 3/4] Revert "fix(drag-drop): throw better error when attaching to non-element node (#14221)" This reverts commit 31f0e6d5adce6005f0bf0d395798409b8c6177c8. From b92fa03ced959ad9648953436ae4440ad255ebbb Mon Sep 17 00:00:00 2001 From: mmalerba Date: Wed, 5 Dec 2018 14:30:43 -0800 Subject: [PATCH 4/4] Revert "fix(autocomplete): auto-highlighted first option not display correctly if the floating label is disabled (#13774)" This reverts commit c99c512106ac301580c15c2d24f7917c8f0ca827. --- src/lib/autocomplete/autocomplete-trigger.ts | 1 - src/lib/autocomplete/autocomplete.spec.ts | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts index f0473f5473f2..fe7ef1fb7215 100644 --- a/src/lib/autocomplete/autocomplete-trigger.ts +++ b/src/lib/autocomplete/autocomplete-trigger.ts @@ -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(); diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts index 5576e084c17b..1b2c205c860c 100644 --- a/src/lib/autocomplete/autocomplete.spec.ts +++ b/src/lib/autocomplete/autocomplete.spec.ts @@ -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();