From 2025c8b5eb9891ec3f159e2fde03f45d23f6bbed Mon Sep 17 00:00:00 2001 From: "Kenneth G. Franqueiro" Date: Thu, 28 Feb 2019 14:01:44 -0500 Subject: [PATCH] fix(menu-surface): Fix anchorElement initialization (#4462) --- packages/mdc-menu-surface/component.ts | 6 +- .../spec/mdc-menu/classes/baseline.html | 2 +- .../mdc-menu/classes/bottom-anchored.html | 2 +- .../classes/menu-selection-group.html | 139 +++++++++--------- test/screenshot/spec/mdc-menu/fixture.js | 1 - .../mdc-menu-surface/mdc-menu-surface.test.js | 64 +++++--- 6 files changed, 113 insertions(+), 101 deletions(-) diff --git a/packages/mdc-menu-surface/component.ts b/packages/mdc-menu-surface/component.ts index f7ef25f2763..1367762a651 100644 --- a/packages/mdc-menu-surface/component.ts +++ b/packages/mdc-menu-surface/component.ts @@ -38,7 +38,7 @@ export class MDCMenuSurface extends MDCComponent { return new MDCMenuSurface(root); } - anchorElement: Element | null = null; + anchorElement!: Element | null; // assigned in initialSyncWithDOM() protected root_!: HTMLElement; // assigned in MDCComponent constructor @@ -54,9 +54,7 @@ export class MDCMenuSurface extends MDCComponent { initialSyncWithDOM() { const parentEl = this.root_.parentElement; - if (parentEl && parentEl.classList.contains(cssClasses.ANCHOR)) { - this.anchorElement = parentEl; - } + this.anchorElement = parentEl && parentEl.classList.contains(cssClasses.ANCHOR) ? parentEl : null; if (this.root_.classList.contains(cssClasses.FIXED)) { this.setFixedPosition(true); diff --git a/test/screenshot/spec/mdc-menu/classes/baseline.html b/test/screenshot/spec/mdc-menu/classes/baseline.html index c982e49979a..834bf4fca6b 100644 --- a/test/screenshot/spec/mdc-menu/classes/baseline.html +++ b/test/screenshot/spec/mdc-menu/classes/baseline.html @@ -46,7 +46,7 @@
-
+