@vaadin/vaadin-overlay 23.0.10 → 23.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/vaadin-overlay",
-  "version": "23.0.10",
+  "version": "23.0.11",
   "publishConfig": {
     "access": "public"
   },
@@ -35,20 +35,20 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "^23.0.10",
-    "@vaadin/vaadin-lumo-styles": "^23.0.10",
-    "@vaadin/vaadin-material-styles": "^23.0.10",
-    "@vaadin/vaadin-themable-mixin": "^23.0.10"
+    "@vaadin/component-base": "^23.0.11",
+    "@vaadin/vaadin-lumo-styles": "^23.0.11",
+    "@vaadin/vaadin-material-styles": "^23.0.11",
+    "@vaadin/vaadin-themable-mixin": "^23.0.11"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@polymer/iron-overlay-behavior": "^3.0.0",
-    "@vaadin/button": "^23.0.10",
-    "@vaadin/radio-group": "^23.0.10",
+    "@vaadin/button": "^23.0.11",
+    "@vaadin/radio-group": "^23.0.11",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "^23.0.10",
+    "@vaadin/text-field": "^23.0.11",
     "lit": "^2.0.0",
     "sinon": "^9.2.1"
   },
-  "gitHead": "e8402a55ce0e823ae6da5c97486998cfd931b1d3"
+  "gitHead": "10838304fe6f5c98b838ec3a90bdcf49cbf4650b"
 }

package/src/vaadin-overlay-position-mixin.js

@@ -3,6 +3,7 @@
  * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { getAncestorRootNodes } from '@vaadin/component-base/src/dom-utils.js';
 
 const PROP_NAMES_VERTICAL = {
   start: 'top',
@@ -79,26 +80,61 @@ export const PositionMixin = (superClass) =>
 
     static get observers() {
       return [
-        '__positionSettingsChanged(positionTarget, horizontalAlign, verticalAlign, noHorizontalOverlap, noVerticalOverlap)',
-        '__overlayOpenedChanged(opened)',
+        '__positionSettingsChanged(horizontalAlign, verticalAlign, noHorizontalOverlap, noVerticalOverlap)',
+        '__overlayOpenedChanged(opened, positionTarget)',
       ];
     }
 
     constructor() {
       super();
 
-      this.__boundUpdatePosition = this._updatePosition.bind(this);
+      this._updatePosition = this._updatePosition.bind(this);
     }
 
-    __overlayOpenedChanged(opened) {
-      // Toggle the event listeners that cause the overlay to update its position
-      ['scroll', 'resize'].forEach((eventName) => {
-        if (opened) {
-          window.addEventListener(eventName, this.__boundUpdatePosition);
-        } else {
-          window.removeEventListener(eventName, this.__boundUpdatePosition);
-        }
+    /** @protected */
+    connectedCallback() {
+      super.connectedCallback();
+
+      if (this.opened) {
+        this.__addUpdatePositionEventListeners();
+      }
+    }
+
+    /** @protected */
+    disconnectedCallback() {
+      super.disconnectedCallback();
+      this.__removeUpdatePositionEventListeners();
+    }
+
+    /** @private */
+    __addUpdatePositionEventListeners() {
+      window.addEventListener('resize', this._updatePosition);
+
+      this.__positionTargetAncestorRootNodes = getAncestorRootNodes(this.positionTarget);
+      this.__positionTargetAncestorRootNodes.forEach((node) => {
+        node.addEventListener('scroll', this._updatePosition, true);
       });
+    }
+
+    /** @private */
+    __removeUpdatePositionEventListeners() {
+      window.removeEventListener('resize', this._updatePosition);
+
+      if (this.__positionTargetAncestorRootNodes) {
+        this.__positionTargetAncestorRootNodes.forEach((node) => {
+          node.removeEventListener('scroll', this._updatePosition, true);
+        });
+        this.__positionTargetAncestorRootNodes = null;
+      }
+    }
+
+    /** @private */
+    __overlayOpenedChanged(opened, positionTarget) {
+      this.__removeUpdatePositionEventListeners();
+
+      if (opened && positionTarget) {
+        this.__addUpdatePositionEventListeners();
+      }
 
       if (opened) {
         const computedStyle = getComputedStyle(this);

package/src/vaadin-overlay.js

@@ -515,6 +515,11 @@ class OverlayElement extends ThemableMixin(DirMixin(ControllerMixin(PolymerEleme
       return;
     }
 
+    // Only close modeless overlay on Esc press when it contains focus
+    if (this.modeless && !event.composedPath().includes(this.$.overlay)) {
+      return;
+    }
+
     if (event.key === 'Escape') {
       const evt = new CustomEvent('vaadin-overlay-escape-press', {
         bubbles: true,
@@ -559,14 +564,20 @@ class OverlayElement extends ThemableMixin(DirMixin(ControllerMixin(PolymerEleme
         this.dispatchEvent(evt);
       });
 
+      document.addEventListener('keydown', this._boundKeydownListener);
+
       if (!this.modeless) {
         this._addGlobalListeners();
       }
     } else if (wasOpened) {
-      this.__focusTrapController.releaseFocus();
+      if (this.focusTrap) {
+        this.__focusTrapController.releaseFocus();
+      }
 
       this._animatedClosing();
 
+      document.removeEventListener('keydown', this._boundKeydownListener);
+
       if (!this.modeless) {
         this._removeGlobalListeners();
       }
@@ -753,7 +764,6 @@ class OverlayElement extends ThemableMixin(DirMixin(ControllerMixin(PolymerEleme
     // Firefox leaks click to document on contextmenu even if prevented
     // https://bugzilla.mozilla.org/show_bug.cgi?id=990614
     document.documentElement.addEventListener('click', this._boundOutsideClickListener, true);
-    document.addEventListener('keydown', this._boundKeydownListener);
   }
 
   /** @protected */
@@ -778,7 +788,6 @@ class OverlayElement extends ThemableMixin(DirMixin(ControllerMixin(PolymerEleme
     document.removeEventListener('mousedown', this._boundMouseDownListener);
     document.removeEventListener('mouseup', this._boundMouseUpListener);
     document.documentElement.removeEventListener('click', this._boundOutsideClickListener, true);
-    document.removeEventListener('keydown', this._boundKeydownListener);
   }
 
   /** @protected */