@vaadin/popover 25.0.0-alpha7 → 25.0.0-alpha8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/popover",
-  "version": "25.0.0-alpha7",
+  "version": "25.0.0-alpha8",
   "publishConfig": {
     "access": "public"
   },
@@ -23,6 +23,8 @@
     "lit.d.ts",
     "lit.js",
     "src",
+    "!src/styles/*-base-styles.d.ts",
+    "!src/styles/*-base-styles.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -37,17 +39,17 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-alpha7",
-    "@vaadin/component-base": "25.0.0-alpha7",
-    "@vaadin/lit-renderer": "25.0.0-alpha7",
-    "@vaadin/overlay": "25.0.0-alpha7",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha7",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha7",
+    "@vaadin/a11y-base": "25.0.0-alpha8",
+    "@vaadin/component-base": "25.0.0-alpha8",
+    "@vaadin/lit-renderer": "25.0.0-alpha8",
+    "@vaadin/overlay": "25.0.0-alpha8",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha8",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha8",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha7",
-    "@vaadin/test-runner-commands": "25.0.0-alpha7",
+    "@vaadin/chai-plugins": "25.0.0-alpha8",
+    "@vaadin/test-runner-commands": "25.0.0-alpha8",
     "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
@@ -55,5 +57,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "87f72707ce6866892f8be5782fa0da008e87dcbc"
+  "gitHead": "ebf53673d5f639d2b1b6f2b31f640f530643ee2f"
 }

package/src/styles/vaadin-popover-overlay-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2024 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const popoverOverlayStyles: CSSResult;

package/src/styles/vaadin-popover-overlay-base-styles.js

@@ -0,0 +1,210 @@
+/**
+ * @license
+ * Copyright (c) 2024 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css } from 'lit';
+import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-base-styles.js';
+
+const popoverOverlay = css`
+  :host {
+    --_arrow-size: var(--vaadin-popover-arrow-size, 8px);
+    --_default-offset: 4px;
+    --_rtl-multiplier: 1;
+    --_border-width: var(--vaadin-popover-border-width, var(--vaadin-overlay-border-width, 1px));
+  }
+
+  [part='overlay']:focus-visible {
+    outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
+  }
+
+  :host([dir='rtl']) {
+    --_rtl-multiplier: -1;
+  }
+
+  :host([modeless][with-backdrop]) [part='backdrop'] {
+    pointer-events: none;
+  }
+
+  :host([position^='top'][top-aligned]) [part='overlay'],
+  :host([position^='bottom'][top-aligned]) [part='overlay'] {
+    margin-top: var(--vaadin-popover-offset-top, var(--_default-offset));
+  }
+
+  [part='overlay'] {
+    position: relative;
+    overflow: visible;
+    max-height: 100%;
+    border: var(--_border-width) solid
+      var(--vaadin-popover-border-color, var(--vaadin-overlay-border-color, var(--vaadin-border-color)));
+    background: var(--vaadin-popover-background, var(--vaadin-overlay-background, var(--vaadin-background-color)));
+    box-shadow: var(--vaadin-popover-box-shadow, var(--vaadin-overlay-box-shadow, 0 8px 24px -4px rgba(0, 0, 0, 0.3)));
+  }
+
+  [part='content'] {
+    overflow: auto;
+    overscroll-behavior: contain;
+    box-sizing: border-box;
+    max-height: 100%;
+    padding: var(--vaadin-popover-padding, var(--vaadin-padding));
+  }
+
+  :host([theme~='no-padding']) [part='content'] {
+    padding: 0;
+  }
+
+  /* Increase the area of the popover so the pointer can go from the target directly to it. */
+  [part='overlay']::before {
+    position: absolute;
+    content: '';
+    inset-block: calc(var(--vaadin-popover-offset-top, var(--_default-offset)) * -1)
+      calc(var(--vaadin-popover-offset-bottom, var(--_default-offset)) * -1);
+    inset-inline: calc(var(--vaadin-popover-offset-start, var(--_default-offset)) * -1)
+      calc(var(--vaadin-popover-offset-end, var(--_default-offset)) * -1);
+    z-index: -1;
+    pointer-events: auto;
+  }
+
+  :host([position^='top'][bottom-aligned]) [part='overlay'],
+  :host([position^='bottom'][bottom-aligned]) [part='overlay'] {
+    margin-bottom: var(--vaadin-popover-offset-bottom, var(--_default-offset));
+  }
+
+  :host([position^='start'][start-aligned]) [part='overlay'],
+  :host([position^='end'][start-aligned]) [part='overlay'] {
+    margin-inline-start: var(--vaadin-popover-offset-start, var(--_default-offset));
+  }
+
+  :host([position^='start'][end-aligned]) [part='overlay'],
+  :host([position^='end'][end-aligned]) [part='overlay'] {
+    margin-inline-end: var(--vaadin-popover-offset-end, var(--_default-offset));
+  }
+
+  [part='arrow'] {
+    display: none;
+  }
+
+  :host([theme~='arrow']) {
+    --_default-offset: calc(4px + var(--_arrow-size) / 2);
+  }
+
+  :host([theme~='arrow']) [part='arrow'] {
+    display: block;
+    position: absolute;
+    background: inherit;
+    border: inherit;
+    border-start-start-radius: var(--vaadin-popover-arrow-border-radius, 0);
+    outline: inherit;
+    box-shadow: inherit;
+    width: var(--_arrow-size);
+    height: var(--_arrow-size);
+    rotate: 45deg;
+    --o: 20px; /* clip-path outset, how far outward it extends to reveal the outline and box shadow */
+    --b: var(--_border-width);
+    /* We need this elaborate clip-path to allow the arrow bg and border to cover
+      the overlay border but prevent the outline and box-shadow from covering it */
+    clip-path: polygon(
+      calc(var(--o) * -1) calc(var(--o) * -1),
+      calc(100% + var(--o) - var(--b)) calc(var(--o) * -1),
+      calc(100% - var(--b) * 1.4) 0,
+      100% 0,
+      calc(100% - var(--b)) var(--b),
+      calc(100% - var(--b)) calc(var(--b) + var(--ff, 0px)),
+      calc(var(--b) + var(--ff, 0px)) calc(100% - var(--b)),
+      calc(var(--b)) calc(100% - var(--b)),
+      0 100%,
+      0 calc(100% - var(--b) * 1.4),
+      calc(var(--o) * -1) calc(100% + var(--o) - var(--b))
+    );
+  }
+
+  /* Firefox renders a blurry edge for a diagonal clip-path + rotation,
+    so we need to extend the clip-path slightly further on the diagonal */
+  @supports (-moz-appearance: none) {
+    :host([theme~='arrow']) [part='arrow'] {
+      --ff: 1px;
+    }
+  }
+
+  /* bottom / top */
+  :host([theme~='arrow']:is([position^='bottom'], [position^='top'])[start-aligned]) [part='arrow'] {
+    inset-inline-start: calc(var(--_arrow-size) * 2);
+  }
+
+  :host([theme~='arrow']:is([position^='bottom'], [position^='top'])[end-aligned]) [part='arrow'] {
+    inset-inline-end: calc(var(--_arrow-size) * 2);
+  }
+
+  :host([theme~='arrow']:is([position^='bottom'], [position^='top'])[arrow-centered]) [part='arrow'] {
+    inset-inline-start: 50%;
+  }
+
+  /* bottom */
+  :host([theme~='arrow']:is([position^='bottom'], [position^='top'])[top-aligned]) [part='arrow'] {
+    top: 0;
+    translate: calc(-50% * var(--_rtl-multiplier)) -50%;
+  }
+
+  :host([theme~='arrow']:is([position^='bottom'], [position^='top'])[end-aligned][top-aligned]) [part='arrow'] {
+    translate: calc(50% * var(--_rtl-multiplier)) -50%;
+  }
+
+  /* top */
+  :host([theme~='arrow']:is([position^='bottom'], [position^='top'])[bottom-aligned]) [part='arrow'] {
+    bottom: 0;
+    rotate: 225deg;
+    translate: calc(-50% * var(--_rtl-multiplier)) 50%;
+  }
+
+  :host([theme~='arrow']:is([position^='bottom'], [position^='top'])[end-aligned][bottom-aligned]) [part='arrow'] {
+    translate: calc(50% * var(--_rtl-multiplier)) 50%;
+  }
+
+  /* start / end */
+  :host([theme~='arrow']:is([position^='start'], [position^='end'])[top-aligned]) [part='arrow'] {
+    rotate: -45deg;
+    top: calc(var(--_arrow-size) * 2);
+  }
+
+  :host([theme~='arrow']:is([position^='start'], [position^='end'])[bottom-aligned]) [part='arrow'] {
+    rotate: -45deg;
+    bottom: calc(var(--_arrow-size) * 2);
+  }
+
+  :host([theme~='arrow']:is([position='start'], [position='end'])[top-aligned]) [part='arrow'] {
+    top: 50%;
+  }
+
+  :host([dir='rtl'][theme~='arrow']:is([position^='start'], [position^='end'])) [part='arrow'] {
+    scale: -1;
+  }
+
+  /* end */
+  :host([theme~='arrow']:is([position^='start'], [position^='end'])[start-aligned]) [part='arrow'] {
+    inset-inline-start: 0;
+    translate: calc(-50% * var(--_rtl-multiplier)) -50%;
+  }
+
+  :host([theme~='arrow']:is([position^='start'], [position^='end'])[start-aligned][bottom-aligned]) [part='arrow'] {
+    translate: calc(-50% * var(--_rtl-multiplier)) 50%;
+  }
+
+  /* start */
+  :host([theme~='arrow']:is([position^='start'], [position^='end'])[end-aligned]) [part='arrow'] {
+    rotate: 135deg;
+    inset-inline-end: 0;
+    translate: calc(50% * var(--_rtl-multiplier)) -50%;
+  }
+
+  :host([theme~='arrow']:is([position^='start'], [position^='end'])[end-aligned][bottom-aligned]) [part='arrow'] {
+    translate: calc(50% * var(--_rtl-multiplier)) 50%;
+  }
+
+  @media (forced-colors: active) {
+    :host {
+      --_border-width: 3px;
+    }
+  }
+`;
+
+export const popoverOverlayStyles = [overlayStyles, popoverOverlay];

package/src/styles/vaadin-popover-overlay-core-styles.js

@@ -7,13 +7,17 @@ import { css } from 'lit';
 import { overlayStyles } from '@vaadin/overlay/src/styles/vaadin-overlay-core-styles.js';
 
 const popoverOverlay = css`
+  :host {
+    --_default-offset: 0;
+  }
+
   :host([modeless][with-backdrop]) [part='backdrop'] {
     pointer-events: none;
   }
 
   :host([position^='top'][top-aligned]) [part='overlay'],
   :host([position^='bottom'][top-aligned]) [part='overlay'] {
-    margin-top: var(--vaadin-popover-offset-top, 0);
+    margin-top: var(--vaadin-popover-offset-top, var(--_default-offset));
   }
 
   [part='overlay'] {
@@ -32,25 +36,27 @@ const popoverOverlay = css`
   [part='overlay']::before {
     position: absolute;
     content: '';
-    inset-block: calc(var(--vaadin-popover-offset-top, 0) * -1) calc(var(--vaadin-popover-offset-bottom, 0) * -1);
-    inset-inline: calc(var(--vaadin-popover-offset-start, 0) * -1) calc(var(--vaadin-popover-offset-end, 0) * -1);
+    inset-block: calc(var(--vaadin-popover-offset-top, var(--_default-offset)) * -1)
+      calc(var(--vaadin-popover-offset-bottom, var(--_default-offset)) * -1);
+    inset-inline: calc(var(--vaadin-popover-offset-start, var(--_default-offset)) * -1)
+      calc(var(--vaadin-popover-offset-end, var(--_default-offset)) * -1);
     z-index: -1;
     pointer-events: auto;
   }
 
   :host([position^='top'][bottom-aligned]) [part='overlay'],
   :host([position^='bottom'][bottom-aligned]) [part='overlay'] {
-    margin-bottom: var(--vaadin-popover-offset-bottom, 0);
+    margin-bottom: var(--vaadin-popover-offset-bottom, var(--_default-offset));
   }
 
   :host([position^='start'][start-aligned]) [part='overlay'],
   :host([position^='end'][start-aligned]) [part='overlay'] {
-    margin-inline-start: var(--vaadin-popover-offset-start, 0);
+    margin-inline-start: var(--vaadin-popover-offset-start, var(--_default-offset));
   }
 
   :host([position^='start'][end-aligned]) [part='overlay'],
   :host([position^='end'][end-aligned]) [part='overlay'] {
-    margin-inline-end: var(--vaadin-popover-offset-end, 0);
+    margin-inline-end: var(--vaadin-popover-offset-end, var(--_default-offset));
   }
 
   [part='arrow'] {

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

@@ -5,26 +5,6 @@
  */
 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.
@@ -44,19 +24,6 @@ export const PopoverOverlayMixin = (superClass) =>
       };
     }
 
-    static get observers() {
-      return ['__openedOrTargetChanged(opened, positionTarget)'];
-    }
-
-    /**
-     * Tag name prefix used by custom properties.
-     * @protected
-     * @return {string}
-     */
-    get _tagNamePrefix() {
-      return 'vaadin-popover';
-    }
-
     /**
      * @protected
      * @override
@@ -68,15 +35,6 @@ export const PopoverOverlayMixin = (superClass) =>
         return;
       }
 
-      // Copy custom properties from the owner
-      if (this.owner) {
-        const style = getComputedStyle(this.owner);
-        ['top', 'bottom', 'start', 'end'].forEach((prop) => {
-          const propertyName = `--${this._tagNamePrefix}-offset-${prop}`;
-          this.style.setProperty(propertyName, style.getPropertyValue(propertyName));
-        });
-      }
-
       this.removeAttribute('arrow-centered');
 
       // Center the overlay horizontally
@@ -114,14 +72,4 @@ 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-overlay.js

@@ -23,7 +23,7 @@ import { PopoverOverlayMixin } from './vaadin-popover-overlay-mixin.js';
  * @private
  */
 class PopoverOverlay extends PopoverOverlayMixin(
-  DirMixin(ThemableMixin(LumoInjectionMixin(PolylitMixin(LitElement)))),
+  DirMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))),
 ) {
   static get is() {
     return 'vaadin-popover-overlay';
@@ -43,6 +43,38 @@ class PopoverOverlay extends PopoverOverlayMixin(
       </div>
     `;
   }
+
+  /**
+   * @override
+   * @protected
+   */
+  get _contentRoot() {
+    return this.owner;
+  }
+
+  /**
+   * @override
+   * @protected
+   */
+  get _modalRoot() {
+    return this.owner;
+  }
+
+  /**
+   * @protected
+   * @override
+   */
+  _attachOverlay() {
+    this.showPopover();
+  }
+
+  /**
+   * @protected
+   * @override
+   */
+  _detachOverlay() {
+    this.hidePopover();
+  }
 }
 
 defineCustomElement(PopoverOverlay);

package/src/vaadin-popover.d.ts

@@ -37,16 +37,13 @@ export type PopoverEventMap = HTMLElementEventMap & PopoverCustomEventMap;
  *
  * ### Styling
  *
- * `<vaadin-popover>` uses `<vaadin-popover-overlay>` internal
- * themable component as the actual visible overlay.
- *
- * See [`<vaadin-overlay>`](#/elements/vaadin-overlay) documentation
- * for `<vaadin-popover-overlay>` parts.
- *
- * In addition to `<vaadin-overlay>` parts, the following parts are available for styling:
+ * The following shadow DOM parts are available for styling:
  *
  * Part name        | Description
  * -----------------|-------------------------------------------
+ * `backdrop`       | Backdrop of the overlay
+ * `overlay`        | The overlay container
+ * `content`        | The overlay content
  * `arrow`          | Optional arrow pointing to the target when using `theme="arrow"`
  *
  * The following state attributes are available for styling:
@@ -55,9 +52,6 @@ export type PopoverEventMap = HTMLElementEventMap & PopoverCustomEventMap;
  * -----------------|----------------------------------------
  * `position`       | Reflects the `position` property value.
  *
- * Note: the `theme` attribute value set on `<vaadin-popover>` is
- * propagated to the internal `<vaadin-popover-overlay>` component.
- *
  * ### Custom CSS Properties
  *
  * The following custom CSS properties are available on the `<vaadin-popover>` element:
@@ -96,14 +90,14 @@ declare class Popover extends PopoverPositionMixin(
   static setDefaultHoverDelay(hoverDelay: number): void;
 
   /**
-   * String used to label the overlay to screen reader users.
+   * String used to label the popover to screen reader users.
    *
    * @attr {string} accessible-name
    */
   accessibleName: string | null | undefined;
 
   /**
-   * Id of the element used as label of the overlay to screen reader users.
+   * Id of the element used as label of the popover to screen reader users.
    *
    * @attr {string} accessible-name-ref
    */

package/src/vaadin-popover.js

@@ -169,16 +169,13 @@ const isLastOverlay = (overlay) => {
  *
  * ### Styling
  *
- * `<vaadin-popover>` uses `<vaadin-popover-overlay>` internal
- * themable component as the actual visible overlay.
- *
- * See [`<vaadin-overlay>`](#/elements/vaadin-overlay) documentation
- * for `<vaadin-popover-overlay>` parts.
- *
- * In addition to `<vaadin-overlay>` parts, the following parts are available for styling:
+ * The following shadow DOM parts are available for styling:
  *
  * Part name        | Description
  * -----------------|-------------------------------------------
+ * `backdrop`       | Backdrop of the overlay
+ * `overlay`        | The overlay container
+ * `content`        | The overlay content
  * `arrow`          | Optional arrow pointing to the target when using `theme="arrow"`
  *
  * The following state attributes are available for styling:
@@ -187,9 +184,6 @@ const isLastOverlay = (overlay) => {
  * -----------------|----------------------------------------
  * `position`       | Reflects the `position` property value.
  *
- * Note: the `theme` attribute value set on `<vaadin-popover>` is
- * propagated to the internal `<vaadin-popover-overlay>` component.
- *
  * ### Custom CSS Properties
  *
  * The following custom CSS properties are available on the `<vaadin-popover>` element:
@@ -224,7 +218,7 @@ class Popover extends PopoverPositionMixin(
   static get styles() {
     return css`
       :host {
-        display: none !important;
+        display: contents;
       }
     `;
   }
@@ -232,7 +226,7 @@ class Popover extends PopoverPositionMixin(
   static get properties() {
     return {
       /**
-       * String used to label the overlay to screen reader users.
+       * String used to label the popover to screen reader users.
        *
        * @attr {string} accessible-name
        */
@@ -241,7 +235,7 @@ class Popover extends PopoverPositionMixin(
       },
 
       /**
-       * Id of the element used as label of the overlay to screen reader users.
+       * Id of the element used as label of the popover to screen reader users.
        *
        * @attr {string} accessible-name-ref
        */
@@ -415,11 +409,6 @@ class Popover extends PopoverPositionMixin(
         value: false,
         sync: true,
       },
-
-      /** @private */
-      __overlayId: {
-        type: String,
-      },
     };
   }
 
@@ -460,7 +449,7 @@ class Popover extends PopoverPositionMixin(
   constructor() {
     super();
 
-    this.__overlayId = `vaadin-popover-${generateUniqueId()}`;
+    this.__generatedId = `vaadin-popover-${generateUniqueId()}`;
 
     this.__onGlobalClick = this.__onGlobalClick.bind(this);
     this.__onGlobalKeyDown = this.__onGlobalKeyDown.bind(this);
@@ -479,10 +468,8 @@ class Popover extends PopoverPositionMixin(
 
     return html`
       <vaadin-popover-overlay
-        id="${this.__overlayId}"
-        role="${this.overlayRole}"
-        aria-label="${ifDefined(this.accessibleName)}"
-        aria-labelledby="${ifDefined(this.accessibleNameRef)}"
+        id="overlay"
+        popover="manual"
         .renderer="${this.renderer}"
         .owner="${this}"
         theme="${ifDefined(this._theme)}"
@@ -504,11 +491,14 @@ class Popover extends PopoverPositionMixin(
         @opened-changed="${this.__onOpenedChanged}"
         .restoreFocusOnClose="${this.__shouldRestoreFocus}"
         .restoreFocusNode="${this.target}"
+        exportparts="backdrop, overlay, content, arrow"
         @vaadin-overlay-escape-press="${this.__onEscapePress}"
         @vaadin-overlay-outside-click="${this.__onOutsideClick}"
         @vaadin-overlay-open="${this.__onOverlayOpened}"
         @vaadin-overlay-closed="${this.__onOverlayClosed}"
-      ></vaadin-popover-overlay>
+      >
+        <slot></slot>
+      </vaadin-popover-overlay>
     `;
   }
 
@@ -530,13 +520,43 @@ class Popover extends PopoverPositionMixin(
   ready() {
     super.ready();
 
-    this._overlayElement = this.$[this.__overlayId];
+    this._overlayElement = this.$.overlay;
+  }
+
+  /** @protected */
+  updated(props) {
+    super.updated(props);
+
+    if (props.has('overlayRole')) {
+      this.setAttribute('role', this.overlayRole);
+    }
+
+    if (props.has('accessibleName')) {
+      if (this.accessibleName) {
+        this.setAttribute('aria-label', this.accessibleName);
+      } else {
+        this.removeAttribute('aria-label');
+      }
+    }
+
+    if (props.has('accessibleNameRef')) {
+      if (this.accessibleNameRef) {
+        this.setAttribute('aria-labelledby', this.accessibleNameRef);
+      } else {
+        this.removeAttribute('aria-labelledby');
+      }
+    }
   }
 
   /** @protected */
   connectedCallback() {
     super.connectedCallback();
 
+    // If no user ID is provided, set generated ID
+    if (!this.id) {
+      this.id = this.__generatedId;
+    }
+
     document.documentElement.addEventListener('click', this.__onGlobalClick, true);
   }
 
@@ -608,7 +628,7 @@ class Popover extends PopoverPositionMixin(
       effectiveTarget.setAttribute('aria-expanded', opened ? 'true' : 'false');
 
       if (opened) {
-        effectiveTarget.setAttribute('aria-controls', this.__overlayId);
+        effectiveTarget.setAttribute('aria-controls', this.id);
       } else {
         effectiveTarget.removeAttribute('aria-controls');
       }
@@ -787,7 +807,7 @@ class Popover extends PopoverPositionMixin(
       return;
     }
 
-    if ((this.__hasTrigger('focus') && this.__mouseDownInside) || this._overlayElement.contains(event.relatedTarget)) {
+    if ((this.__hasTrigger('focus') && this.__mouseDownInside) || this.contains(event.relatedTarget)) {
       return;
     }
 
@@ -815,7 +835,7 @@ class Popover extends PopoverPositionMixin(
       return;
     }
 
-    if (this._overlayElement.contains(event.relatedTarget)) {
+    if (this.contains(event.relatedTarget)) {
       return;
     }
 
@@ -846,7 +866,8 @@ class Popover extends PopoverPositionMixin(
     if (
       (this.__hasTrigger('focus') && this.__mouseDownInside) ||
       event.relatedTarget === this.target ||
-      this._overlayElement.contains(event.relatedTarget)
+      event.relatedTarget === this._overlayElement ||
+      this.contains(event.relatedTarget)
     ) {
       return;
     }
@@ -904,6 +925,11 @@ class Popover extends PopoverPositionMixin(
     }
 
     if (this.__hasTrigger('focus')) {
+      // Do not restore focus if closed on focusout on Tab
+      if (isKeyboardActive()) {
+        this.__shouldRestoreFocus = false;
+      }
+
       this._openedStateController.close(true);
     }
   }

package/theme/lumo/vaadin-popover-styles.js

@@ -7,12 +7,8 @@ import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themab
 
 const popoverOverlay = css`
   :host {
-    --vaadin-popover-offset-top: var(--_vaadin-popover-default-offset);
-    --vaadin-popover-offset-bottom: var(--_vaadin-popover-default-offset);
-    --vaadin-popover-offset-start: var(--_vaadin-popover-default-offset);
-    --vaadin-popover-offset-end: var(--_vaadin-popover-default-offset);
     --vaadin-popover-arrow-size: 0.5rem;
-    --_vaadin-popover-default-offset: var(--lumo-space-xs);
+    --_default-offset: var(--lumo-space-xs);
   }
 
   [part='overlay'] {
@@ -28,7 +24,7 @@ const popoverOverlay = css`
   }
 
   :host([theme~='arrow']) {
-    --_vaadin-popover-default-offset: calc(var(--lumo-space-s) + var(--vaadin-popover-arrow-size) / 2);
+    --_default-offset: calc(var(--lumo-space-s) + var(--vaadin-popover-arrow-size) / 2);
   }
 
   /* top / bottom position */

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/popover",
-  "version": "25.0.0-alpha7",
+  "version": "25.0.0-alpha8",
   "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/25.0.0-alpha7/#/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\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`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\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",
@@ -45,7 +45,7 @@
             },
             {
               "name": "accessible-name",
-              "description": "String used to label the overlay to screen reader users.",
+              "description": "String used to label the popover to screen reader users.",
               "value": {
                 "type": [
                   "string",
@@ -56,7 +56,7 @@
             },
             {
               "name": "accessible-name-ref",
-              "description": "Id of the element used as label of the overlay to screen reader users.",
+              "description": "Id of the element used as label of the popover to screen reader users.",
               "value": {
                 "type": [
                   "string",
@@ -257,7 +257,7 @@
               },
               {
                 "name": "accessibleName",
-                "description": "String used to label the overlay to screen reader users.",
+                "description": "String used to label the popover to screen reader users.",
                 "value": {
                   "type": [
                     "string",
@@ -268,7 +268,7 @@
               },
               {
                 "name": "accessibleNameRef",
-                "description": "Id of the element used as label of the overlay to screen reader users.",
+                "description": "Id of the element used as label of the popover to screen reader users.",
                 "value": {
                   "type": [
                     "string",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/popover",
-  "version": "25.0.0-alpha7",
+  "version": "25.0.0-alpha8",
   "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/25.0.0-alpha7/#/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\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`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\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": [
             {
@@ -91,14 +91,14 @@
             },
             {
               "name": ".accessibleName",
-              "description": "String used to label the overlay to screen reader users.",
+              "description": "String used to label the popover to screen reader users.",
               "value": {
                 "kind": "expression"
               }
             },
             {
               "name": ".accessibleNameRef",
-              "description": "Id of the element used as label of the overlay to screen reader users.",
+              "description": "Id of the element used as label of the popover to screen reader users.",
               "value": {
                 "kind": "expression"
               }