@vaadin/dialog 25.3.0-alpha6 → 25.3.0-alpha7

package/custom-elements.json

@@ -796,7 +796,8 @@
             {
               "kind": "method",
               "name": "requestContentUpdate",
-              "description": "Requests an update for the content of the dialog.\nWhile performing the update, it invokes the renderer passed in the `renderer` property,\nas well as `headerRender` and `footerRenderer` properties, if these are defined.\n\nIt is not guaranteed that the update happens immediately (synchronously) after it is requested."
+              "description": "Requests an update for the content of the dialog.\nWhile performing the update, it invokes the renderer passed in the `renderer` property,\nas well as `headerRender` and `footerRenderer` properties, if these are defined.\n\nIt is not guaranteed that the update happens immediately (synchronously) after it is requested.",
+              "deprecated": "This method is only used with renderers and will be removed in Vaadin 26"
             }
           ],
           "attributes": [
@@ -1195,6 +1196,7 @@
               "kind": "method",
               "name": "requestContentUpdate",
               "description": "Requests an update for the content of the dialog.\nWhile performing the update, it invokes the renderer passed in the `renderer` property,\nas well as `headerRender` and `footerRenderer` properties, if these are defined.\n\nIt is not guaranteed that the update happens immediately (synchronously) after it is requested.",
+              "deprecated": "This method is only used with renderers and will be removed in Vaadin 26",
               "inheritedFrom": {
                 "name": "DialogRendererMixin",
                 "module": "src/vaadin-dialog-renderer-mixin.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/dialog",
-  "version": "25.3.0-alpha6",
+  "version": "25.3.0-alpha7",
   "publishConfig": {
     "access": "public"
   },
@@ -37,19 +37,19 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/component-base": "25.3.0-alpha6",
-    "@vaadin/lit-renderer": "25.3.0-alpha6",
-    "@vaadin/overlay": "25.3.0-alpha6",
-    "@vaadin/vaadin-themable-mixin": "25.3.0-alpha6",
+    "@vaadin/component-base": "25.3.0-alpha7",
+    "@vaadin/lit-renderer": "25.3.0-alpha7",
+    "@vaadin/overlay": "25.3.0-alpha7",
+    "@vaadin/vaadin-themable-mixin": "25.3.0-alpha7",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/a11y-base": "25.3.0-alpha6",
-    "@vaadin/aura": "25.3.0-alpha6",
-    "@vaadin/chai-plugins": "25.3.0-alpha6",
-    "@vaadin/test-runner-commands": "25.3.0-alpha6",
+    "@vaadin/a11y-base": "25.3.0-alpha7",
+    "@vaadin/aura": "25.3.0-alpha7",
+    "@vaadin/chai-plugins": "25.3.0-alpha7",
+    "@vaadin/test-runner-commands": "25.3.0-alpha7",
     "@vaadin/testing-helpers": "^2.0.0",
-    "@vaadin/vaadin-lumo-styles": "25.3.0-alpha6",
+    "@vaadin/vaadin-lumo-styles": "25.3.0-alpha7",
     "sinon": "^22.0.0"
   },
   "customElements": "custom-elements.json",
@@ -57,5 +57,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "92c124fb9cff367bc07e734d8e65707facd0bd43"
+  "gitHead": "ae7b9823df5598faebd7a482993029ee489c35ae"
 }

package/src/vaadin-dialog-base-mixin.js

@@ -198,10 +198,11 @@ export const DialogBaseMixin = (superClass) =>
     }
 
     /** @private */
-    _bringOverlayToFront() {
-      if (this.modeless) {
-        this._overlayElement.bringToFront();
+    _bringOverlayToFront(event) {
+      if (!this.modeless) {
+        return;
       }
+      this._overlayElement.bringToFront(event);
     }
 
     /** @private */

package/src/vaadin-dialog-overlay.js

@@ -7,6 +7,7 @@ import { html, LitElement } from 'lit';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { getOverlaysOnTop, isNestedOverlay } from '@vaadin/overlay/src/vaadin-overlay-stack-mixin.js';
 import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { dialogOverlayStyles } from './styles/vaadin-dialog-overlay-base-styles.js';
@@ -31,11 +32,11 @@ export class DialogOverlay extends DialogOverlayMixin(
   }
 
   /**
-   * Override method from OverlayFocusMixin to use owner as focus trap root
+   * Override method from OverlayFocusMixin to use owner as focus root
    * @protected
    * @override
    */
-  get _focusTrapRoot() {
+  get _focusRoot() {
     return this.owner;
   }
 
@@ -55,6 +56,29 @@ export class DialogOverlay extends DialogOverlayMixin(
       </div>
     `;
   }
+
+  /**
+   * @param {Event} event
+   * @protected
+   * @override
+   */
+  bringToFront(event) {
+    if (event instanceof Event) {
+      const path = event.composedPath();
+
+      // Do not bring overlay to front if this method is called
+      // on event that originates from a nested dialog content.
+      const isNestedDialogEvent = getOverlaysOnTop(this).some(
+        (overlay) => path.includes(overlay) && isNestedOverlay(this, overlay) && overlay instanceof DialogOverlay,
+      );
+
+      if (isNestedDialogEvent) {
+        return;
+      }
+    }
+
+    super.bringToFront();
+  }
 }
 
 defineCustomElement(DialogOverlay);

package/src/vaadin-dialog-renderer-mixin.d.ts

@@ -69,6 +69,8 @@ export declare class DialogRendererMixinClass {
    * as well as `headerRender` and `footerRenderer` properties, if these are defined.
    *
    * It is not guaranteed that the update happens immediately (synchronously) after it is requested.
+   *
+   * @deprecated This method is only used with renderers and will be removed in Vaadin 26
    */
   requestContentUpdate(): void;
 }

package/src/vaadin-dialog-renderer-mixin.js

@@ -77,6 +77,8 @@ export const DialogRendererMixin = (superClass) =>
      * as well as `headerRender` and `footerRenderer` properties, if these are defined.
      *
      * It is not guaranteed that the update happens immediately (synchronously) after it is requested.
+     *
+     * @deprecated This method is only used with renderers and will be removed in Vaadin 26
      */
     requestContentUpdate() {
       if (this._overlayElement) {

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/dialog",
-  "version": "25.3.0-alpha6",
+  "version": "25.3.0-alpha7",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/dialog",
-  "version": "25.3.0-alpha6",
+  "version": "25.3.0-alpha7",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {