@vaadin/popover 25.3.0 → 25.3.2

package/custom-elements.json

@@ -69,7 +69,7 @@
               "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.",
+              "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.\n\nAn element inside the overlay that has `autofocus` set, such as\n`<vaadin-text-field autofocus>`, receives focus on open instead,\neven when this property is false.",
               "attribute": "autofocus",
               "inheritedFrom": {
                 "name": "OverlayFocusMixin",
@@ -374,7 +374,7 @@
               "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.",
+              "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.\n\nAn element inside the overlay that has `autofocus` set, such as\n`<vaadin-text-field autofocus>`, receives focus on open instead,\neven when this property is false.",
               "fieldName": "autofocus",
               "inheritedFrom": {
                 "name": "OverlayFocusMixin",
@@ -751,7 +751,7 @@
               "type": {
                 "text": "boolean"
               },
-              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.",
+              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.\n\nA field with `autofocus` inside the popover receives focus on open\neven when this is false.",
               "attribute": "autofocus"
             },
             {
@@ -1037,7 +1037,7 @@
               "type": {
                 "text": "boolean"
               },
-              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.",
+              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.\n\nA field with `autofocus` inside the popover receives focus on open\neven when this is false.",
               "fieldName": "autofocus"
             },
             {

package/package.json

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

package/src/vaadin-popover.d.ts

@@ -114,6 +114,9 @@ declare class Popover extends PopoverPositionMixin(PopoverTargetMixin(ThemePrope
   /**
    * When true, the popover content automatically receives focus after
    * it is opened. Modal popovers use this behavior by default.
+   *
+   * A field with `autofocus` inside the popover receives focus on open
+   * even when this is false.
    */
   autofocus: boolean;
 

package/src/vaadin-popover.js

@@ -6,7 +6,7 @@
 import './vaadin-popover-overlay.js';
 import { css, html, LitElement } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
+import { getDeepActiveElement, isKeyboardActive } from '@vaadin/a11y-base/src/focus-utils.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { setOrRemoveAttribute } from '@vaadin/component-base/src/dom-utils.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
@@ -274,6 +274,9 @@ class Popover extends PopoverPositionMixin(
       /**
        * When true, the popover content automatically receives focus after
        * it is opened. Modal popovers use this behavior by default.
+       *
+       * A field with `autofocus` inside the popover receives focus on open
+       * even when this is false.
        */
       autofocus: {
         type: Boolean,
@@ -897,7 +900,8 @@ class Popover extends PopoverPositionMixin(
 
   /** @private */
   __onOverlayOpened() {
-    if (this.autofocus && !this.modal) {
+    // Do not take focus from the content, e.g. from an element with `autofocus`
+    if (this.autofocus && !this.modal && !this._overlayElement._deepContains(getDeepActiveElement())) {
       this.focus();
     }
   }

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/popover",
-  "version": "25.3.0",
+  "version": "25.3.2",
   "description-markup": "markdown",
   "contributions": {
     "html": {
@@ -30,7 +30,7 @@
             },
             {
               "name": "autofocus",
-              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.",
+              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.\n\nA field with `autofocus` inside the popover receives focus on open\neven when this is false.",
               "value": {
                 "type": [
                   "boolean"
@@ -204,7 +204,7 @@
               },
               {
                 "name": "autofocus",
-                "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.",
+                "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.\n\nA field with `autofocus` inside the popover receives focus on open\neven when this is false.",
                 "value": {
                   "type": [
                     "boolean"

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/popover",
-  "version": "25.3.0",
+  "version": "25.3.2",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -35,7 +35,7 @@
             },
             {
               "name": "?autofocus",
-              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.",
+              "description": "When true, the popover content automatically receives focus after\nit is opened. Modal popovers use this behavior by default.\n\nA field with `autofocus` inside the popover receives focus on open\neven when this is false.",
               "value": {
                 "kind": "expression"
               }