@vaadin/popover 24.6.5 → 24.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/popover",
-  "version": "24.6.5",
+  "version": "24.6.6",
   "publishConfig": {
     "access": "public"
   },
@@ -37,18 +37,18 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "~24.6.5",
-    "@vaadin/component-base": "~24.6.5",
-    "@vaadin/lit-renderer": "~24.6.5",
-    "@vaadin/overlay": "~24.6.5",
-    "@vaadin/vaadin-lumo-styles": "~24.6.5",
-    "@vaadin/vaadin-material-styles": "~24.6.5",
-    "@vaadin/vaadin-themable-mixin": "~24.6.5",
+    "@vaadin/a11y-base": "~24.6.6",
+    "@vaadin/component-base": "~24.6.6",
+    "@vaadin/lit-renderer": "~24.6.6",
+    "@vaadin/overlay": "~24.6.6",
+    "@vaadin/vaadin-lumo-styles": "~24.6.6",
+    "@vaadin/vaadin-material-styles": "~24.6.6",
+    "@vaadin/vaadin-themable-mixin": "~24.6.6",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.6.5",
-    "@vaadin/test-runner-commands": "~24.6.5",
+    "@vaadin/chai-plugins": "~24.6.6",
+    "@vaadin/test-runner-commands": "~24.6.6",
     "@vaadin/testing-helpers": "^1.1.0",
     "sinon": "^18.0.0"
   },
@@ -56,5 +56,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "fc109a4234a1f60e89717ab1c0dc8fb4451aa418"
+  "gitHead": "c29f1c07a7a34f0b2c5320c64e7bc66d8cbc0037"
 }

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

@@ -5,6 +5,26 @@
  */
 import { OverlayMixin } from '@vaadin/overlay/src/vaadin-overlay-mixin.js';
 import { PositionMixin } from '@vaadin/overlay/src/vaadin-overlay-position-mixin.js';
+import { setNestedOverlay } from '@vaadin/overlay/src/vaadin-overlay-stack-mixin.js';
+
+/**
+ * Returns the closest parent overlay for given node, if any.
+ * @param {HTMLElement} node
+ * @return {HTMLElement}
+ */
+const getClosestOverlay = (node) => {
+  let n = node;
+
+  while (n && n !== node.ownerDocument) {
+    n = n.parentNode || n.host;
+
+    if (n && n._hasOverlayStackMixin) {
+      return n;
+    }
+  }
+
+  return null;
+};
 
 /**
  * A mixin providing common popover overlay functionality.
@@ -24,6 +44,10 @@ export const PopoverOverlayMixin = (superClass) =>
       };
     }
 
+    static get observers() {
+      return ['__openedOrTargetChanged(opened, positionTarget)'];
+    }
+
     /**
      * Tag name prefix used by custom properties.
      * @protected
@@ -96,4 +120,14 @@ export const PopoverOverlayMixin = (superClass) =>
         this.style.top = `${overlayRect.top + offset}px`;
       }
     }
+
+    /** @private */
+    __openedOrTargetChanged(opened, target) {
+      if (target) {
+        const parent = getClosestOverlay(target);
+        if (parent) {
+          setNestedOverlay(parent, opened ? this : null);
+        }
+      }
+    }
   };

package/src/vaadin-popover.js

@@ -409,8 +409,7 @@ class Popover extends PopoverPositionMixin(
     return [
       '__updateContentHeight(contentHeight, _overlayElement)',
       '__updateContentWidth(contentWidth, _overlayElement)',
-      '__openedOrTargetChanged(opened, target)',
-      '__overlayRoleOrTargetChanged(overlayRole, target)',
+      '__updateAriaAttributes(opened, overlayRole, target)',
     ];
   }
 
@@ -578,27 +577,27 @@ class Popover extends PopoverPositionMixin(
   }
 
   /** @private */
-  __openedOrTargetChanged(opened, target) {
-    if (target) {
-      target.setAttribute('aria-expanded', opened ? 'true' : 'false');
-
-      if (opened) {
-        target.setAttribute('aria-controls', this.__overlayId);
-      } else {
-        target.removeAttribute('aria-controls');
-      }
-    }
-  }
-
-  /** @private */
-  __overlayRoleOrTargetChanged(overlayRole, target) {
+  __updateAriaAttributes(opened, overlayRole, target) {
     if (this.__oldTarget) {
-      this.__oldTarget.removeAttribute('aria-haspopup');
+      const oldEffectiveTarget = this.__oldTarget.ariaTarget || this.__oldTarget;
+      oldEffectiveTarget.removeAttribute('aria-haspopup');
+      oldEffectiveTarget.removeAttribute('aria-expanded');
+      oldEffectiveTarget.removeAttribute('aria-controls');
     }
 
     if (target) {
+      const effectiveTarget = target.ariaTarget || target;
+
       const isDialog = overlayRole === 'dialog' || overlayRole === 'alertdialog';
-      target.setAttribute('aria-haspopup', isDialog ? 'dialog' : 'true');
+      effectiveTarget.setAttribute('aria-haspopup', isDialog ? 'dialog' : 'true');
+
+      effectiveTarget.setAttribute('aria-expanded', opened ? 'true' : 'false');
+
+      if (opened) {
+        effectiveTarget.setAttribute('aria-controls', this.__overlayId);
+      } else {
+        effectiveTarget.removeAttribute('aria-controls');
+      }
 
       this.__oldTarget = target;
     }
@@ -667,7 +666,7 @@ class Popover extends PopoverPositionMixin(
     const overlayPart = this._overlayElement.$.overlay;
 
     // Move focus to the popover content on target element Tab
-    if (this.target && isElementFocused(this.target)) {
+    if (this.target && isElementFocused(this.__getTargetFocusable())) {
       event.preventDefault();
       overlayPart.focus();
       return;
@@ -676,7 +675,7 @@ class Popover extends PopoverPositionMixin(
     // Move focus to the next element after target on content Tab
     const lastFocusable = this.__getLastFocusable(overlayPart);
     if (lastFocusable && isElementFocused(lastFocusable)) {
-      const focusable = this.__getNextBodyFocusable(this.target);
+      const focusable = this.__getNextBodyFocusable(this.__getTargetFocusable());
       if (focusable && focusable !== overlayPart) {
         event.preventDefault();
         focusable.focus();
@@ -699,7 +698,7 @@ class Popover extends PopoverPositionMixin(
     const overlayPart = this._overlayElement.$.overlay;
 
     // Prevent restoring focus after target blur on Shift + Tab
-    if (this.target && isElementFocused(this.target) && this.__shouldRestoreFocus) {
+    if (this.target && isElementFocused(this.__getTargetFocusable()) && this.__shouldRestoreFocus) {
       this.__shouldRestoreFocus = false;
       return;
     }
@@ -707,12 +706,12 @@ class Popover extends PopoverPositionMixin(
     // Move focus back to the target on overlay content Shift + Tab
     if (this.target && isElementFocused(overlayPart)) {
       event.preventDefault();
-      this.target.focus();
+      this.__getTargetFocusable().focus();
       return;
     }
 
     // Move focus back to the popover on next element Shift + Tab
-    const nextFocusable = this.__getNextBodyFocusable(this.target);
+    const nextFocusable = this.__getNextBodyFocusable(this.__getTargetFocusable());
     if (nextFocusable && isElementFocused(nextFocusable)) {
       const lastFocusable = this.__getLastFocusable(overlayPart);
       if (lastFocusable) {
@@ -735,6 +734,16 @@ class Popover extends PopoverPositionMixin(
     return focusables.pop();
   }
 
+  /** @private */
+  __getTargetFocusable() {
+    if (!this.target) {
+      return null;
+    }
+
+    // If target has `focusElement`, check if that one is focused.
+    return this.target.focusElement || this.target;
+  }
+
   /** @private */
   __onTargetFocusIn() {
     this.__focusInside = true;
@@ -760,7 +769,7 @@ class Popover extends PopoverPositionMixin(
     // Do not close the popover on overlay focusout if it's not the last one.
     // This covers the case when focus moves to the nested popover opened
     // without focusing parent popover overlay (e.g. using hover trigger).
-    if (!isLastOverlay(this._overlayElement)) {
+    if (this._overlayElement.opened && !isLastOverlay(this._overlayElement)) {
       return;
     }
 

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/popover",
-  "version": "24.6.5",
+  "version": "24.6.6",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-popover",
-          "description": "`<vaadin-popover>` is a Web Component for creating overlays\nthat are positioned next to specified DOM element (target).\n\nUnlike `<vaadin-tooltip>`, the popover supports rich content\nthat can be provided by using `renderer` function.\n\n### Styling\n\n`<vaadin-popover>` uses `<vaadin-popover-overlay>` internal\nthemable component as the actual visible overlay.\n\nSee [`<vaadin-overlay>`](https://cdn.vaadin.com/vaadin-web-components/24.6.5/#/elements/vaadin-overlay) documentation\nfor `<vaadin-popover-overlay>` parts.\n\nIn addition to `<vaadin-overlay>` parts, the following parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`arrow`          | Optional arrow pointing to the target when using `theme=\"arrow\"`\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|----------------------------------------\n`position`       | Reflects the `position` property value.\n\nNote: the `theme` attribute value set on `<vaadin-popover>` is\npropagated to the internal `<vaadin-popover-overlay>` component.\n\n### Custom CSS Properties\n\nThe following custom CSS properties are available on the `<vaadin-popover>` element:\n\nCustom CSS property              | Description\n---------------------------------|-------------\n`--vaadin-popover-offset-top`    | Used as an offset when the popover is aligned vertically below the target\n`--vaadin-popover-offset-bottom` | Used as an offset when the popover is aligned vertically above the target\n`--vaadin-popover-offset-start`  | Used as an offset when the popover is aligned horizontally after the target\n`--vaadin-popover-offset-end`    | Used as an offset when the popover is aligned horizontally before the target\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-popover>` is a Web Component for creating overlays\nthat are positioned next to specified DOM element (target).\n\nUnlike `<vaadin-tooltip>`, the popover supports rich content\nthat can be provided by using `renderer` function.\n\n### Styling\n\n`<vaadin-popover>` uses `<vaadin-popover-overlay>` internal\nthemable component as the actual visible overlay.\n\nSee [`<vaadin-overlay>`](https://cdn.vaadin.com/vaadin-web-components/24.6.6/#/elements/vaadin-overlay) documentation\nfor `<vaadin-popover-overlay>` parts.\n\nIn addition to `<vaadin-overlay>` parts, the following parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`arrow`          | Optional arrow pointing to the target when using `theme=\"arrow\"`\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|----------------------------------------\n`position`       | Reflects the `position` property value.\n\nNote: the `theme` attribute value set on `<vaadin-popover>` is\npropagated to the internal `<vaadin-popover-overlay>` component.\n\n### Custom CSS Properties\n\nThe following custom CSS properties are available on the `<vaadin-popover>` element:\n\nCustom CSS property              | Description\n---------------------------------|-------------\n`--vaadin-popover-offset-top`    | Used as an offset when the popover is aligned vertically below the target\n`--vaadin-popover-offset-bottom` | Used as an offset when the popover is aligned vertically above the target\n`--vaadin-popover-offset-start`  | Used as an offset when the popover is aligned horizontally after the target\n`--vaadin-popover-offset-end`    | Used as an offset when the popover is aligned horizontally before the target\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "attributes": [
             {
               "name": "overlay-class",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/popover",
-  "version": "24.6.5",
+  "version": "24.6.6",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-popover",
-          "description": "`<vaadin-popover>` is a Web Component for creating overlays\nthat are positioned next to specified DOM element (target).\n\nUnlike `<vaadin-tooltip>`, the popover supports rich content\nthat can be provided by using `renderer` function.\n\n### Styling\n\n`<vaadin-popover>` uses `<vaadin-popover-overlay>` internal\nthemable component as the actual visible overlay.\n\nSee [`<vaadin-overlay>`](https://cdn.vaadin.com/vaadin-web-components/24.6.5/#/elements/vaadin-overlay) documentation\nfor `<vaadin-popover-overlay>` parts.\n\nIn addition to `<vaadin-overlay>` parts, the following parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`arrow`          | Optional arrow pointing to the target when using `theme=\"arrow\"`\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|----------------------------------------\n`position`       | Reflects the `position` property value.\n\nNote: the `theme` attribute value set on `<vaadin-popover>` is\npropagated to the internal `<vaadin-popover-overlay>` component.\n\n### Custom CSS Properties\n\nThe following custom CSS properties are available on the `<vaadin-popover>` element:\n\nCustom CSS property              | Description\n---------------------------------|-------------\n`--vaadin-popover-offset-top`    | Used as an offset when the popover is aligned vertically below the target\n`--vaadin-popover-offset-bottom` | Used as an offset when the popover is aligned vertically above the target\n`--vaadin-popover-offset-start`  | Used as an offset when the popover is aligned horizontally after the target\n`--vaadin-popover-offset-end`    | Used as an offset when the popover is aligned horizontally before the target\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-popover>` is a Web Component for creating overlays\nthat are positioned next to specified DOM element (target).\n\nUnlike `<vaadin-tooltip>`, the popover supports rich content\nthat can be provided by using `renderer` function.\n\n### Styling\n\n`<vaadin-popover>` uses `<vaadin-popover-overlay>` internal\nthemable component as the actual visible overlay.\n\nSee [`<vaadin-overlay>`](https://cdn.vaadin.com/vaadin-web-components/24.6.6/#/elements/vaadin-overlay) documentation\nfor `<vaadin-popover-overlay>` parts.\n\nIn addition to `<vaadin-overlay>` parts, the following parts are available for styling:\n\nPart name        | Description\n-----------------|-------------------------------------------\n`arrow`          | Optional arrow pointing to the target when using `theme=\"arrow\"`\n\nThe following state attributes are available for styling:\n\nAttribute        | Description\n-----------------|----------------------------------------\n`position`       | Reflects the `position` property value.\n\nNote: the `theme` attribute value set on `<vaadin-popover>` is\npropagated to the internal `<vaadin-popover-overlay>` component.\n\n### Custom CSS Properties\n\nThe following custom CSS properties are available on the `<vaadin-popover>` element:\n\nCustom CSS property              | Description\n---------------------------------|-------------\n`--vaadin-popover-offset-top`    | Used as an offset when the popover is aligned vertically below the target\n`--vaadin-popover-offset-bottom` | Used as an offset when the popover is aligned vertically above the target\n`--vaadin-popover-offset-start`  | Used as an offset when the popover is aligned horizontally after the target\n`--vaadin-popover-offset-end`    | Used as an offset when the popover is aligned horizontally before the target\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "extension": true,
           "attributes": [
             {