@vaadin/overlay 23.3.27 → 23.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/overlay",
-  "version": "23.3.27",
+  "version": "23.3.28",
   "publishConfig": {
     "access": "public"
   },
@@ -36,20 +36,20 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "~23.3.27",
-    "@vaadin/vaadin-lumo-styles": "~23.3.27",
-    "@vaadin/vaadin-material-styles": "~23.3.27",
-    "@vaadin/vaadin-themable-mixin": "~23.3.27"
+    "@vaadin/component-base": "~23.3.28",
+    "@vaadin/vaadin-lumo-styles": "~23.3.28",
+    "@vaadin/vaadin-material-styles": "~23.3.28",
+    "@vaadin/vaadin-themable-mixin": "~23.3.28"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@polymer/iron-overlay-behavior": "^3.0.0",
-    "@vaadin/button": "~23.3.27",
-    "@vaadin/radio-group": "~23.3.27",
+    "@vaadin/button": "~23.3.28",
+    "@vaadin/radio-group": "~23.3.28",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "~23.3.27",
+    "@vaadin/text-field": "~23.3.28",
     "lit": "^2.0.0",
     "sinon": "^13.0.2"
   },
-  "gitHead": "2e7ac196558d143a8fececcd7e146ff6a03c61f5"
+  "gitHead": "060cd64f1a65c61904446c9725a8fe5d6c8f218c"
 }

package/src/vaadin-overlay.js

@@ -11,6 +11,7 @@ import { isIOS } from '@vaadin/component-base/src/browser-utils.js';
 import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
 import { FocusTrapController } from '@vaadin/component-base/src/focus-trap-controller.js';
+import { getClosestFocusable } from '@vaadin/component-base/src/focus-utils.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 /**
@@ -376,6 +377,10 @@ class Overlay extends ThemableMixin(DirMixin(ControllerMixin(PolymerElement))) {
     this.$.backdrop.addEventListener('click', () => {});
 
     this.addController(this.__focusTrapController);
+
+    this.addEventListener('mousedown', (e) => {
+      this._onMouseDown(e);
+    });
   }
 
   /** @private */
@@ -986,6 +991,16 @@ class Overlay extends ThemableMixin(DirMixin(ControllerMixin(PolymerElement))) {
     this.style.zIndex = zIndex;
     this.__zIndex = zIndex || parseFloat(getComputedStyle(this).zIndex);
   }
+
+  /** @private */
+  _onMouseDown(event) {
+    const target = event.target;
+    const focusable = getClosestFocusable(target.focusElement || target);
+    if (focusable) {
+      event.preventDefault();
+      focusable.focus();
+    }
+  }
 }
 
 customElements.define(Overlay.is, Overlay);