@vaadin/popover 24.8.4 → 25.0.0-alpha10

package/README.md

@@ -20,29 +20,6 @@ Once installed, import the component in your application:
 import '@vaadin/popover';
 ```
 
-## Themes
-
-Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/styling), Lumo and Material.
-The [main entrypoint](https://github.com/vaadin/web-components/blob/main/packages/popover/vaadin-popover.js) of the package uses Lumo theme.
-
-To use the Material theme, import the component from the `theme/material` folder:
-
-```js
-import '@vaadin/popover/theme/material/vaadin-popover.js';
-```
-
-You can also import the Lumo version of the component explicitly:
-
-```js
-import '@vaadin/popover/theme/lumo/vaadin-popover.js';
-```
-
-Finally, you can import the un-themed component from the `src` folder to get a minimal starting point:
-
-```js
-import '@vaadin/popover/src/vaadin-popover.js';
-```
-
 ## Contributing
 
 Read the [contributing guide](https://vaadin.com/docs/latest/contributing) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/popover",
-  "version": "24.8.4",
+  "version": "25.0.0-alpha10",
   "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,24 +39,23 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "~24.8.4",
-    "@vaadin/component-base": "~24.8.4",
-    "@vaadin/lit-renderer": "~24.8.4",
-    "@vaadin/overlay": "~24.8.4",
-    "@vaadin/vaadin-lumo-styles": "~24.8.4",
-    "@vaadin/vaadin-material-styles": "~24.8.4",
-    "@vaadin/vaadin-themable-mixin": "~24.8.4",
+    "@vaadin/a11y-base": "25.0.0-alpha10",
+    "@vaadin/component-base": "25.0.0-alpha10",
+    "@vaadin/lit-renderer": "25.0.0-alpha10",
+    "@vaadin/overlay": "25.0.0-alpha10",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha10",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha10",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.8.4",
-    "@vaadin/test-runner-commands": "~24.8.4",
-    "@vaadin/testing-helpers": "^1.1.0",
+    "@vaadin/chai-plugins": "25.0.0-alpha10",
+    "@vaadin/test-runner-commands": "25.0.0-alpha10",
+    "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^18.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "849e54e967563080a685965e2dced02060b3ab23"
+  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
 }

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 !important;
+  }
+
+  /* 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.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-core-styles.js

@@ -0,0 +1,74 @@
+/**
+ * @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-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, var(--_default-offset));
+  }
+
+  [part='overlay'] {
+    position: relative;
+    overflow: visible;
+    max-height: 100%;
+  }
+
+  [part='content'] {
+    overflow: auto;
+    box-sizing: border-box;
+    max-height: 100%;
+  }
+
+  /* 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;
+    position: absolute;
+    height: 0;
+    width: 0;
+  }
+
+  :host([theme~='arrow']) [part='arrow'] {
+    display: block;
+  }
+`;
+
+export const popoverOverlayStyles = [overlayStyles, popoverOverlay];

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

@@ -3,12 +3,14 @@
  * Copyright (c) 2024 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { css, html, LitElement } from 'lit';
+import { html, LitElement } from 'lit';
+import { isElementFocused } from '@vaadin/a11y-base/src/focus-utils.js';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
-import { overlayStyles } from '@vaadin/overlay/src/vaadin-overlay-styles.js';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { popoverOverlayStyles } from './styles/vaadin-popover-overlay-core-styles.js';
 import { PopoverOverlayMixin } from './vaadin-popover-overlay-mixin.js';
 
 /**
@@ -21,80 +23,15 @@ import { PopoverOverlayMixin } from './vaadin-popover-overlay-mixin.js';
  * @mixes ThemableMixin
  * @private
  */
-class PopoverOverlay extends PopoverOverlayMixin(DirMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+class PopoverOverlay extends PopoverOverlayMixin(
+  DirMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))),
+) {
   static get is() {
     return 'vaadin-popover-overlay';
   }
 
   static get styles() {
-    return [
-      overlayStyles,
-      css`
-        :host {
-          --_vaadin-popover-content-width: auto;
-          --_vaadin-popover-content-height: auto;
-        }
-
-        :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);
-        }
-
-        [part='overlay'] {
-          position: relative;
-          overflow: visible;
-          max-height: 100%;
-        }
-
-        [part='content'] {
-          overflow: auto;
-          box-sizing: border-box;
-          max-height: 100%;
-          width: var(--_vaadin-popover-content-width);
-          height: var(--_vaadin-popover-content-height);
-        }
-
-        /* 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, 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);
-          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);
-        }
-
-        :host([position^='start'][start-aligned]) [part='overlay'],
-        :host([position^='end'][start-aligned]) [part='overlay'] {
-          margin-inline-start: var(--vaadin-popover-offset-start, 0);
-        }
-
-        :host([position^='start'][end-aligned]) [part='overlay'],
-        :host([position^='end'][end-aligned]) [part='overlay'] {
-          margin-inline-end: var(--vaadin-popover-offset-end, 0);
-        }
-
-        [part='arrow'] {
-          display: none;
-          position: absolute;
-          height: 0;
-          width: 0;
-        }
-
-        :host([theme~='arrow']) [part='arrow'] {
-          display: block;
-        }
-      `,
-    ];
+    return popoverOverlayStyles;
   }
 
   /** @protected */
@@ -107,6 +44,37 @@ class PopoverOverlay extends PopoverOverlayMixin(DirMixin(ThemableMixin(PolylitM
       </div>
     `;
   }
+
+  /** @protected */
+  updated(props) {
+    super.updated(props);
+
+    if (props.has('restoreFocusNode') && this.opened) {
+      // Save focus to be restored when target is set while opened
+      if (this.restoreFocusNode && isElementFocused(this.restoreFocusNode.focusElement || this.restoreFocusNode)) {
+        this.__focusRestorationController.saveFocus();
+      } else if (!this.restoreFocusNode) {
+        // Do not restore focus when target is cleared while opened
+        this.__focusRestorationController.focusNode = null;
+      }
+    }
+  }
+
+  /**
+   * @override
+   * @protected
+   */
+  get _contentRoot() {
+    return this.owner;
+  }
+
+  /**
+   * @override
+   * @protected
+   */
+  get _modalRoot() {
+    return this.owner;
+  }
 }
 
 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
    */
@@ -116,18 +110,16 @@ declare class Popover extends PopoverPositionMixin(
   autofocus: boolean;
 
   /**
-   * Height to be set on the overlay content.
-   *
-   * @attr {string} content-height
+   * Set the height of the overlay.
+   * If a unitless number is provided, pixels are assumed.
    */
-  contentHeight: string;
+  height: string | null;
 
   /**
-   * Width to be set on the overlay content.
-   *
-   * @attr {string} content-width
+   * Set the width of the overlay.
+   * If a unitless number is provided, pixels are assumed.
    */
-  contentWidth: string;
+  width: string | null;
 
   /**
    * The delay in milliseconds before the popover is opened