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

package/custom-elements.json

@@ -23,7 +23,7 @@
       "declarations": [
         {
           "kind": "mixin",
-          "description": "A mixin providing linking of the tooltip content to the tooltip target\nelements using the `aria-describedby` or `aria-labelledby` attribute.",
+          "description": "A mixin providing linking of the tooltip content to the tooltip target\nelements using the `aria-describedby` or `aria-labelledby` attribute.\n\nTargets in the same root as the tooltip are linked by the content element\nID. ID references only resolve within a single tree scope, so targets in\nother roots are linked with ARIA element references instead.",
           "name": "TooltipAriaMixin",
           "members": [
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/tooltip",
-  "version": "25.3.0-dev.1fa5a51482",
+  "version": "25.3.0-rc1",
   "publishConfig": {
     "access": "public"
   },
@@ -35,20 +35,20 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.3.0-dev.1fa5a51482",
-    "@vaadin/component-base": "25.3.0-dev.1fa5a51482",
-    "@vaadin/markdown": "25.3.0-dev.1fa5a51482",
-    "@vaadin/overlay": "25.3.0-dev.1fa5a51482",
-    "@vaadin/popover": "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/markdown": "25.3.0-rc1",
+    "@vaadin/overlay": "25.3.0-rc1",
+    "@vaadin/popover": "25.3.0-rc1",
+    "@vaadin/vaadin-themable-mixin": "25.3.0-rc1",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@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/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",
@@ -56,5 +56,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "1cd5964b758ffbce3ddb6248a1997f55f8e0ebf6"
+  "gitHead": "d4809590b2f61bd607e376ab3dec84f4bfb059a7"
 }

package/src/vaadin-tooltip-aria-mixin.d.ts

@@ -8,6 +8,10 @@ import type { Constructor } from '@open-wc/dedupe-mixin';
 /**
  * A mixin providing linking of the tooltip content to the tooltip target
  * elements using the `aria-describedby` or `aria-labelledby` attribute.
+ *
+ * Targets in the same root as the tooltip are linked by the content element
+ * ID. ID references only resolve within a single tree scope, so targets in
+ * other roots are linked with ARIA element references instead.
  */
 export declare function TooltipAriaMixin<T extends Constructor<HTMLElement>>(
   base: T,

package/src/vaadin-tooltip-aria-mixin.js

@@ -3,14 +3,21 @@
  * Copyright (c) 2026 - 2026 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { addValueToAttribute, removeValueFromAttribute } from '@vaadin/component-base/src/dom-utils.js';
+import { addAriaElementReference, removeAriaElementReference } from '@vaadin/a11y-base/src/aria-element-reference.js';
+import { addValuesToAttribute, removeValuesFromAttribute } from '@vaadin/component-base/src/dom-utils.js';
 
 /**
  * A mixin providing linking of the tooltip content to the tooltip target
  * elements using the `aria-describedby` or `aria-labelledby` attribute.
+ *
+ * Targets in the same root as the tooltip are linked by the content element
+ * ID. ID references only resolve within a single tree scope, so targets in
+ * other roots are linked with ARIA element references instead.
  */
 export const TooltipAriaMixin = (superClass) =>
   class TooltipAriaMixinClass extends superClass {
+    #ariaReferences = [];
+
     static get properties() {
       return {
         /**
@@ -52,41 +59,62 @@ export const TooltipAriaMixin = (superClass) =>
     }
 
     /** @protected */
-    updated(props) {
-      super.updated(props);
+    connectedCallback() {
+      super.connectedCallback();
+      this.#addAriaReferences();
+    }
 
-      const ariaTargetChanged = props.has('_effectiveAriaTarget');
-      const ariaLinkModeChanged = props.has('ariaLinkMode');
+    /** @protected */
+    disconnectedCallback() {
+      super.disconnectedCallback();
+      this.#removeAriaReferences();
+    }
 
-      if (ariaTargetChanged || ariaLinkModeChanged) {
-        const oldTarget = ariaTargetChanged ? props.get('_effectiveAriaTarget') : this._effectiveAriaTarget;
-        const oldMode = ariaLinkModeChanged ? props.get('ariaLinkMode') : this.ariaLinkMode;
-        this.#removeAriaReferences(oldTarget, oldMode);
+    /** @protected */
+    updated(props) {
+      super.updated(props);
 
-        const newTarget = this._effectiveAriaTarget;
-        const newMode = this.ariaLinkMode;
-        this.#addAriaReferences(newTarget, newMode);
+      if (props.has('_effectiveAriaTarget') || props.has('ariaLinkMode')) {
+        this.#updateAriaReferences();
       }
     }
 
-    #addAriaReferences(target, mode) {
-      if (!target || !mode || mode === 'none') {
+    #addAriaReferences() {
+      const mode = this.ariaLinkMode;
+      const targets = this._effectiveAriaTarget;
+      const contentNode = this.__contentNode;
+      if (!contentNode || !targets || !mode || mode === 'none') {
         return;
       }
 
-      [target].flat().forEach((el) => {
-        addValueToAttribute(el, mode, this._uniqueId);
+      [targets].flat().forEach((target) => {
+        const byReference = target.getRootNode() !== this.getRootNode();
+        if (byReference) {
+          addAriaElementReference(target, mode, contentNode);
+        } else {
+          addValuesToAttribute(target, mode, contentNode.id);
+        }
+
+        this.#ariaReferences.push({ target, mode, byReference });
       });
     }
 
-    #removeAriaReferences(target, mode) {
-      if (!target || !mode || mode === 'none') {
-        return;
-      }
+    #removeAriaReferences() {
+      const contentNode = this.__contentNode;
 
-      [target].flat().forEach((el) => {
-        removeValueFromAttribute(el, mode, this._uniqueId);
+      this.#ariaReferences.forEach(({ target, mode, byReference }) => {
+        if (byReference) {
+          removeAriaElementReference(target, mode, contentNode);
+        } else {
+          removeValuesFromAttribute(target, mode, contentNode.id);
+        }
       });
+      this.#ariaReferences = [];
+    }
+
+    #updateAriaReferences() {
+      this.#removeAriaReferences();
+      this.#addAriaReferences();
     }
 
     /** @private */

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/tooltip",
-  "version": "25.3.0-dev.1fa5a51482",
+  "version": "25.3.0-rc1",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/tooltip",
-  "version": "25.3.0-dev.1fa5a51482",
+  "version": "25.3.0-rc1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {