@pine-ds/core 4.9.0 → 4.9.1

package/dist/collection/components/pds-datepicker/calendar-portal.js

@@ -1,4 +1,5 @@
 import { closest } from "../../utils/closest";
+import { findPortalTarget } from "../../utils/portal-target";
 /**
  * Where the open calendar lives: a `div` in `document.body`, or in the nearest `<dialog>` so it
  * shares a modal's top layer, outside any `overflow: hidden` or transformed ancestor that would
@@ -96,41 +97,3 @@ export class CalendarPortal {
     }
 }
 CalendarPortal.className = 'pds-datepicker-calendar-portal';
-/**
- * The native `<dialog>` or open `popover` (as pds-filter's) the datepicker sits in, so the
- * calendar shares its top layer and a click in it isn't outside it; otherwise `document.body`.
- * `closest()` stops at shadow boundaries and misses one that only wraps slotted content, so this
- * walks assigned slots and shadow hosts, as pds-combobox does.
- */
-export function findPortalTarget(from) {
-    const seen = new Set();
-    let current = from;
-    while (current && !seen.has(current)) {
-        seen.add(current);
-        if (current.nodeType === Node.ELEMENT_NODE && isTopLayerHost(current)) {
-            return current;
-        }
-        const assigned = current.nodeType === Node.ELEMENT_NODE ? current.assignedSlot : null;
-        if (assigned) {
-            current = assigned;
-            continue;
-        }
-        const parent = current.parentNode;
-        current = parent instanceof ShadowRoot ? parent.host : parent;
-    }
-    return document.body;
-}
-function isTopLayerHost(el) {
-    // Only an open dialog: inside a closed one, the calendar would be hidden with it.
-    if (el.localName === 'dialog')
-        return el.open;
-    if (!el.hasAttribute('popover'))
-        return false;
-    try {
-        return el.matches(':popover-open');
-    }
-    catch (_a) {
-        // A browser without the Popover API: no top layer to share.
-        return false;
-    }
-}

package/dist/collection/components/pds-link/pds-link.css

@@ -13,9 +13,9 @@
 }
 .pds-link:focus-visible {
   border-radius: var(--pine-dimension-2xs);
+  isolation: isolate;
   outline: var(--pine-outline-focus);
   outline-offset: var(--pine-border-width-thick);
-  position: relative;
 }
 .pds-link:hover {
   color: var(--color, var(--pds-context-link-color-hover, var(--pine-color-text-hover)));

package/dist/collection/components/pds-link/stories/pds-link.stories.js

@@ -73,3 +73,51 @@ export const NavTabs = {
     </nav>
   `,
 };
+
+// A whole row that is one link. The click area is the link part's ::after stretched over
+// the positioned row, so the row activates the link without nesting anything inside it.
+// Trailing controls sit above that box so they stay separately clickable, and the focus
+// ring is drawn on the stretched box rather than on the text.
+export const WholeRowLink = {
+  render: () => html`
+    <style>
+      .pds-link-row {
+        position: relative;
+      }
+
+      .pds-link-row:hover {
+        background-color: var(--pine-color-background-muted);
+      }
+
+      .pds-link-row pds-link::part(link)::after {
+        border-radius: var(--pine-border-radius-md);
+        content: "";
+        inset: 0;
+        position: absolute;
+      }
+
+      .pds-link-row pds-link::part(link):focus-visible {
+        outline: none;
+      }
+
+      .pds-link-row pds-link::part(link):focus-visible::after {
+        outline: var(--pine-outline-focus);
+        outline-offset: var(--pine-border-width-thick);
+      }
+
+      .pds-link-row__trailing {
+        position: relative;
+        z-index: 1;
+      }
+    </style>
+    <pds-box class="pds-link-row" border border-radius="md" padding="sm" align-items="center" justify-content="space-between">
+      <pds-box gap="xs" align-items="center">
+        <pds-icon name="file" aria-hidden="true"></pds-icon>
+        <pds-link href="#row-target" variant="plain">Quarterly report</pds-link>
+      </pds-box>
+      <pds-box class="pds-link-row__trailing">
+        <pds-button variant="secondary" size="small">Download</pds-button>
+      </pds-box>
+    </pds-box>
+  `,
+};

package/dist/collection/components/pds-modal/pds-modal.css

@@ -23,7 +23,7 @@
     backdrop-filter: blur(3px);
   }
 }
-pds-modal .pds-modal__backdrop {
+pds-modal pds-modal .pds-modal__backdrop {
   z-index: var(--pine-z-index-priority);
 }
 .pds-modal__backdrop::backdrop {

package/dist/collection/components/pds-multiselect/pds-multiselect.js

@@ -302,6 +302,12 @@ export class PdsMultiselect {
                     }
                     else {
                         this.closeDropdown();
+                        // Tab would move on to an option's checkbox, which closing removes, dropping focus to the page.
+                        // Land on the trigger instead, as Escape does; Shift+Tab already reaches it.
+                        const trigger = e.shiftKey ? undefined : this.activeTriggerEl;
+                        trigger === null || trigger === void 0 ? void 0 : trigger.focus();
+                        if (trigger === null || trigger === void 0 ? void 0 : trigger.matches(':focus'))
+                            e.preventDefault();
                     }
                     break;
                 }
@@ -1260,10 +1266,10 @@ export class PdsMultiselect {
     }
     render() {
         const hasSelections = this.selectedItems.length > 0;
-        return (h(Host, { key: 'a92086af75e20b9b37b147365bfa517d96021700', "aria-disabled": this.disabled ? 'true' : null }, h("div", { key: 'd49e0442e3a348248e5ac3b37afc9f128b34956b', class: "pds-multiselect", onFocusout: this.handleContainerFocusOut }, this.label && (h("label", { key: '41a081803dfd784e20a7135ecf5f5c4657908dd1', id: `${this.componentId}-label`, htmlFor: this.componentId, class: {
+        return (h(Host, { key: '8f1ce5ef092285ce7c0855643fae76a4ec86ee17', "aria-disabled": this.disabled ? 'true' : null }, h("div", { key: 'c14c3d52c1d55fb33a89f1a25055728215a1e4ab', class: "pds-multiselect", onFocusout: this.handleContainerFocusOut }, this.label && (h("label", { key: 'aacd3339b0db2048b31fbc5963f7232bbff78efe', id: `${this.componentId}-label`, htmlFor: this.componentId, class: {
                 'pds-multiselect__label': true,
                 'visually-hidden': this.hideLabel,
-            } }, this.label)), h("div", { key: '0e3c8a3aaf7c70b4ff71972c29b8d5599f62ec97', class: "pds-multiselect__wrapper", ref: el => (this.containerEl = el), style: { width: this.triggerWidth } }, this.slottedTriggerEl ? (h("slot", { name: "trigger" })) : this.selectedDisplay === 'pill' && this.pillPosition === 'inline' ? (h("div", { ref: el => (this.pillInlineTriggerEl = el || undefined), part: "trigger", class: {
+            } }, this.label)), h("div", { key: '5e1ef76aa5d46798519e5ac885bfa1c8d7c7106c', class: "pds-multiselect__wrapper", ref: el => (this.containerEl = el), style: { width: this.triggerWidth } }, this.slottedTriggerEl ? (h("slot", { name: "trigger" })) : this.selectedDisplay === 'pill' && this.pillPosition === 'inline' ? (h("div", { ref: el => (this.pillInlineTriggerEl = el || undefined), part: "trigger", class: {
                 'pds-multiselect__trigger': true,
                 'pds-multiselect__trigger--open': this.isOpen,
                 'pds-multiselect__trigger--disabled': this.disabled,
@@ -1279,7 +1285,7 @@ export class PdsMultiselect {
             }, id: this.componentId, disabled: this.disabled, "aria-required": this.required ? 'true' : undefined, "aria-expanded": this.isOpen ? 'true' : 'false', "aria-haspopup": "listbox", "aria-describedby": assignDescription(this.componentId, this.invalid || !!this.errorMessage, this.helperMessage, this.errorMessage), "aria-invalid": this.invalid || !!this.errorMessage ? 'true' : undefined, onClick: this.handleTriggerClick, onKeyDown: this.handleTriggerKeyDown }, h("span", { class: {
                 'pds-multiselect__trigger-text': true,
                 'pds-multiselect__trigger-text--placeholder': !hasSelections || (this.selectedDisplay === 'pill' && this.pillPosition === 'below'),
-            } }, this.getTriggerText()), h("pds-icon", { "aria-hidden": "true", class: "pds-multiselect__icon", icon: enlarge }))), this.renderDropdown()), this.selectedDisplay === 'pill' && this.pillPosition === 'below' && this.renderBelowPills(), h("span", { key: 'd5cddc1d3374d94ecf0cce1bcaf7c7125bf3128d', class: "visually-hidden", "aria-live": "polite", "aria-atomic": "true" }, this.removalAnnouncement), this.helperMessage && !(this.errorMessage && this.errorMessage.length > 0) && (h("p", { key: 'e3cb958b6fd2b1e138b769de0f53be1b8564902d', class: "pds-multiselect__helper", id: messageId(this.componentId, 'helper') }, this.helperMessage)), this.errorMessage && (h("p", { key: 'f6c2a30cc192391973d9b22fbb6732ce387832ac', class: "pds-multiselect__error", id: messageId(this.componentId, 'error') }, h("pds-icon", { key: 'f437effafaa383b81aec7b5bf635598c8b0075b8', "aria-hidden": "true", icon: danger, size: "small" }), this.errorMessage)), h("div", { key: 'f1e747137f2dc7cad3d4e1ff8fc293401e3173e1', style: { display: 'none' } }, h("slot", { key: 'f337137b3ca5983dc6641361101f6d19c972778c' })))));
+            } }, this.getTriggerText()), h("pds-icon", { "aria-hidden": "true", class: "pds-multiselect__icon", icon: enlarge }))), this.renderDropdown()), this.selectedDisplay === 'pill' && this.pillPosition === 'below' && this.renderBelowPills(), h("span", { key: '590045e4769812a1a2f7a97580d21d95dbe4e872', class: "visually-hidden", "aria-live": "polite", "aria-atomic": "true" }, this.removalAnnouncement), this.helperMessage && !(this.errorMessage && this.errorMessage.length > 0) && (h("p", { key: '419f4349b7cb17260f03d2bdcfd777561a62de42', class: "pds-multiselect__helper", id: messageId(this.componentId, 'helper') }, this.helperMessage)), this.errorMessage && (h("p", { key: 'b922af14c83348607aa9aaaefe9b03b39e71bd42', class: "pds-multiselect__error", id: messageId(this.componentId, 'error') }, h("pds-icon", { key: 'bd08726adf14a42f2ecf0cdfcd390e5639f9fd96', "aria-hidden": "true", icon: danger, size: "small" }), this.errorMessage)), h("div", { key: '42ad7905fb1816ccdd29b6aa438779929804b368', style: { display: 'none' } }, h("slot", { key: '4f3bf380e93d216790efb0a5de85d6479862350e' })))));
     }
     static get is() { return "pds-multiselect"; }
     static get encapsulation() { return "shadow"; }

package/dist/collection/components/pds-radio-group/pds-radio-group.js

@@ -1,4 +1,5 @@
-import { Host, h } from "@stencil/core";
+import { Host, h, forceUpdate } from "@stencil/core";
+import { HostStylingKeeper } from "../../utils/attributes";
 import { messageId } from "../../utils/form";
 import { danger } from "@pine-ds/icons/icons";
 /**
@@ -32,6 +33,7 @@ export class PdsRadioGroup {
          * @defaultValue false
          */
         this.required = false;
+        this.hostKeeper = new HostStylingKeeper();
     }
     handlePropsChange() {
         this.updateChildRadios();
@@ -83,6 +85,29 @@ export class PdsRadioGroup {
             }
         });
     }
+    connectedCallback() {
+        this.hostKeeper.connect(this.el);
+        // A name set while the group was detached never reaches the observer.
+        this.syncName();
+        if (typeof MutationObserver === 'undefined')
+            return;
+        // Consumers can name the group after render (a prop change, an i18n swap, a morph); re-render so their name wins.
+        this.hostAriaObserver = new MutationObserver(() => this.syncName());
+        this.hostAriaObserver.observe(this.el, { attributeFilter: ['aria-label', 'aria-labelledby'] });
+    }
+    disconnectedCallback() {
+        var _a;
+        this.hostKeeper.disconnect();
+        (_a = this.hostAriaObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
+        this.hostAriaObserver = undefined;
+    }
+    // Re-renders only when the group's name would change, so its own aria-labelledby write doesn't loop back.
+    syncName() {
+        if (this._groupId === undefined)
+            return;
+        if (this.getAriaLabelledBy() !== this.renderedLabelledBy)
+            forceUpdate(this);
+    }
     componentWillLoad() {
         // Generate stable group ID once during initialization
         // This ensures DOM stability and accessibility relationships remain consistent across re-renders
@@ -96,6 +121,18 @@ export class PdsRadioGroup {
                 : `${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
             this._groupId = `radio-group-${uniqueId}`;
         }
+        // A restored or cloned host still carries the id and ARIA references an earlier instance wrote, pointing at
+        // that instance's label and messages. Drop them so this render writes its own: on first load, Stencil keeps a
+        // host attribute that's already there.
+        const previousId = this.el.getAttribute('id');
+        if (previousId && previousId !== this._groupId) {
+            ['aria-labelledby', 'aria-describedby'].forEach((name) => {
+                var _a, _b;
+                const ids = (_b = (_a = this.el.getAttribute(name)) === null || _a === void 0 ? void 0 : _a.split(/\s+/)) !== null && _b !== void 0 ? _b : [];
+                if (ids.some((id) => id.startsWith(`${previousId}__`)))
+                    this.el.removeAttribute(name);
+            });
+        }
     }
     componentDidLoad() {
         if (!this.name) {
@@ -148,6 +185,20 @@ export class PdsRadioGroup {
         // Otherwise, assume it's a dimension token like "100", "200", etc.
         return `var(--pine-dimension-${this.gap})`;
     }
+    get labelId() {
+        return `${this._groupId}__label`;
+    }
+    // Names the group from its visible label, unless the consumer named it with their own aria-label or aria-labelledby.
+    // A blank aria-label (an empty translation, say) names nothing, so it falls back to groupLabel.
+    getAriaLabelledBy() {
+        var _a;
+        const hostLabelledBy = this.el.getAttribute('aria-labelledby');
+        if ((hostLabelledBy === null || hostLabelledBy === void 0 ? void 0 : hostLabelledBy.trim()) && hostLabelledBy !== this.labelId)
+            return hostLabelledBy;
+        if ((_a = this.el.getAttribute('aria-label')) === null || _a === void 0 ? void 0 : _a.trim())
+            return undefined;
+        return this.groupLabel ? this.labelId : undefined;
+    }
     getAriaDescribedBy() {
         const messageIds = [];
         if (this.errorMessage) {
@@ -161,13 +212,23 @@ export class PdsRadioGroup {
     render() {
         const gapValue = this.getGapValue();
         const ariaDescribedBy = this.getAriaDescribedBy();
-        return (h(Host, { key: 'aaf53113f06a0f49706e53735701fba64e79cb4d', class: this.classNames(), id: this._groupId, role: "group", "aria-describedby": ariaDescribedBy, style: {
+        const ariaLabelledBy = this.getAriaLabelledBy();
+        const hostClass = this.classNames();
+        this.renderedLabelledBy = ariaLabelledBy;
+        // A DOM morph strips what the component wrote on its host; put back its role, name and description.
+        // Only its own aria-labelledby, so a consumer's that the server dropped stays dropped.
+        this.hostKeeper.record(hostClass, { '--pds-radio-group-gap': gapValue }, {
+            role: 'radiogroup',
+            'aria-describedby': ariaDescribedBy,
+            'aria-labelledby': ariaLabelledBy === this.labelId ? ariaLabelledBy : undefined,
+        });
+        return (h(Host, { key: '0fe381f99dddae0aeb9189a13b0e2195f1c79886', class: hostClass, id: this._groupId, role: "radiogroup", "aria-labelledby": ariaLabelledBy, "aria-describedby": ariaDescribedBy, style: {
                 '--pds-radio-group-gap': gapValue,
-            } }, this.groupLabel && (h("div", { key: '4be5e43146bf348929e45498107862aaca161644', class: "pds-radio-group__label" }, this.groupLabel)), h("div", { key: 'b4a1b870c1a7167b8dcbcf0a11808bbd9a8cec4e', class: {
+            } }, this.groupLabel && (h("div", { key: '4967dc22fa0265dbfbabf94a49b182b8c06d0bd5', class: "pds-radio-group__label", id: this.labelId }, this.groupLabel)), h("div", { key: '7a782a6920de7eda76ab0060c7512f093671ad41', class: {
                 'pds-radio-group__radios': true,
                 'pds-radio-group__radios--row': this.direction === 'row',
                 'pds-radio-group__radios--column': this.direction === 'column',
-            } }, h("slot", { key: '2d841cc69c35a4f9da933bbb33c1384ca343e077', onSlotchange: () => this.updateChildRadios() })), this.helperMessage && (h("div", { key: 'a09bb9e739570c06dc1907cb4e2dceecca36f7d3', class: "pds-radio-group__message", id: messageId(this._groupId, 'helper') }, this.helperMessage)), this.errorMessage && (h("div", { key: 'b8fe891cc4b8683d18c19b3b4ddb70212185b954', class: "pds-radio-group__message pds-radio-group__message--error", id: messageId(this._groupId, 'error'), "aria-live": "assertive" }, h("pds-icon", { key: '9a15d81d8303eeb5a928b96c760f6b15e536e0dc', "aria-hidden": "true", icon: danger, size: "small" }), this.errorMessage))));
+            } }, h("slot", { key: '48a8d2d74961a402e3a1b053b2f0314e74b4b289', onSlotchange: () => this.updateChildRadios() })), this.helperMessage && (h("div", { key: '58db96d62b8d89f03ab245990d2d6bbd3b1b5f85', class: "pds-radio-group__message", id: messageId(this._groupId, 'helper') }, this.helperMessage)), this.errorMessage && (h("div", { key: 'ad3aafe5f7ed45853c36b537525a8fff68452f55', class: "pds-radio-group__message pds-radio-group__message--error", id: messageId(this._groupId, 'error'), "aria-live": "assertive" }, h("pds-icon", { key: '80ce92868703c5e01434e7e83a7668e320bcbee1', "aria-hidden": "true", icon: danger, size: "small" }), this.errorMessage))));
     }
     static get is() { return "pds-radio-group"; }
     static get encapsulation() { return "scoped"; }

package/dist/collection/components/pds-text/pds-text.js

@@ -1,7 +1,10 @@
 import { h } from "@stencil/core";
 import { setColor } from "../../utils/utils";
-import { setupTruncationTooltip } from "../../utils/truncation-tooltip";
+import { FOCUSABLE_WRAPPER, setupTruncationTooltip } from "../../utils/truncation-tooltip";
 import { TEXT_SIZES } from "../../utils/types";
+// Re-runs setup for each text bound to its wrapping control, keyed by host, so a truncated
+// text that joins the same control later can take that control's focus away from it.
+const textsUsingWrapper = new WeakMap();
 /**
  * @part content - The text content container
  */
@@ -55,17 +58,39 @@ export class PdsText {
         this.destroyTruncationTooltip();
     }
     initTruncationTooltip() {
+        var _a;
         // Clean up any existing tooltip before setting up a new one
         this.destroyTruncationTooltip();
         if (this.contentEl) {
+            const wrapper = this.el.closest(FOCUSABLE_WRAPPER);
+            // A pds-chip with a max width binds its tooltip to the wrapper too.
+            const others = wrapper === null ? [] : wrapper.querySelectorAll('pds-text, pds-chip');
+            // One focus on a shared wrapper would open every clipped text's tooltip at once, so texts sharing one each keep
+            // their own stop, and a text bound before this one joined lets go: this one's focus bubbles to the wrapper too.
+            let sharesWrapper = false;
+            for (let i = 0; i < others.length; i++) {
+                const other = others[i];
+                // The property counts too: setting `truncate` runs setup before the next render reflects the attribute.
+                if (other !== this.el && (other.truncate || other.maxWidth || other.hasAttribute('truncate') || other.hasAttribute('max-width'))) {
+                    sharesWrapper = true;
+                    (_a = textsUsingWrapper.get(other)) === null || _a === void 0 ? void 0 : _a();
+                }
+            }
+            const usesWrapper = wrapper !== null && !sharesWrapper;
             this.truncationCleanup = setupTruncationTooltip({
                 hostEl: this.el,
                 contentEl: this.contentEl,
                 getTooltipText: () => this.el.textContent || '',
+                // A wrapping link or button already takes focus, so its focus reveals the text instead of a nested tab stop.
+                manageTabIndex: !usesWrapper,
+                focusEl: usesWrapper ? wrapper : this.el,
             });
+            if (usesWrapper)
+                textsUsingWrapper.set(this.el, () => this.initTruncationTooltip());
         }
     }
     destroyTruncationTooltip() {
+        textsUsingWrapper.delete(this.el);
         if (this.truncationCleanup) {
             this.truncationCleanup();
             this.truncationCleanup = null;
@@ -91,7 +116,7 @@ export class PdsText {
             ? `pds-text--decoration-${this.decoration}`
             : ''}
     `;
-        return (h(Tag, { key: 'b79a6e67f11024cb025cb26bbf77231547bd63a4', ref: (el) => (this.contentEl = el), style: this.color && setColor(this.color), class: typeClasses, part: "content" }, h("slot", { key: 'ae1f8ca39899894541eac3c07fb21ead4ab98f40' })));
+        return (h(Tag, { key: '30566c7810d3fd7f76ae281ae6d9a7e66803f0a3', ref: (el) => (this.contentEl = el), style: this.color && setColor(this.color), class: typeClasses, part: "content" }, h("slot", { key: 'f5113458aa9295803fc1c0bc552f9f92602cacba' })));
     }
     static get is() { return "pds-text"; }
     static get encapsulation() { return "shadow"; }
@@ -279,7 +304,7 @@ export class PdsText {
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "If set or `true`, the text will be truncated. Must add a `width` to the element.\nWhen text overflows, a tooltip showing the full text will appear on hover/focus.\nNote: While the text is overflowing, the element receives tabindex=\"0\" so the\ntooltip can be reached by keyboard. Text that fits is left out of the tab order."
+                    "text": "If set or `true`, the text will be truncated. Must add a `width` to the element.\nWhen text overflows, a tooltip showing the full text will appear on hover/focus.\nNote: While the text is overflowing, the element receives tabindex=\"0\" so the\ntooltip can be reached by keyboard. Text that fits is left out of the tab order.\nInside a link or button (including `pds-button`, `pds-link`, `pds-tab`, and\n`pds-dropdown-menu-item`) that holds no other truncated text or `pds-chip` with a\n`max-width`, no tab stop is added; the tooltip appears when that control receives\nkeyboard focus."
                 },
                 "getter": false,
                 "setter": false,

package/dist/collection/components/pds-text/stories/pds-text.stories.js

@@ -123,3 +123,19 @@ Truncate.args = {
   truncate: true,
   width: '250px',
 };
+
+const TruncateInLinkTemplate = (args) => html`
+<div style="width: ${args.width || '250px'};">
+  <a href="#">
+    <pds-text tag="${args.tag}" ?truncate="${args.truncate}">${args.slot}</pds-text>
+  </a>
+</div>
+<pds-text tag="p" size="xs" color="secondary" gutter="sm">Tab to the link to see the full content in a tooltip. The truncated text adds no tab stop of its own.</pds-text>`;
+
+export const TruncateInLink = TruncateInLinkTemplate.bind();
+TruncateInLink.args = {
+  slot: 'Id irure id magna ipsum voluptate irure esse eu nulla. Ullamco officia adipisicing qui nulla non sint.',
+  tag: 'p',
+  truncate: true,
+  width: '250px',
+};

package/dist/collection/components/pds-tooltip/pds-tooltip.css

@@ -8,6 +8,17 @@
   --tooltip-dimension-max-width: 320px;
 }
 
+:is(dialog, [popover]) > .pds-tooltip {
+  font-style: normal;
+  font-weight: normal;
+  letter-spacing: normal;
+  text-align: start;
+  text-indent: 0;
+  text-transform: none;
+  white-space: normal;
+  word-spacing: normal;
+}
+
 .pds-tooltip__content {
   background-color: var(--pine-color-primary);
   border-radius: calc(var(--pine-dimension-xs) * 1.25);

package/dist/collection/components/pds-tooltip/pds-tooltip.js

@@ -1,5 +1,6 @@
 import { Host, h } from "@stencil/core";
 import { classNamesOf, isStencilClass } from "../../utils/keep-hydrated";
+import { findPortalTarget, isTopLayerInDocument, onTopLayerClose } from "../../utils/portal-target";
 import { autoUpdate, computePosition, flip, offset, shift, } from "@floating-ui/dom";
 /**
  * @slot (default) - The tooltip's target element
@@ -23,6 +24,7 @@ export class PdsTooltip {
         this.currentPathname = '';
         this.pathnameCheckInterval = null;
         this.stopAutoUpdate = null;
+        this.stopWatchingPortalHost = null;
         /**
          * Determines whether or not the tooltip has an arrow
          * @defaultValue true
@@ -272,7 +274,12 @@ export class PdsTooltip {
         this.lastCopiedHtml = this.strippedHtml(initialCopy);
         this.contentDiv.append(...Array.from(initialCopy.childNodes));
         this.portalEl.appendChild(this.contentDiv);
-        document.body.appendChild(this.portalEl);
+        // Nothing in the body paints above a modal dialog or open popover, so the portal goes inside one.
+        const portalHost = findPortalTarget(this.el, isTopLayerInDocument);
+        portalHost.appendChild(this.portalEl);
+        // Closing that host moves no pointer, so a tooltip opened by touch would outlive it unseen.
+        if (portalHost !== document.body)
+            this.stopWatchingPortalHost = onTopLayerClose(portalHost, this.handleHide);
         this.repositionPortal().catch(error => {
             console.warn('Failed to position tooltip on creation:', error);
         });
@@ -385,6 +392,10 @@ export class PdsTooltip {
             this.stopAutoUpdate();
             this.stopAutoUpdate = null;
         }
+        if (this.stopWatchingPortalHost !== null) {
+            this.stopWatchingPortalHost();
+            this.stopWatchingPortalHost = null;
+        }
         // Stop pathname change detection
         if (this.pathnameCheckInterval !== null) {
             clearInterval(this.pathnameCheckInterval);
@@ -415,9 +426,9 @@ export class PdsTooltip {
     }
     render() {
         const hostId = this.componentId || undefined;
-        return (h(Host, { key: '067eda3089732c6a23032bb087182e6dcd0330fa', id: hostId, class: { 'pds-tooltip--is-open': this.opened } }, h("span", { key: '54f6f233c937f048f119df969630af530b10de25', class: "pds-tooltip__trigger", onMouseEnter: this.handleShow, onMouseLeave: this.handleHide,
+        return (h(Host, { key: '475ff12d4be035e3effa894353e7948b42a23489', id: hostId, class: { 'pds-tooltip--is-open': this.opened } }, h("span", { key: '3375dfb5bb86ba373bc5d617f4a53171505631d1', class: "pds-tooltip__trigger", onMouseEnter: this.handleShow, onMouseLeave: this.handleHide,
             /* focusin/out bubble; ensure keyboard users see tooltips */
-            onFocusin: this.handleShow, onFocusout: this.handleHide, ref: el => this.triggerEl = el }, h("slot", { key: 'f8019985ad9fd27deb388e35c43bf2e227ff9c02' })), h("div", { key: '072c4e578aebb99cd213901369a57d7c74734ad9', class: "pds-tooltip__content-slot-wrapper", hidden: true }, h("slot", { key: '22bc45dfb56567f53a608ce2033b062363793450', name: "content" }))));
+            onFocusin: this.handleShow, onFocusout: this.handleHide, ref: el => this.triggerEl = el }, h("slot", { key: 'a3392ad415f5ac7f3883100bf914484ffcc8e536' })), h("div", { key: '774ac2c4808e96649b1536569aaf8cf8a6e3abc2', class: "pds-tooltip__content-slot-wrapper", hidden: true }, h("slot", { key: '672c64b4acdb365623885ac2105a9b90b1dcfa6b', name: "content" }))));
     }
     static get is() { return "pds-tooltip"; }
     static get originalStyleUrls() {

package/dist/collection/components/pds-tooltip/stories/pds-tooltip.stories.js

@@ -20,6 +20,29 @@ const HTMLContentTemplate = (args) => html`
     <pds-button variant="secondary">Hover</pds-button>
   </pds-tooltip>`;
 
+const InModalTemplate = (args) => html`
+  <pds-button onclick="document.querySelector('#tooltip-modal').open = true">Open modal</pds-button>
+  <pds-modal id="tooltip-modal" component-id="tooltip-modal" size="sm">
+    <pds-modal-header>
+      <pds-box padding="md">
+        <pds-text tag="h2" size="h3">Publish changes</pds-text>
+      </pds-box>
+    </pds-modal-header>
+    <pds-modal-content>
+      <pds-box padding-inline-start="md" padding-inline-end="md">
+        <pds-text tag="p">Hover or focus Publish: its tooltip shows above the open modal.</pds-text>
+      </pds-box>
+    </pds-modal-content>
+    <pds-modal-footer>
+      <pds-box fit gap="sm" justify-content="end" padding="md">
+        <pds-button variant="secondary" onclick="document.querySelector('#tooltip-modal').open = false">Cancel</pds-button>
+        <pds-tooltip content=${args.content} ?has-arrow=${args.hasArrow} placement=${args.placement}>
+          <pds-button variant="primary">Publish</pds-button>
+        </pds-tooltip>
+      </pds-box>
+    </pds-modal-footer>
+  </pds-modal>`;
+
 const PositionTemplate = (args) => html`
   <div class="demo-container" style="min-height: 50vh; width: 100%; display: flex; align-items: center; justify-content: center;">
     <div class="position-demo-grid">
@@ -99,3 +122,10 @@ NoArrow.args = {
   placement: "bottom-start",
   slot: "target text"
 };
+
+export const InModal = InModalTemplate.bind({});
+InModal.args = {
+  content: "Fix the errors on the page to publish",
+  hasArrow: true,
+  placement: "top",
+};

package/dist/collection/utils/portal-target.js

@@ -0,0 +1,64 @@
+/**
+ * The native `<dialog>` or open `popover` (as pds-filter's) an element sits in, so a popup portaled
+ * there shares its top layer and a click in it isn't outside it; otherwise `document.body`.
+ * `closest()` stops at shadow boundaries and misses one that only wraps slotted content, so this
+ * walks assigned slots and shadow hosts, as pds-combobox does. `isHost` picks which ancestor counts.
+ */
+export function findPortalTarget(from, isHost = isOpenDialogOrPopover) {
+    const seen = new Set();
+    let current = from;
+    while (current && !seen.has(current)) {
+        seen.add(current);
+        if (current.nodeType === Node.ELEMENT_NODE && isHost(current)) {
+            return current;
+        }
+        const assigned = current.nodeType === Node.ELEMENT_NODE ? current.assignedSlot : null;
+        if (assigned) {
+            current = assigned;
+            continue;
+        }
+        const parent = current.parentNode;
+        current = parent instanceof ShadowRoot ? parent.host : parent;
+    }
+    return document.body;
+}
+/**
+ * A modal dialog or open popover, which paints in the top layer above anything in the body, that
+ * sits in the document itself: the document's stylesheets don't reach into a shadow root.
+ */
+export function isTopLayerInDocument(el) {
+    if (el.getRootNode() !== el.ownerDocument)
+        return false;
+    return matchesSafely(el, ':modal') || matchesSafely(el, ':popover-open');
+}
+/**
+ * Calls `onClose` once `host` leaves the top layer (its dialog closes or its popover hides), and
+ * returns a function that stops listening.
+ */
+export function onTopLayerClose(host, onClose) {
+    const check = () => {
+        if (!isTopLayerInDocument(host))
+            onClose();
+    };
+    host.addEventListener('close', check);
+    host.addEventListener('toggle', check);
+    return () => {
+        host.removeEventListener('close', check);
+        host.removeEventListener('toggle', check);
+    };
+}
+function isOpenDialogOrPopover(el) {
+    // Only an open dialog: inside a closed one, the popup would be hidden with it.
+    if (el.localName === 'dialog')
+        return el.open;
+    return el.hasAttribute('popover') && matchesSafely(el, ':popover-open');
+}
+function matchesSafely(el, selector) {
+    try {
+        return el.matches(selector);
+    }
+    catch (_a) {
+        // A browser without the selector (no Popover API, or no :modal): no top layer to share.
+        return false;
+    }
+}

package/dist/collection/utils/tabbable.js

@@ -24,7 +24,8 @@ function collectTabbable(root, found) {
 const isTabStop = (el) => { var _a; return el.tabIndex >= 0 || (el.isContentEditable && !el.hasAttribute('tabindex') && !((_a = el.parentElement) === null || _a === void 0 ? void 0 : _a.isContentEditable)); };
 function visitTabbable(el, found) {
     var _a, _b, _c, _d;
-    if (el.hasAttribute('inert'))
+    // A tooltip portaled into a dialog only describes the control that has focus; it's never a stop of its own.
+    if (el.hasAttribute('inert') || el.getAttribute('role') === 'tooltip')
         return;
     if (el.localName === 'slot') {
         const slot = el;