@vaadin/dialog 25.3.0-dev.1fa5a51482 → 25.3.0-rc1

package/custom-elements.json

@@ -56,6 +56,16 @@
               "description": "Set to true to remove backdrop and allow click events on background elements.",
               "attribute": "modeless"
             },
+            {
+              "kind": "field",
+              "name": "noAutofocus",
+              "privacy": "public",
+              "type": {
+                "text": "boolean"
+              },
+              "description": "Set to true to prevent focus from moving into the dialog on open.\n\nThis property only works for non-modal dialogs and is ignored\nfor modal ones, where focus must always stay inside.",
+              "attribute": "no-autofocus"
+            },
             {
               "kind": "field",
               "name": "noCloseOnEsc",
@@ -83,7 +93,8 @@
               "type": {
                 "text": "boolean"
               },
-              "description": "Set to true to disable focus trapping.",
+              "description": "Set to true to prevent the dialog from receiving focus\non open and trapping it inside.",
+              "deprecated": "This property is deprecated and will be removed in Vaadin 26.",
               "attribute": "no-focus-trap"
             },
             {
@@ -151,6 +162,14 @@
               "description": "Set to true to remove backdrop and allow click events on background elements.",
               "fieldName": "modeless"
             },
+            {
+              "name": "no-autofocus",
+              "type": {
+                "text": "boolean"
+              },
+              "description": "Set to true to prevent focus from moving into the dialog on open.\n\nThis property only works for non-modal dialogs and is ignored\nfor modal ones, where focus must always stay inside.",
+              "fieldName": "noAutofocus"
+            },
             {
               "name": "no-close-on-esc",
               "type": {
@@ -172,7 +191,8 @@
               "type": {
                 "text": "boolean"
               },
-              "description": "Set to true to disable focus trapping.",
+              "description": "Set to true to prevent the dialog from receiving focus\non open and trapping it inside.",
+              "deprecated": "This property is deprecated and will be removed in Vaadin 26.",
               "fieldName": "noFocusTrap"
             },
             {
@@ -326,6 +346,20 @@
           "description": "",
           "name": "DialogOverlayMixin",
           "members": [
+            {
+              "kind": "field",
+              "name": "autofocus",
+              "privacy": "public",
+              "type": {
+                "text": "boolean"
+              },
+              "description": "Set to true to move focus into the overlay automatically on open.\n\nFocus moves to the first tabbable element in the tab order. This\ncan be the overlay itself if it has `tabindex` attribute set to `0`\non the host element or the `overlay` shadow DOM part.",
+              "attribute": "autofocus",
+              "inheritedFrom": {
+                "name": "OverlayFocusMixin",
+                "package": "@vaadin/overlay/src/vaadin-overlay-focus-mixin.js"
+              }
+            },
             {
               "kind": "method",
               "name": "bringToFront",
@@ -351,6 +385,16 @@
                 "package": "@vaadin/overlay/src/vaadin-overlay-mixin.js"
               }
             },
+            {
+              "kind": "method",
+              "name": "containsFocus",
+              "description": "Returns true if the overlay contains focus, including nested shadow roots.",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              }
+            },
             {
               "kind": "field",
               "name": "focusTrap",
@@ -358,7 +402,7 @@
               "type": {
                 "text": "boolean"
               },
-              "description": "When true, opening the overlay moves focus to the first focusable child,\nor to the overlay part with tabindex if there are no focusable children.",
+              "description": "Set to true to move focus into the overlay automatically on open\nand keep it inside: Tab and Shift+Tab cycle through the overlay's\ncontent until the overlay is closed.\n\nFocus moves to the first tabbable element in the tab order. This\ncan be the overlay itself if it has `tabindex` attribute set to `0`\non the host element or the `overlay` shadow DOM part.",
               "attribute": "focus-trap",
               "inheritedFrom": {
                 "name": "OverlayFocusMixin",
@@ -570,12 +614,24 @@
             }
           ],
           "attributes": [
+            {
+              "name": "autofocus",
+              "type": {
+                "text": "boolean"
+              },
+              "description": "Set to true to move focus into the overlay automatically on open.\n\nFocus moves to the first tabbable element in the tab order. This\ncan be the overlay itself if it has `tabindex` attribute set to `0`\non the host element or the `overlay` shadow DOM part.",
+              "fieldName": "autofocus",
+              "inheritedFrom": {
+                "name": "OverlayFocusMixin",
+                "package": "@vaadin/overlay/src/vaadin-overlay-focus-mixin.js"
+              }
+            },
             {
               "name": "focus-trap",
               "type": {
                 "text": "boolean"
               },
-              "description": "When true, opening the overlay moves focus to the first focusable child,\nor to the overlay part with tabindex if there are no focusable children.",
+              "description": "Set to true to move focus into the overlay automatically on open\nand keep it inside: Tab and Shift+Tab cycle through the overlay's\ncontent until the overlay is closed.\n\nFocus moves to the first tabbable element in the tab order. This\ncan be the overlay itself if it has `tabindex` attribute set to `0`\non the host element or the `overlay` shadow DOM part.",
               "fieldName": "focusTrap",
               "inheritedFrom": {
                 "name": "OverlayFocusMixin",
@@ -983,13 +1039,67 @@
         }
       ]
     },
+    {
+      "kind": "javascript-module",
+      "path": "src/vaadin-dialog-utils.js",
+      "declarations": [
+        {
+          "kind": "class",
+          "description": "Remembers where a pointer gesture started, to tell a click from a drag once it ends.",
+          "name": "ClickTracker",
+          "members": [
+            {
+              "kind": "method",
+              "name": "isClick",
+              "parameters": [
+                {
+                  "name": "e",
+                  "type": {
+                    "text": "!MouseEvent | !TouchEvent"
+                  }
+                }
+              ],
+              "description": "Returns true if the pointer hasn't moved since the gesture started.",
+              "return": {
+                "type": {
+                  "text": "boolean"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "start",
+              "parameters": [
+                {
+                  "name": "e",
+                  "type": {
+                    "text": "!MouseEvent | !TouchEvent"
+                  }
+                }
+              ],
+              "description": "Stores the position where the gesture started."
+            }
+          ]
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "ClickTracker",
+          "declaration": {
+            "name": "ClickTracker",
+            "module": "src/vaadin-dialog-utils.js"
+          }
+        }
+      ]
+    },
     {
       "kind": "javascript-module",
       "path": "src/vaadin-dialog.js",
       "declarations": [
         {
           "kind": "class",
-          "description": "`<vaadin-dialog>` is a Web Component for creating customized modal dialogs.\n\n```html\n<vaadin-dialog header-title=\"Title\">\n  <div>Dialog content</div>\n  <div slot=\"footer\">Footer</div>\n</vaadin-dialog>\n```\n\n### Slots\n\nDialog supports following slots for providing content:\n\nName             | Description\n-----------------|-------------\n(none)           | Default slot for the content\n`header-content` | Slot for the header content\n`footer`         | Slot for the footer content\n\n#### Renderer (deprecated)\n\nThe content of the dialog can also be populated by using the renderer callback functions,\nalthough this approach is deprecated in favor of slotted content.\n\nThe renderer function provides `root`, `dialog` arguments.\nGenerate DOM content, append it to the `root` element and control the state\nof the host element by accessing `dialog`. Before generating new content,\nusers are able to check if there is already content in `root` for reusing it.\n\n```html\n<vaadin-dialog id=\"dialog\"></vaadin-dialog>\n```\n```js\nconst dialog = document.querySelector('#dialog');\ndialog.renderer = function(root, dialog) {\n  root.textContent = \"Sample dialog\";\n};\n```\n\nRenderer is called on the opening of the dialog.\nDOM generated during the renderer call can be reused\nin the next renderer call and will be provided with the `root` argument.\nOn first call it will be empty.\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`backdrop`       | Backdrop of the overlay\n`overlay`        | The overlay container\n`content`        | The overlay content\n`header`         | Element wrapping title and header content\n`header-content` | Element wrapping the header content slot\n`title`          | Element wrapping the title slot\n`footer`         | Element wrapping the footer slot\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|--------------------------------------------\n`has-title`      | Set when the element has a title\n`has-header`     | Set when the element has header content\n`has-footer`     | Set when the element has footer content\n`overflow`       | Set to `top`, `bottom`, none or both\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property                          |\n:--------------------------------------------|\n|`--vaadin-dialog-background`                |\n|`--vaadin-dialog-border-color`              |\n|`--vaadin-dialog-border-radius`             |\n|`--vaadin-dialog-border-width`              |\n|`--vaadin-dialog-max-width`                 |\n|`--vaadin-dialog-min-width`                 |\n|`--vaadin-dialog-overflow-indicator-color`  |\n|`--vaadin-dialog-overflow-indicator-height` |\n|`--vaadin-dialog-padding`                   |\n|`--vaadin-dialog-shadow`                    |\n|`--vaadin-dialog-text-color`                |\n|`--vaadin-dialog-title-color`               |\n|`--vaadin-dialog-title-font-size`           |\n|`--vaadin-dialog-title-font-weight`         |\n|`--vaadin-dialog-title-line-height`         |\n|`--vaadin-overlay-backdrop-background`      |\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-dialog>` is a Web Component for creating customized modal dialogs.\n\n```html\n<vaadin-dialog header-title=\"Title\">\n  <div>Dialog content</div>\n  <div slot=\"footer\">Footer</div>\n</vaadin-dialog>\n```\n\n### Slots\n\nDialog supports following slots for providing content:\n\nName             | Description\n-----------------|-------------\n(none)           | Default slot for the content\n`header-content` | Slot for the header content\n`footer`         | Slot for the footer content\n\n#### Renderer (deprecated)\n\nThe content of the dialog can also be populated by using the renderer callback functions,\nalthough this approach is deprecated in favor of slotted content.\n\nThe renderer function provides `root`, `dialog` arguments.\nGenerate DOM content, append it to the `root` element and control the state\nof the host element by accessing `dialog`. Before generating new content,\nusers are able to check if there is already content in `root` for reusing it.\n\n```html\n<vaadin-dialog id=\"dialog\"></vaadin-dialog>\n```\n```js\nconst dialog = document.querySelector('#dialog');\ndialog.renderer = function(root, dialog) {\n  root.textContent = \"Sample dialog\";\n};\n```\n\nRenderer is called on the opening of the dialog.\nDOM generated during the renderer call can be reused\nin the next renderer call and will be provided with the `root` argument.\nOn first call it will be empty.\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`backdrop`       | Backdrop of the overlay\n`overlay`        | The overlay container\n`content`        | The overlay content\n`header`         | Element wrapping title and header content\n`header-content` | Element wrapping the header content slot\n`title`          | Element wrapping the title slot\n`footer`         | Element wrapping the footer slot\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|--------------------------------------------\n`has-title`      | Set when the element has a title\n`has-header`     | Set when the element has header content\n`has-footer`     | Set when the element has footer content\n`overflow`       | Set to `top`, `bottom`, none or both\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property                          |\n:--------------------------------------------|\n|`--vaadin-dialog-background`                |\n|`--vaadin-dialog-border-color`              |\n|`--vaadin-dialog-border-radius`             |\n|`--vaadin-dialog-border-width`              |\n|`--vaadin-dialog-max-width`                 |\n|`--vaadin-dialog-min-width`                 |\n|`--vaadin-dialog-overflow-indicator-color`  |\n|`--vaadin-dialog-overflow-indicator-height` |\n|`--vaadin-dialog-padding`                   |\n|`--vaadin-dialog-shadow`                    |\n|`--vaadin-dialog-text-color`                |\n|`--vaadin-dialog-title-color`               |\n|`--vaadin-dialog-title-font-size`           |\n|`--vaadin-dialog-title-font-weight`         |\n|`--vaadin-dialog-title-line-height`         |\n|`--vaadin-dialog-toolbar-gap`               |\n|`--vaadin-overlay-backdrop-background`      |\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "name": "Dialog",
           "members": [
             {
@@ -1106,6 +1216,20 @@
                 "module": "src/vaadin-dialog-base-mixin.js"
               }
             },
+            {
+              "kind": "field",
+              "name": "noAutofocus",
+              "privacy": "public",
+              "type": {
+                "text": "boolean"
+              },
+              "description": "Set to true to prevent focus from moving into the dialog on open.\n\nThis property only works for non-modal dialogs and is ignored\nfor modal ones, where focus must always stay inside.",
+              "attribute": "no-autofocus",
+              "inheritedFrom": {
+                "name": "DialogBaseMixin",
+                "module": "src/vaadin-dialog-base-mixin.js"
+              }
+            },
             {
               "kind": "field",
               "name": "noCloseOnEsc",
@@ -1141,7 +1265,8 @@
               "type": {
                 "text": "boolean"
               },
-              "description": "Set to true to disable focus trapping.",
+              "description": "Set to true to prevent the dialog from receiving focus\non open and trapping it inside.",
+              "deprecated": "This property is deprecated and will be removed in Vaadin 26.",
               "attribute": "no-focus-trap",
               "inheritedFrom": {
                 "name": "DialogBaseMixin",
@@ -1408,6 +1533,18 @@
                 "module": "src/vaadin-dialog-base-mixin.js"
               }
             },
+            {
+              "name": "no-autofocus",
+              "type": {
+                "text": "boolean"
+              },
+              "description": "Set to true to prevent focus from moving into the dialog on open.\n\nThis property only works for non-modal dialogs and is ignored\nfor modal ones, where focus must always stay inside.",
+              "fieldName": "noAutofocus",
+              "inheritedFrom": {
+                "name": "DialogBaseMixin",
+                "module": "src/vaadin-dialog-base-mixin.js"
+              }
+            },
             {
               "name": "no-close-on-esc",
               "type": {
@@ -1437,7 +1574,8 @@
               "type": {
                 "text": "boolean"
               },
-              "description": "Set to true to disable focus trapping.",
+              "description": "Set to true to prevent the dialog from receiving focus\non open and trapping it inside.",
+              "deprecated": "This property is deprecated and will be removed in Vaadin 26.",
               "fieldName": "noFocusTrap",
               "inheritedFrom": {
                 "name": "DialogBaseMixin",

package/package.json

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

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

@@ -33,11 +33,24 @@ export declare class DialogBaseMixinClass {
   modeless: boolean;
 
   /**
-   * Set to true to disable focus trapping.
+   * Set to true to prevent the dialog from receiving focus
+   * on open and trapping it inside.
+   *
    * @attr {boolean} no-focus-trap
+   * @deprecated This property is deprecated and will be removed in Vaadin 26.
    */
   noFocusTrap: boolean;
 
+  /**
+   * Set to true to prevent focus from moving into the dialog on open.
+   *
+   * This property only works for non-modal dialogs and is ignored
+   * for modal ones, where focus must always stay inside.
+   *
+   * @attr {boolean} no-autofocus
+   */
+  noAutofocus: boolean;
+
   /**
    * The `role` attribute value to be set on the dialog. Defaults to "dialog".
    *

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

@@ -3,6 +3,7 @@
  * Copyright (c) 2017 - 2026 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { setOrRemoveAttribute } from '@vaadin/component-base/src/dom-utils.js';
 
 export const DialogBaseMixin = (superClass) =>
   class DialogBaseMixin extends superClass {
@@ -46,14 +47,30 @@ export const DialogBaseMixin = (superClass) =>
         },
 
         /**
-         * Set to true to disable focus trapping.
+         * Set to true to prevent the dialog from receiving focus
+         * on open and trapping it inside.
+         *
          * @attr {boolean} no-focus-trap
+         * @deprecated This property is deprecated and will be removed in Vaadin 26.
          */
         noFocusTrap: {
           type: Boolean,
           value: false,
         },
 
+        /**
+         * Set to true to prevent focus from moving into the dialog on open.
+         *
+         * This property only works for non-modal dialogs and is ignored
+         * for modal ones, where focus must always stay inside.
+         *
+         * @attr {boolean} no-autofocus
+         */
+        noAutofocus: {
+          type: Boolean,
+          value: false,
+        },
+
         /**
          * Set the distance of the dialog from the top of the viewport.
          * If a unitless number is provided, pixels are assumed.
@@ -134,11 +151,7 @@ export const DialogBaseMixin = (superClass) =>
       }
 
       if (props.has('modeless')) {
-        if (!this.modeless) {
-          this.setAttribute('aria-modal', 'true');
-        } else {
-          this.removeAttribute('aria-modal');
-        }
+        setOrRemoveAttribute(this, 'aria-modal', !this.modeless);
       }
     }
 

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

@@ -3,8 +3,9 @@
  * Copyright (c) 2017 - 2026 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
 import { isTouch } from '@vaadin/component-base/src/browser-utils.js';
-import { eventInWindow, getMouseOrFirstTouchEvent } from './vaadin-dialog-utils.js';
+import { ClickTracker, eventInWindow, getMouseOrFirstTouchEvent } from './vaadin-dialog-utils.js';
 
 export const DialogDraggableMixin = (superClass) =>
   class VaadinDialogDraggableMixin extends superClass {
@@ -44,6 +45,7 @@ export const DialogDraggableMixin = (superClass) =>
       super.ready();
       this._originalBounds = {};
       this._originalMouseCoords = {};
+      this.__dragTracker = new ClickTracker();
       this._startDrag = this._startDrag.bind(this);
       this._drag = this._drag.bind(this);
       this._stopDrag = this._stopDrag.bind(this);
@@ -86,6 +88,8 @@ export const DialogDraggableMixin = (superClass) =>
         if ((isResizerContainer && !isResizerContainerScrollbar) || isContentPart || isDraggable) {
           // Signal that we're handling this drag event, so parent dialogs won't also drag
           e.preventDefault();
+          // `preventDefault()` above cancels the native focus change, restored in `_stopDrag()`
+          this.__dragTracker.start(e);
           this._originalBounds = this.$.overlay.getBounds();
           const event = getMouseOrFirstTouchEvent(e);
           this._originalMouseCoords = { top: event.pageY, left: event.pageX };
@@ -128,7 +132,12 @@ export const DialogDraggableMixin = (superClass) =>
     }
 
     /** @private */
-    _stopDrag() {
+    _stopDrag(e) {
+      // Focus on click, not on drag, so that moving the dialog doesn't interrupt editing
+      if (this.__dragTracker.isClick(e) && !this.$.overlay.containsFocus()) {
+        this.focus({ preventScroll: true, focusVisible: isKeyboardActive() });
+      }
+
       this.dispatchEvent(new CustomEvent('dragged', { detail: { top: this.top, left: this.left } }));
       window.removeEventListener('mouseup', this._stopDrag);
       window.removeEventListener('touchend', this._stopDrag);

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

@@ -44,4 +44,9 @@ export declare class DialogOverlayMixinClass {
    * Retrieves the coordinates of the overlay.
    */
   getBounds(): DialogOverlayBounds;
+
+  /**
+   * Returns true if the overlay contains focus, including nested shadow roots.
+   */
+  containsFocus(): boolean;
 }

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

@@ -3,6 +3,7 @@
  * Copyright (c) 2017 - 2026 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { getDeepActiveElement } from '@vaadin/a11y-base/src/focus-utils.js';
 import { SlotObserver } from '@vaadin/component-base/src/slot-observer.js';
 import { OverlayMixin } from '@vaadin/overlay/src/vaadin-overlay-mixin.js';
 import { setOverlayStateAttribute } from '@vaadin/overlay/src/vaadin-overlay-utils.js';
@@ -59,6 +60,15 @@ export const DialogOverlayMixin = (superClass) =>
       return this.owner;
     }
 
+    /**
+     * Returns true if the overlay contains focus, including nested shadow roots.
+     *
+     * @return {boolean}
+     */
+    containsFocus() {
+      return this._deepContains(getDeepActiveElement());
+    }
+
     /**
      * Override method from OverlayMixin to use slotted div as a renderer root.
      * @protected

package/src/vaadin-dialog-overlay.js

@@ -21,9 +21,7 @@ import { DialogOverlayMixin } from './vaadin-dialog-overlay-mixin.js';
  * @extends HTMLElement
  * @private
  */
-export class DialogOverlay extends DialogOverlayMixin(
-  DirMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))),
-) {
+class DialogOverlay extends DialogOverlayMixin(DirMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-dialog-overlay';
   }
@@ -83,3 +81,5 @@ export class DialogOverlay extends DialogOverlayMixin(
 }
 
 defineCustomElement(DialogOverlay);
+
+export { DialogOverlay };

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

@@ -3,7 +3,8 @@
  * Copyright (c) 2017 - 2026 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { eventInWindow, getMouseOrFirstTouchEvent } from './vaadin-dialog-utils.js';
+import { isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
+import { ClickTracker, eventInWindow, getMouseOrFirstTouchEvent } from './vaadin-dialog-utils.js';
 export const DialogResizableMixin = (superClass) =>
   class VaadinDialogResizableMixin extends superClass {
     static get properties() {
@@ -24,6 +25,7 @@ export const DialogResizableMixin = (superClass) =>
       super.ready();
       this._originalBounds = {};
       this._originalMouseCoords = {};
+      this.__resizeTracker = new ClickTracker();
       this._resizeListeners = { start: {}, resize: {}, stop: {} };
       this._addResizeListeners();
     }
@@ -35,7 +37,7 @@ export const DialogResizableMixin = (superClass) =>
         const resizer = document.createElement('div');
         this._resizeListeners.start[direction] = (e) => this._startResize(e, direction);
         this._resizeListeners.resize[direction] = (e) => this._resize(e, direction);
-        this._resizeListeners.stop[direction] = () => this._stopResize(direction);
+        this._resizeListeners.stop[direction] = (e) => this._stopResize(e, direction);
         if (direction.length === 1) {
           resizer.classList.add('edge');
         }
@@ -60,6 +62,8 @@ export const DialogResizableMixin = (superClass) =>
 
       if (e.button === 0 || e.touches) {
         e.preventDefault();
+        // `preventDefault()` above cancels the native focus change, restored in `_stopResize()`
+        this.__resizeTracker.start(e);
 
         this._originalBounds = this.$.overlay.getBounds();
         const event = getMouseOrFirstTouchEvent(e);
@@ -127,10 +131,16 @@ export const DialogResizableMixin = (superClass) =>
     }
 
     /**
+     * @param {!MouseEvent | !TouchEvent} e
      * @param {!DialogResizableDirection} direction
      * @protected
      */
-    _stopResize(direction) {
+    _stopResize(e, direction) {
+      // Focus on click, not on resize, so that resizing the dialog doesn't interrupt editing
+      if (this.__resizeTracker.isClick(e) && !this.$.overlay.containsFocus()) {
+        this.focus({ preventScroll: true, focusVisible: isKeyboardActive() });
+      }
+
       window.removeEventListener('mousemove', this._resizeListeners.resize[direction]);
       window.removeEventListener('touchmove', this._resizeListeners.resize[direction]);
       window.removeEventListener('mouseup', this._resizeListeners.stop[direction]);

package/src/vaadin-dialog-utils.d.ts

@@ -6,6 +6,7 @@
 
 /**
  * Checks if the argument is a touch event and if so, returns a first touch.
+ * On `touchend`, `touches` is empty and the released point is in `changedTouches`.
  * Otherwise, if the mouse event was passed, returns it as is.
  */
 declare function getMouseOrFirstTouchEvent(e: MouseEvent | TouchEvent): MouseEvent | Touch;
@@ -18,3 +19,18 @@ export { getMouseOrFirstTouchEvent };
 declare function eventInWindow(e: MouseEvent | TouchEvent): boolean;
 
 export { eventInWindow };
+
+/**
+ * Remembers where a pointer gesture started, to tell a click from a drag once it ends.
+ */
+export declare class ClickTracker {
+  /**
+   * Stores the position where the gesture started.
+   */
+  start(e: MouseEvent | TouchEvent): void;
+
+  /**
+   * Returns true if the pointer hasn't moved since the gesture started.
+   */
+  isClick(e: MouseEvent | TouchEvent): boolean;
+}

package/src/vaadin-dialog-utils.js

@@ -6,13 +6,14 @@
 
 /**
  * Checks if the argument is a touch event and if so, returns a first touch.
+ * On `touchend`, `touches` is empty and the released point is in `changedTouches`.
  * Otherwise, if the mouse event was passed, returns it as is.
  * @param {!MouseEvent | !TouchEvent} e
  * @return {!MouseEvent | !Touch}
  * @protected
  */
 export function getMouseOrFirstTouchEvent(e) {
-  return e.touches ? e.touches[0] : e;
+  return e.touches ? e.touches[0] || e.changedTouches[0] : e;
 }
 
 /**
@@ -24,3 +25,35 @@ export function getMouseOrFirstTouchEvent(e) {
 export function eventInWindow(e) {
   return e.clientX >= 0 && e.clientX <= window.innerWidth && e.clientY >= 0 && e.clientY <= window.innerHeight;
 }
+
+// Pointer movement in pixels above which a gesture is a drag, not a click.
+// Same value as `TRACK_DISTANCE` in `@vaadin/component-base/src/gestures.js`.
+const DRAG_DISTANCE = 5;
+
+/**
+ * Remembers where a pointer gesture started, to tell a click from a drag once it ends.
+ */
+export class ClickTracker {
+  /** @type {{ x: number, y: number }} */
+  #start;
+
+  /**
+   * Stores the position where the gesture started.
+   * @param {!MouseEvent | !TouchEvent} e
+   */
+  start(e) {
+    // Viewport coordinates, so scrolling during the gesture doesn't count as movement
+    const { clientX, clientY } = getMouseOrFirstTouchEvent(e);
+    this.#start = { x: clientX, y: clientY };
+  }
+
+  /**
+   * Returns true if the pointer hasn't moved since the gesture started.
+   * @param {!MouseEvent | !TouchEvent} e
+   * @return {boolean}
+   */
+  isClick(e) {
+    const { clientX, clientY } = getMouseOrFirstTouchEvent(e);
+    return Math.abs(clientX - this.#start.x) < DRAG_DISTANCE && Math.abs(clientY - this.#start.y) < DRAG_DISTANCE;
+  }
+}

package/src/vaadin-dialog.d.ts

@@ -162,6 +162,7 @@ export type DialogEventMap = DialogCustomEventMap & HTMLElementEventMap;
  * |`--vaadin-dialog-title-font-size`           |
  * |`--vaadin-dialog-title-font-weight`         |
  * |`--vaadin-dialog-title-line-height`         |
+ * |`--vaadin-dialog-toolbar-gap`               |
  * |`--vaadin-overlay-backdrop-background`      |
  *
  * See [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.

package/src/vaadin-dialog.js

@@ -105,6 +105,7 @@ export { DialogOverlay } from './vaadin-dialog-overlay.js';
  * |`--vaadin-dialog-title-font-size`           |
  * |`--vaadin-dialog-title-font-weight`         |
  * |`--vaadin-dialog-title-line-height`         |
+ * |`--vaadin-dialog-toolbar-gap`               |
  * |`--vaadin-overlay-backdrop-background`      |
  *
  * See [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.
@@ -172,7 +173,8 @@ class Dialog extends DialogSizeMixin(
         .withBackdrop="${!this.modeless}"
         ?resizable="${this.resizable}"
         restore-focus-on-close
-        ?focus-trap="${!this.noFocusTrap}"
+        ?focus-trap="${!this.noFocusTrap && !this.modeless}"
+        ?autofocus="${this.modeless ? !this.noAutofocus && !this.noFocusTrap : !this.noFocusTrap}"
         exportparts="backdrop, overlay, header, title, header-content, content, footer"
       >
         <slot name="title" slot="title"></slot>

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/dialog",
-  "version": "25.3.0-dev.1fa5a51482",
+  "version": "25.3.0-rc1",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-dialog",
-          "description": "`<vaadin-dialog>` is a Web Component for creating customized modal dialogs.\n\n```html\n<vaadin-dialog header-title=\"Title\">\n  <div>Dialog content</div>\n  <div slot=\"footer\">Footer</div>\n</vaadin-dialog>\n```\n\n### Slots\n\nDialog supports following slots for providing content:\n\nName             | Description\n-----------------|-------------\n(none)           | Default slot for the content\n`header-content` | Slot for the header content\n`footer`         | Slot for the footer content\n\n#### Renderer (deprecated)\n\nThe content of the dialog can also be populated by using the renderer callback functions,\nalthough this approach is deprecated in favor of slotted content.\n\nThe renderer function provides `root`, `dialog` arguments.\nGenerate DOM content, append it to the `root` element and control the state\nof the host element by accessing `dialog`. Before generating new content,\nusers are able to check if there is already content in `root` for reusing it.\n\n```html\n<vaadin-dialog id=\"dialog\"></vaadin-dialog>\n```\n```js\nconst dialog = document.querySelector('#dialog');\ndialog.renderer = function(root, dialog) {\n  root.textContent = \"Sample dialog\";\n};\n```\n\nRenderer is called on the opening of the dialog.\nDOM generated during the renderer call can be reused\nin the next renderer call and will be provided with the `root` argument.\nOn first call it will be empty.\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`backdrop`       | Backdrop of the overlay\n`overlay`        | The overlay container\n`content`        | The overlay content\n`header`         | Element wrapping title and header content\n`header-content` | Element wrapping the header content slot\n`title`          | Element wrapping the title slot\n`footer`         | Element wrapping the footer slot\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|--------------------------------------------\n`has-title`      | Set when the element has a title\n`has-header`     | Set when the element has header content\n`has-footer`     | Set when the element has footer content\n`overflow`       | Set to `top`, `bottom`, none or both\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property                          |\n:--------------------------------------------|\n|`--vaadin-dialog-background`                |\n|`--vaadin-dialog-border-color`              |\n|`--vaadin-dialog-border-radius`             |\n|`--vaadin-dialog-border-width`              |\n|`--vaadin-dialog-max-width`                 |\n|`--vaadin-dialog-min-width`                 |\n|`--vaadin-dialog-overflow-indicator-color`  |\n|`--vaadin-dialog-overflow-indicator-height` |\n|`--vaadin-dialog-padding`                   |\n|`--vaadin-dialog-shadow`                    |\n|`--vaadin-dialog-text-color`                |\n|`--vaadin-dialog-title-color`               |\n|`--vaadin-dialog-title-font-size`           |\n|`--vaadin-dialog-title-font-weight`         |\n|`--vaadin-dialog-title-line-height`         |\n|`--vaadin-overlay-backdrop-background`      |\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-dialog>` is a Web Component for creating customized modal dialogs.\n\n```html\n<vaadin-dialog header-title=\"Title\">\n  <div>Dialog content</div>\n  <div slot=\"footer\">Footer</div>\n</vaadin-dialog>\n```\n\n### Slots\n\nDialog supports following slots for providing content:\n\nName             | Description\n-----------------|-------------\n(none)           | Default slot for the content\n`header-content` | Slot for the header content\n`footer`         | Slot for the footer content\n\n#### Renderer (deprecated)\n\nThe content of the dialog can also be populated by using the renderer callback functions,\nalthough this approach is deprecated in favor of slotted content.\n\nThe renderer function provides `root`, `dialog` arguments.\nGenerate DOM content, append it to the `root` element and control the state\nof the host element by accessing `dialog`. Before generating new content,\nusers are able to check if there is already content in `root` for reusing it.\n\n```html\n<vaadin-dialog id=\"dialog\"></vaadin-dialog>\n```\n```js\nconst dialog = document.querySelector('#dialog');\ndialog.renderer = function(root, dialog) {\n  root.textContent = \"Sample dialog\";\n};\n```\n\nRenderer is called on the opening of the dialog.\nDOM generated during the renderer call can be reused\nin the next renderer call and will be provided with the `root` argument.\nOn first call it will be empty.\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`backdrop`       | Backdrop of the overlay\n`overlay`        | The overlay container\n`content`        | The overlay content\n`header`         | Element wrapping title and header content\n`header-content` | Element wrapping the header content slot\n`title`          | Element wrapping the title slot\n`footer`         | Element wrapping the footer slot\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|--------------------------------------------\n`has-title`      | Set when the element has a title\n`has-header`     | Set when the element has header content\n`has-footer`     | Set when the element has footer content\n`overflow`       | Set to `top`, `bottom`, none or both\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property                          |\n:--------------------------------------------|\n|`--vaadin-dialog-background`                |\n|`--vaadin-dialog-border-color`              |\n|`--vaadin-dialog-border-radius`             |\n|`--vaadin-dialog-border-width`              |\n|`--vaadin-dialog-max-width`                 |\n|`--vaadin-dialog-min-width`                 |\n|`--vaadin-dialog-overflow-indicator-color`  |\n|`--vaadin-dialog-overflow-indicator-height` |\n|`--vaadin-dialog-padding`                   |\n|`--vaadin-dialog-shadow`                    |\n|`--vaadin-dialog-text-color`                |\n|`--vaadin-dialog-title-color`               |\n|`--vaadin-dialog-title-font-size`           |\n|`--vaadin-dialog-title-font-weight`         |\n|`--vaadin-dialog-title-line-height`         |\n|`--vaadin-dialog-toolbar-gap`               |\n|`--vaadin-overlay-backdrop-background`      |\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "attributes": [
             {
               "name": "draggable",
@@ -64,6 +64,15 @@
                 ]
               }
             },
+            {
+              "name": "no-autofocus",
+              "description": "Set to true to prevent focus from moving into the dialog on open.\n\nThis property only works for non-modal dialogs and is ignored\nfor modal ones, where focus must always stay inside.",
+              "value": {
+                "type": [
+                  "boolean"
+                ]
+              }
+            },
             {
               "name": "no-close-on-esc",
               "description": "Set to true to disable closing dialog on Escape press",
@@ -84,7 +93,7 @@
             },
             {
               "name": "no-focus-trap",
-              "description": "Set to true to disable focus trapping.",
+              "description": "Set to true to prevent the dialog from receiving focus\non open and trapping it inside.",
               "value": {
                 "type": [
                   "boolean"
@@ -222,6 +231,15 @@
                   ]
                 }
               },
+              {
+                "name": "noAutofocus",
+                "description": "Set to true to prevent focus from moving into the dialog on open.\n\nThis property only works for non-modal dialogs and is ignored\nfor modal ones, where focus must always stay inside.",
+                "value": {
+                  "type": [
+                    "boolean"
+                  ]
+                }
+              },
               {
                 "name": "noCloseOnEsc",
                 "description": "Set to true to disable closing dialog on Escape press",
@@ -242,7 +260,7 @@
               },
               {
                 "name": "noFocusTrap",
-                "description": "Set to true to disable focus trapping.",
+                "description": "Set to true to prevent the dialog from receiving focus\non open and trapping it inside.",
                 "value": {
                   "type": [
                     "boolean"

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/dialog",
-  "version": "25.3.0-dev.1fa5a51482",
+  "version": "25.3.0-rc1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-dialog",
-          "description": "`<vaadin-dialog>` is a Web Component for creating customized modal dialogs.\n\n```html\n<vaadin-dialog header-title=\"Title\">\n  <div>Dialog content</div>\n  <div slot=\"footer\">Footer</div>\n</vaadin-dialog>\n```\n\n### Slots\n\nDialog supports following slots for providing content:\n\nName             | Description\n-----------------|-------------\n(none)           | Default slot for the content\n`header-content` | Slot for the header content\n`footer`         | Slot for the footer content\n\n#### Renderer (deprecated)\n\nThe content of the dialog can also be populated by using the renderer callback functions,\nalthough this approach is deprecated in favor of slotted content.\n\nThe renderer function provides `root`, `dialog` arguments.\nGenerate DOM content, append it to the `root` element and control the state\nof the host element by accessing `dialog`. Before generating new content,\nusers are able to check if there is already content in `root` for reusing it.\n\n```html\n<vaadin-dialog id=\"dialog\"></vaadin-dialog>\n```\n```js\nconst dialog = document.querySelector('#dialog');\ndialog.renderer = function(root, dialog) {\n  root.textContent = \"Sample dialog\";\n};\n```\n\nRenderer is called on the opening of the dialog.\nDOM generated during the renderer call can be reused\nin the next renderer call and will be provided with the `root` argument.\nOn first call it will be empty.\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`backdrop`       | Backdrop of the overlay\n`overlay`        | The overlay container\n`content`        | The overlay content\n`header`         | Element wrapping title and header content\n`header-content` | Element wrapping the header content slot\n`title`          | Element wrapping the title slot\n`footer`         | Element wrapping the footer slot\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|--------------------------------------------\n`has-title`      | Set when the element has a title\n`has-header`     | Set when the element has header content\n`has-footer`     | Set when the element has footer content\n`overflow`       | Set to `top`, `bottom`, none or both\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property                          |\n:--------------------------------------------|\n|`--vaadin-dialog-background`                |\n|`--vaadin-dialog-border-color`              |\n|`--vaadin-dialog-border-radius`             |\n|`--vaadin-dialog-border-width`              |\n|`--vaadin-dialog-max-width`                 |\n|`--vaadin-dialog-min-width`                 |\n|`--vaadin-dialog-overflow-indicator-color`  |\n|`--vaadin-dialog-overflow-indicator-height` |\n|`--vaadin-dialog-padding`                   |\n|`--vaadin-dialog-shadow`                    |\n|`--vaadin-dialog-text-color`                |\n|`--vaadin-dialog-title-color`               |\n|`--vaadin-dialog-title-font-size`           |\n|`--vaadin-dialog-title-font-weight`         |\n|`--vaadin-dialog-title-line-height`         |\n|`--vaadin-overlay-backdrop-background`      |\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-dialog>` is a Web Component for creating customized modal dialogs.\n\n```html\n<vaadin-dialog header-title=\"Title\">\n  <div>Dialog content</div>\n  <div slot=\"footer\">Footer</div>\n</vaadin-dialog>\n```\n\n### Slots\n\nDialog supports following slots for providing content:\n\nName             | Description\n-----------------|-------------\n(none)           | Default slot for the content\n`header-content` | Slot for the header content\n`footer`         | Slot for the footer content\n\n#### Renderer (deprecated)\n\nThe content of the dialog can also be populated by using the renderer callback functions,\nalthough this approach is deprecated in favor of slotted content.\n\nThe renderer function provides `root`, `dialog` arguments.\nGenerate DOM content, append it to the `root` element and control the state\nof the host element by accessing `dialog`. Before generating new content,\nusers are able to check if there is already content in `root` for reusing it.\n\n```html\n<vaadin-dialog id=\"dialog\"></vaadin-dialog>\n```\n```js\nconst dialog = document.querySelector('#dialog');\ndialog.renderer = function(root, dialog) {\n  root.textContent = \"Sample dialog\";\n};\n```\n\nRenderer is called on the opening of the dialog.\nDOM generated during the renderer call can be reused\nin the next renderer call and will be provided with the `root` argument.\nOn first call it will be empty.\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`backdrop`       | Backdrop of the overlay\n`overlay`        | The overlay container\n`content`        | The overlay content\n`header`         | Element wrapping title and header content\n`header-content` | Element wrapping the header content slot\n`title`          | Element wrapping the title slot\n`footer`         | Element wrapping the footer slot\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|--------------------------------------------\n`has-title`      | Set when the element has a title\n`has-header`     | Set when the element has header content\n`has-footer`     | Set when the element has footer content\n`overflow`       | Set to `top`, `bottom`, none or both\n\nThe following custom CSS properties are available for styling:\n\nCustom CSS property                          |\n:--------------------------------------------|\n|`--vaadin-dialog-background`                |\n|`--vaadin-dialog-border-color`              |\n|`--vaadin-dialog-border-radius`             |\n|`--vaadin-dialog-border-width`              |\n|`--vaadin-dialog-max-width`                 |\n|`--vaadin-dialog-min-width`                 |\n|`--vaadin-dialog-overflow-indicator-color`  |\n|`--vaadin-dialog-overflow-indicator-height` |\n|`--vaadin-dialog-padding`                   |\n|`--vaadin-dialog-shadow`                    |\n|`--vaadin-dialog-text-color`                |\n|`--vaadin-dialog-title-color`               |\n|`--vaadin-dialog-title-font-size`           |\n|`--vaadin-dialog-title-font-weight`         |\n|`--vaadin-dialog-title-line-height`         |\n|`--vaadin-dialog-toolbar-gap`               |\n|`--vaadin-overlay-backdrop-background`      |\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "extension": true,
           "attributes": [
             {
@@ -75,6 +75,13 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "?noAutofocus",
+              "description": "Set to true to prevent focus from moving into the dialog on open.\n\nThis property only works for non-modal dialogs and is ignored\nfor modal ones, where focus must always stay inside.",
+              "value": {
+                "kind": "expression"
+              }
+            },
             {
               "name": "?noCloseOnEsc",
               "description": "Set to true to disable closing dialog on Escape press",
@@ -91,7 +98,7 @@
             },
             {
               "name": "?noFocusTrap",
-              "description": "Set to true to disable focus trapping.",
+              "description": "Set to true to prevent the dialog from receiving focus\non open and trapping it inside.",
               "value": {
                 "kind": "expression"
               }