@vaadin/overlay 25.0.0-beta1 → 25.0.0-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/overlay",
-  "version": "25.0.0-beta1",
+  "version": "25.0.0-beta3",
   "publishConfig": {
     "access": "public"
   },
@@ -33,17 +33,17 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-beta1",
-    "@vaadin/component-base": "25.0.0-beta1",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-beta1",
+    "@vaadin/a11y-base": "25.0.0-beta3",
+    "@vaadin/component-base": "25.0.0-beta3",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-beta3",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-beta1",
-    "@vaadin/test-runner-commands": "25.0.0-beta1",
+    "@vaadin/chai-plugins": "25.0.0-beta3",
+    "@vaadin/test-runner-commands": "25.0.0-beta3",
     "@vaadin/testing-helpers": "^2.0.0",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-beta1",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-beta3",
     "sinon": "^21.0.0"
   },
-  "gitHead": "1d20cf54e582d1f2e209126d4586f8b4c01c50e0"
+  "gitHead": "4b2006b0e2f4fc131f5483223b852d34224e7b9a"
 }

package/src/vaadin-overlay-mixin.js

@@ -102,6 +102,15 @@ export const OverlayMixin = (superClass) =>
       return ['_rendererOrDataChanged(renderer, owner, model, opened)'];
     }
 
+    /**
+     * Override to specify another element used as a renderer root,
+     * e.g. slotted into the overlay, rather than overlay itself.
+     * @protected
+     */
+    get _rendererRoot() {
+      return this;
+    }
+
     constructor() {
       super();
 
@@ -175,7 +184,7 @@ export const OverlayMixin = (superClass) =>
      */
     requestContentUpdate() {
       if (this.renderer) {
-        this.renderer.call(this.owner, this._contentRoot, this.owner, this.model);
+        this.renderer.call(this.owner, this._rendererRoot, this.owner, this.model);
       }
     }
 
@@ -295,11 +304,11 @@ export const OverlayMixin = (superClass) =>
       this._oldOpened = opened;
 
       if (rendererChanged && hasOldRenderer) {
-        this._contentRoot.innerHTML = '';
+        this._rendererRoot.innerHTML = '';
         // Whenever a Lit-based renderer is used, it assigns a Lit part to the node it was rendered into.
         // When clearing the rendered content, this part needs to be manually disposed of.
         // Otherwise, using a Lit-based renderer on the same node will throw an exception or render nothing afterward.
-        delete this._contentRoot._$litPart$;
+        delete this._rendererRoot._$litPart$;
       }
 
       if (opened && renderer && (rendererChanged || openedChanged || ownerOrModelChanged)) {
@@ -552,7 +561,7 @@ export const OverlayMixin = (superClass) =>
      * @private
      */
     _keydownListener(event) {
-      if (!this._last) {
+      if (!this._last || event.defaultPrevented) {
         return;
       }
 

package/src/vaadin-overlay.d.ts

@@ -23,7 +23,7 @@ export type OverlayOpenEvent = CustomEvent<{ overlay: HTMLElement }>;
  * Fired when the opened overlay is about to be closed.
  * Calling `preventDefault()` on the event cancels the closing.
  */
-export type OverlayCloseEvent = CustomEvent<{ overlay: HTMLElement }>;
+export type OverlayCloseEvent = CustomEvent<{ overlay: HTMLElement; sourceEvent?: Event }>;
 
 /**
  * Fired after the overlay is closed.