@justeattakeaway/pie-tooltip 0.3.0 → 0.5.0

package/src/index.ts

@@ -37,10 +37,10 @@ import '@justeattakeaway/pie-icons-webc/dist/IconClose.js';
 
 export * from './defs';
 
-const headingId = 'pie-tooltip-heading';
+const FOCUS_PANEL_MAX_ATTEMPTS = 5;
+
+const nextFrame = (): Promise<number> => new Promise(requestAnimationFrame);
 
-// Returns true if the element establishes a containing block through a property other than
-// `position` — i.e. for both absolute and fixed descendants, not just absolute.
 const createsContainingBlock = (styles: CSSStyleDeclaration): boolean => {
     const isSet = (value: string | undefined) => !!value && value !== 'none';
 
@@ -58,7 +58,6 @@ const createsContainingBlock = (styles: CSSStyleDeclaration): boolean => {
         return true;
     }
 
-    // `size` and `style` containment do not establish a containing block; everything else does.
     if (/\b(paint|layout|content|strict)\b/.test(styles.contain)) {
         return true;
     }
@@ -67,7 +66,6 @@ const createsContainingBlock = (styles: CSSStyleDeclaration): boolean => {
         return true;
     }
 
-    // will-change pre-establishes the containing block before the property is applied.
     return /\b(transform|perspective|filter|backdrop-filter|contain|translate|rotate|scale)\b/.test(styles.willChange);
 };
 
@@ -91,8 +89,6 @@ const flattenedAncestors = (element: Element): Array<Element> => {
     return ancestors;
 };
 
-// The ancestors that clip the trigger. Overflow on the root element and the body is left out:
-// that is the viewport clip, which every element is subject to and which no panel can escape.
 const collectClippingAncestors = (element: Element): Array<Element> => {
     const { documentElement, body } = element.ownerDocument;
 
@@ -107,9 +103,6 @@ const collectClippingAncestors = (element: Element): Array<Element> => {
     });
 };
 
-// The region an element clips its descendants to: its padding box, minus any scrollbar.
-// `clientLeft`/`clientTop` are the border widths and `clientWidth`/`clientHeight` the padding box,
-// so together they convert the border-box rect the browser reports into the clip region.
 const getClipRect = (element: Element): DOMRect => {
     const { left, top } = element.getBoundingClientRect();
     const {
@@ -119,7 +112,6 @@ const getClipRect = (element: Element): DOMRect => {
     return new DOMRect(left + clientLeft, top + clientTop, clientWidth, clientHeight);
 };
 
-// Intersects two rects. Returns `null` when they do not overlap.
 const intersectRects = (a: DOMRect, b: DOMRect): DOMRect | null => {
     const left = Math.max(a.left, b.left);
     const top = Math.max(a.top, b.top);
@@ -133,10 +125,119 @@ const intersectRects = (a: DOMRect, b: DOMRect): DOMRect | null => {
     return new DOMRect(left, top, right - left, bottom - top);
 };
 
+type TooltipSide = 'top' | 'bottom' | 'left' | 'right';
+type TooltipAlignment = '' | '-start' | '-end';
+
+interface CandidateRect {
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
+}
+
+const oppositeSide: Record<TooltipSide, TooltipSide> = {
+    top: 'bottom',
+    bottom: 'top',
+    left: 'right',
+    right: 'left',
+};
+
+const crossSides: Record<TooltipSide, Array<TooltipSide>> = {
+    top: ['left', 'right'],
+    bottom: ['left', 'right'],
+    left: ['top', 'bottom'],
+    right: ['top', 'bottom'],
+};
+
+const parsePosition = (position: TooltipProps['position']): { side: TooltipSide; alignment: TooltipAlignment } => {
+    const match = /^(top|bottom|left|right)(-start|-end)?$/.exec(position ?? '');
+
+    if (!match) {
+        return { side: 'top', alignment: '' };
+    }
+
+    return { side: match[1] as TooltipSide, alignment: (match[2] ?? '') as TooltipAlignment };
+};
+
+const toPhysicalSide = (side: TooltipSide, isRtl: boolean): TooltipSide => {
+    if (!isRtl) {
+        return side;
+    }
+
+    if (side === 'left') {
+        return 'right';
+    }
+
+    if (side === 'right') {
+        return 'left';
+    }
+
+    return side;
+};
+
+const getCandidateRect = (
+    side: TooltipSide,
+    alignment: TooltipAlignment,
+    anchor: DOMRect,
+    panelWidth: number,
+    panelHeight: number,
+    offset: number,
+    isRtl: boolean,
+): CandidateRect => {
+    const physicalSide = toPhysicalSide(side, isRtl);
+    const isVerticalSide = physicalSide === 'top' || physicalSide === 'bottom';
+
+    let left = 0;
+    let top = 0;
+
+    if (physicalSide === 'top') {
+        top = anchor.top - offset - panelHeight;
+    } else if (physicalSide === 'bottom') {
+        top = anchor.bottom + offset;
+    } else if (physicalSide === 'left') {
+        left = anchor.left - offset - panelWidth;
+    } else {
+        left = anchor.right + offset;
+    }
+
+    if (isVerticalSide) {
+        if (alignment === '') {
+            left = anchor.left + (anchor.width / 2) - (panelWidth / 2);
+        } else if (alignment === '-start') {
+            left = isRtl ? anchor.right - panelWidth : anchor.left;
+        } else {
+            left = isRtl ? anchor.left : anchor.right - panelWidth;
+        }
+    } else if (alignment === '') {
+        top = anchor.top + (anchor.height / 2) - (panelHeight / 2);
+    } else {
+        top = alignment === '-start' ? anchor.top : anchor.bottom - panelHeight;
+    }
+
+    return {
+        left,
+        top,
+        right: left + panelWidth,
+        bottom: top + panelHeight,
+    };
+};
+
+const containsRect = (boundary: DOMRect, rect: CandidateRect): boolean => rect.left >= boundary.left &&
+    rect.right <= boundary.right &&
+    rect.top >= boundary.top &&
+    rect.bottom <= boundary.bottom;
+
+const getVisibleArea = (boundary: DOMRect, rect: CandidateRect): number => {
+    const width = Math.min(boundary.right, rect.right) - Math.max(boundary.left, rect.left);
+    const height = Math.min(boundary.bottom, rect.bottom) - Math.max(boundary.top, rect.top);
+
+    return Math.max(0, width) * Math.max(0, height);
+};
+
 /**
  * @tagname pie-tooltip
  * @event {Event} pie-tooltip-open - When a configured trigger asks for the panel. Set `isOpen` to `true` in response.
- * @event {Event} pie-tooltip-close - When the close button is clicked, or a configured trigger asks to dismiss the panel. Set `isOpen` to `false` in response.
+ * @event {Event} pie-tooltip-close - When the close button is clicked, Escape is pressed, or a configured trigger asks to dismiss the panel. Set `isOpen` to `false` in response.
  * @slot content - The descriptive content of the panel. Must not contain focusable elements.
  * @slot action - An optional slot for interactive content such as a `pie-button`. Filling this slot switches the panel to a non-modal dialog.
  */
@@ -190,10 +291,18 @@ export class PieTooltip extends PieElement implements TooltipProps {
 
     @state() private _isAnchorVisible = true;
 
+    @state() private _resolvedPosition: TooltipProps['position'] | undefined;
+
     private _clippedTriggerElement: Element | null = null;
 
     private _triggerClippers: Array<Element> = [];
 
+    private _overlayClippers: Array<Element> = [];
+
+    private _collisionSignature: string | null = null;
+
+    private _overlayModeDirty = true;
+
     private _triggerTrackingController: AbortController | undefined;
     private _interactionController: AbortController | undefined;
 
@@ -203,10 +312,16 @@ export class PieTooltip extends PieElement implements TooltipProps {
 
     private _reanchorFrame = 0;
 
-    private _shouldResolveOverlayMode = false;
-
     private _hoverCloseTimer: ReturnType<typeof setTimeout> | undefined;
 
+    private _openedByClick = false;
+
+    private readonly _instanceId = crypto.randomUUID();
+
+    private get _headingId (): string {
+        return `pie-tooltip-heading-${this._instanceId}`;
+    }
+
     static styles = unsafeCSS(styles);
 
     private get _mode (): TooltipMode | undefined {
@@ -214,11 +329,13 @@ export class PieTooltip extends PieElement implements TooltipProps {
             return undefined;
         }
 
-        return this._hasActionContent ? 'dialog' : 'tooltip';
+        return (this._hasActionContent || this.isDismissible) ? 'dialog' : 'tooltip';
     }
 
     protected firstUpdated (): void {
         this.resolveMode();
+        this._overlayModeDirty = true;
+        this.resolveOverlayMode();
         this.projectOverTrigger();
         this._rebuildInteractionListeners();
     }
@@ -227,16 +344,29 @@ export class PieTooltip extends PieElement implements TooltipProps {
         const anchoringProperties: Array<keyof PieTooltip> = ['trigger', 'isOpen', 'position', 'size'];
 
         if (this.isOpen && changedProperties.has('isOpen')) {
-            this.resolveOverlayMode();
+            this._overlayModeDirty = true;
         }
 
-        if (anchoringProperties.some((prop) => changedProperties.has(prop))) {
+        if (!this.isOpen) {
+            this._openedByClick = false;
+        }
+
+        if (changedProperties.has('trigger')) {
+            this._overlayModeDirty = true;
+        }
+
+        const isAnchoringChange = anchoringProperties.some((prop) => changedProperties.has(prop));
+
+        if (isAnchoringChange) {
+            this._collisionSignature = null;
+        }
+
+        this.resolveOverlayMode();
+
+        if (isAnchoringChange) {
             this.projectOverTrigger();
         }
 
-        // Tracking is bound to a specific trigger element and a specific ancestor chain, so a new
-        // trigger needs it rebuilt rather than left in place. `startTrackingTrigger` early-returns
-        // while a controller exists, so the stop has to come first.
         if (this.isOpen && changedProperties.has('trigger')) {
             this.stopTrackingTrigger();
         }
@@ -258,8 +388,36 @@ export class PieTooltip extends PieElement implements TooltipProps {
         super.disconnectedCallback();
     }
 
-    // Listens for scroll (capture — catches any ancestor), resize, and dir-attribute changes to
-    // re-anchor the panel. Multiple events per frame coalesce into one requestAnimationFrame call.
+    public async focusPanel (): Promise<boolean> {
+        if (this._mode !== 'dialog') {
+            return false;
+        }
+
+        await this.updateComplete;
+        await nextFrame();
+
+        const content = this.renderRoot.querySelector<HTMLElement>(`.${componentClass}-content`);
+
+        if (!content) {
+            return false;
+        }
+
+        const focusLanded = () => this.shadowRoot?.activeElement === content;
+
+        for (let attempt = 0; attempt < FOCUS_PANEL_MAX_ATTEMPTS; attempt++) {
+            content.focus({ preventScroll: true });
+
+            if (focusLanded()) {
+                return true;
+            }
+
+            // eslint-disable-next-line no-await-in-loop
+            await nextFrame();
+        }
+
+        return false;
+    }
+
     private startTrackingTrigger (): void {
         if (this._triggerTrackingController) {
             return;
@@ -276,28 +434,19 @@ export class PieTooltip extends PieElement implements TooltipProps {
             this._reanchorFrame = requestAnimationFrame(() => {
                 this._reanchorFrame = 0;
 
-                if (this._shouldResolveOverlayMode) {
-                    this._shouldResolveOverlayMode = false;
-                    this.resolveOverlayMode();
-                }
-
+                this.resolveOverlayMode();
                 this.projectOverTrigger();
             });
         };
 
-        // Flagged rather than resolved immediately so window-drag cannot walk ancestors more than once per frame.
         const handleResize = () => {
-            this._shouldResolveOverlayMode = true;
+            this._overlayModeDirty = true;
             handleViewportChange();
         };
 
         window.addEventListener('scroll', handleViewportChange, { capture: true, passive: true, signal });
         window.addEventListener('resize', handleResize, { passive: true, signal });
 
-        // `scroll` is not composed, so its path stops at the shadow root it happened in and a
-        // listener on `window` never sees it. A scroll container inside another component's
-        // shadow root (`pie-modal`'s, for one) therefore needs its own listener, or the panel
-        // detaches from the trigger as soon as that container scrolls.
         const shadowRoots = new Set<ShadowRoot>();
 
         flattenedAncestors(this).forEach((ancestor) => {
@@ -312,13 +461,8 @@ export class PieTooltip extends PieElement implements TooltipProps {
             root.addEventListener('scroll', handleViewportChange, { capture: true, passive: true, signal });
         });
 
-        // A trigger inside a container that was `display: none` when the panel opened has no box
-        // to measure. `pie-modal` calls `showModal()` from an async `firstUpdated`, so this is the
-        // normal case for a tooltip inside a modal that is open on load.
         this._triggerObserver = new ResizeObserver(() => {
-            // Geometry changed, so the ancestor chain may have too. Flagged rather than resolved
-            // here so the walk runs at most once per frame.
-            this._shouldResolveOverlayMode = true;
+            this._overlayModeDirty = true;
             handleViewportChange();
         });
 
@@ -347,8 +491,6 @@ export class PieTooltip extends PieElement implements TooltipProps {
         this._triggerObserver?.disconnect();
         this._triggerObserver = undefined;
 
-        this._shouldResolveOverlayMode = false;
-
         if (this._reanchorFrame) {
             cancelAnimationFrame(this._reanchorFrame);
             this._reanchorFrame = 0;
@@ -359,31 +501,25 @@ export class PieTooltip extends PieElement implements TooltipProps {
         this._hasActionContent = this._assignedActionElements.length > 0;
     }
 
-    // Picks between `absolute` (browser handles scrolling, but clipped by overflow ancestors) and
-    // `fixed` (escapes overflow clips, but must re-offset on every scroll). Switches to `fixed`
-    // only when it escapes a clip that `absolute` would not.
-    //
-    // An overflow ancestor clips a positioned box only if it is that box's containing block or an
-    // ancestor of it; a clipper strictly inside the containing block does not clip. So each
-    // clipper is counted against a mode only once that mode's containing block has been reached.
     private resolveOverlayMode (): void {
+        if (!this._overlayModeDirty) {
+            return;
+        }
+
+        this._overlayModeDirty = false;
+
         let isAtOrAboveAbsoluteContainingBlock = false;
         let isAtOrAboveFixedContainingBlock = false;
-        let absoluteClippers = 0;
-        let fixedClippers = 0;
+        const absoluteClippingAncestors: Array<Element> = [];
+        const fixedClippingAncestors: Array<Element> = [];
 
         const { documentElement, body } = this.ownerDocument;
 
-        // Resolved on the same triggers as the overlay mode, because both answers change only
-        // when the ancestor chain does.
         this._refreshTriggerClippers();
 
         flattenedAncestors(this).forEach((element) => {
             const styles = getComputedStyle(element);
 
-            // `display: contents` generates no box, so it can neither be a containing block nor
-            // clip. `display: none` is deliberately not skipped: its computed values still
-            // describe the box it will generate, so the answer holds once it is shown.
             if (styles.display === 'contents') {
                 return;
             }
@@ -400,34 +536,25 @@ export class PieTooltip extends PieElement implements TooltipProps {
 
             const clips = styles.overflowX !== 'visible' || styles.overflowY !== 'visible';
 
-            // Overflow on the root element and on the body propagates to the viewport, which no
-            // positioning scheme escapes. Counting it can only make `fixed` look no better than
-            // `absolute`, which is what happens while a `pie-modal` is open, because its scroll
-            // lock sets `overflow: hidden` on the body.
             const propagatesOverflowToViewport = element === documentElement || element === body;
 
-            // Counted after the containing-block flags so an ancestor that is both the containing
-            // block and the clipper is counted correctly.
             if (clips && !propagatesOverflowToViewport) {
                 if (isAtOrAboveAbsoluteContainingBlock) {
-                    absoluteClippers += 1;
+                    absoluteClippingAncestors.push(element);
                 }
 
                 if (isAtOrAboveFixedContainingBlock) {
-                    fixedClippers += 1;
+                    fixedClippingAncestors.push(element);
                 }
             }
         });
 
-        // The fixed containing block is always at or above the absolute one, so the clippers that
-        // apply to a fixed box are a subset of those that apply to an absolute one. A lower count
-        // therefore always means a strictly better escape, never a worse one.
-        this.style.position = fixedClippers < absoluteClippers ? 'fixed' : '';
+        const useFixed = fixedClippingAncestors.length < absoluteClippingAncestors.length;
+
+        this.style.position = useFixed ? 'fixed' : '';
+        this._overlayClippers = useFixed ? fixedClippingAncestors : absoluteClippingAncestors;
     }
 
-    // Measures the trigger relative to the origin marker (which sits at the containing block's
-    // origin) and writes CSS custom properties. Self-referential: correct for any containing
-    // block. Physical values; shadow-root CSS uses logical properties for RTL mirroring.
     private projectOverTrigger (): void {
         this._isPositioned = false;
 
@@ -448,16 +575,11 @@ export class PieTooltip extends PieElement implements TooltipProps {
             this._refreshTriggerClippers();
         }
 
-        // Anchoring to the trigger's full box would point the panel at a part of the trigger that
-        // has been scrolled out of sight, leaving whatever sits over it — a pinned modal footer,
-        // for one — between the two. Anchoring to the visible part instead keeps the arrow on the
-        // edge the reader can actually see.
         const visibleRect = this._triggerClippers.reduce<DOMRect | null>(
             (rect, clipper) => (rect ? intersectRects(rect, getClipRect(clipper)) : null),
             triggerElement.getBoundingClientRect(),
         );
 
-        // Nothing of the trigger is left to point at, so there is nothing to describe either.
         this._isAnchorVisible = visibleRect !== null;
 
         if (!visibleRect) {
@@ -480,12 +602,122 @@ export class PieTooltip extends PieElement implements TooltipProps {
         const containerInlineSize = container ? container.getBoundingClientRect().width : width;
 
         this.style.setProperty('--tooltip-container-inline-size', `${containerInlineSize}px`);
+
+        this.resolveCollision(visibleRect);
+
         this._isPositioned = true;
     }
 
-    // Cached because `projectOverTrigger` runs on every re-anchoring frame, and collecting these
-    // costs a computed style per ancestor. Refreshed when the trigger changes and whenever the
-    // overlay mode is resolved, which is the same cadence as an ancestor chain actually changing.
+    private resolveCollision (anchorRect: DOMRect): void {
+        const panel = this.renderRoot.querySelector<HTMLElement>(`.${componentClass}`);
+
+        if (!panel) {
+            return;
+        }
+
+        const boundary = this._getCollisionBoundary();
+
+        if (!boundary) {
+            this._collisionSignature = null;
+            this._setResolvedPosition(this.position ?? defaultProps.position);
+
+            return;
+        }
+
+        const isIconType = this.type === 'icon';
+        const hostStyles = getComputedStyle(this);
+        const isRtl = hostStyles.direction === 'rtl';
+
+        const panelWidth = panel.offsetWidth;
+        const panelHeight = panel.offsetHeight;
+        const signature = [
+            anchorRect.left, anchorRect.top, anchorRect.width, anchorRect.height,
+            boundary.left, boundary.top, boundary.width, boundary.height,
+            panelWidth, panelHeight,
+            isRtl,
+        ].join(':');
+
+        if (this._collisionSignature === signature) {
+            return;
+        }
+
+        this._collisionSignature = signature;
+
+        const offset = parseFloat(hostStyles.getPropertyValue('--tooltip-offset')) || 0;
+        const arrowSize = parseFloat(hostStyles.getPropertyValue('--tooltip-arrow-size')) || 0;
+        const layerOffset = isIconType ? offset : offset + arrowSize;
+
+        const { side: preferredSide, alignment: preferredAlignment } = parsePosition(this.position ?? defaultProps.position);
+
+        let fitting: { side: TooltipSide; alignment: TooltipAlignment } | undefined;
+        let bestFallback: { side: TooltipSide; alignment: TooltipAlignment } | undefined;
+        let bestArea = -1;
+
+        this._getCandidatePositions(preferredSide, preferredAlignment).some(({ side, alignment }) => {
+            const rect = getCandidateRect(
+                side,
+                alignment,
+                anchorRect,
+                panelWidth,
+                panelHeight,
+                layerOffset,
+                isRtl,
+            );
+
+            if (containsRect(boundary, rect)) {
+                fitting = { side, alignment };
+
+                return true;
+            }
+
+            const area = getVisibleArea(boundary, rect);
+
+            if (area > bestArea) {
+                bestArea = area;
+                bestFallback = { side, alignment };
+            }
+
+            return false;
+        });
+
+        const resolved = fitting ?? bestFallback;
+        const resolvedPosition = resolved
+            ? `${resolved.side}${resolved.alignment}` as TooltipProps['position']
+            : this.position ?? defaultProps.position;
+
+        this._setResolvedPosition(resolvedPosition);
+    }
+
+    private _setResolvedPosition (position: TooltipProps['position']): void {
+        if (this._resolvedPosition !== position) {
+            this._resolvedPosition = position;
+        }
+    }
+
+    private _getCollisionBoundary (): DOMRect | null {
+        const { documentElement } = this.ownerDocument;
+        const viewport = new DOMRect(0, 0, documentElement.clientWidth, documentElement.clientHeight);
+
+        return this._overlayClippers.reduce<DOMRect | null>(
+            (rect, clipper) => (rect ? intersectRects(rect, getClipRect(clipper)) : null),
+            viewport,
+        );
+    }
+
+    private _getCandidatePositions (
+        preferredSide: TooltipSide,
+        preferredAlignment: TooltipAlignment,
+    ): Array<{ side: TooltipSide; alignment: TooltipAlignment }> {
+        const sideOrder: Array<TooltipSide> = [preferredSide, oppositeSide[preferredSide], ...crossSides[preferredSide]];
+        const allAlignments: Array<TooltipAlignment> = ['', '-start', '-end'];
+
+        return sideOrder.flatMap((side) => {
+            const alignments = [preferredAlignment, ...allAlignments.filter((alignment) => alignment !== preferredAlignment)];
+
+            return alignments.map((alignment) => ({ side, alignment }));
+        });
+    }
+
     private _refreshTriggerClippers (): void {
         const triggerElement = this._getTriggerElement();
 
@@ -537,20 +769,20 @@ export class PieTooltip extends PieElement implements TooltipProps {
     private _rebuildInteractionListeners (): void {
         this._teardownInteractionListeners();
 
-        if (!this.triggers?.length) return;
-
         const controller = new AbortController();
         const { signal } = controller;
         this._interactionController = controller;
 
-        const triggerEl = this._getTriggerElement();
-
         this.ownerDocument.addEventListener('keydown', (e: KeyboardEvent) => {
             if (e.key === 'Escape' && this.isOpen) {
                 this._requestClose();
             }
         }, { signal });
 
+        if (!this.triggers?.length) return;
+
+        const triggerEl = this._getTriggerElement();
+
         if (!triggerEl) return;
 
         if (this.triggers.includes('hover')) {
@@ -563,7 +795,6 @@ export class PieTooltip extends PieElement implements TooltipProps {
                 this._startHoverCloseTimer();
             }, { signal });
 
-            // panel mouseenter/leave for the hover bridge (includes the bridge pseudo-element)
             const panel = this.renderRoot.querySelector('.c-tooltip');
             if (panel) {
                 panel.addEventListener('mouseenter', () => {
@@ -577,14 +808,12 @@ export class PieTooltip extends PieElement implements TooltipProps {
         }
 
         if (this.triggers.includes('focus')) {
-            // open on focus, close on blur unless focus moved into panel action content
             triggerEl.addEventListener('focusin', () => {
                 this._requestOpen();
             }, { signal });
 
             triggerEl.addEventListener('focusout', (e: Event) => {
                 const related = (e as FocusEvent).relatedTarget as Node | null;
-                // relatedTarget is retargeted to the shadow host when focus moves into shadow DOM
                 const staysInside = related && (this.contains(related) || related === this);
                 if (!staysInside) {
                     this._requestClose();
@@ -595,14 +824,23 @@ export class PieTooltip extends PieElement implements TooltipProps {
         if (this.triggers.includes('click')) {
             triggerEl.addEventListener('click', (e: Event) => {
                 e.stopPropagation();
-                if (this.isOpen) {
-                    this._requestClose();
-                } else {
+
+                if (!this.isOpen) {
+                    this._openedByClick = true;
                     this._requestOpen();
+
+                    return;
+                }
+
+                if (!this._openedByClick) {
+                    this._openedByClick = true;
+
+                    return;
                 }
+
+                this._requestClose();
             }, { signal });
 
-            // Light-dismiss: click anywhere outside the panel and trigger
             this.ownerDocument.addEventListener('click', (e: Event) => {
                 const target = e.composedPath()[0] as Node;
                 const isInsidePanel = this.contains(target) || this.shadowRoot?.contains(target);
@@ -624,9 +862,9 @@ export class PieTooltip extends PieElement implements TooltipProps {
         const tag = unsafeStatic(this.headingLevel);
 
         return html`<${tag}
-                        id="${headingId}"
+                        id="${this._headingId}"
                         class="${componentClass}-heading"
-                        data-test-id="${headingId}">${this.heading}</${tag}>`;
+                        data-test-id="${componentSelector}-heading">${this.heading}</${tag}>`;
     }
 
     private renderCloseButton (): TemplateResult {
@@ -648,13 +886,15 @@ export class PieTooltip extends PieElement implements TooltipProps {
             heading,
             isDismissible,
             isOpen,
-            position,
+            position: preferredPosition,
             size,
             type,
             variant,
+            _resolvedPosition,
             _mode: mode,
         } = this;
 
+        const position = _resolvedPosition ?? preferredPosition;
         const isIconType = type === 'icon';
 
         const layerClasses = {
@@ -673,7 +913,7 @@ export class PieTooltip extends PieElement implements TooltipProps {
             [`${componentClass}--type-${type}`]: true,
             [`${componentClass}--size-${size}`]: !isIconType,
             'is-dismissible': !!isDismissible,
-            'has-action': mode === 'dialog',
+            'has-action': this._hasActionContent === true,
             'has-heading': !!heading,
         };
 
@@ -688,12 +928,15 @@ export class PieTooltip extends PieElement implements TooltipProps {
                         data-test-id="${componentSelector}"
                         role="${ifDefined(mode)}"
                         aria-hidden="${!isOpen}"
-                        aria-labelledby="${isDialog && heading ? headingId : nothing}"
+                        aria-labelledby="${isDialog && heading ? this._headingId : nothing}"
                         aria-label="${isDialog && !heading && aria?.label ? aria.label : nothing}">
                         ${isIconType ? nothing : html`<div class="${componentClass}-arrow" data-test-id="${componentSelector}-arrow"></div>`}
                         <div class="${componentClass}-body">
                             ${heading ? this.renderHeading() : nothing}
-                            <div class="${componentClass}-content" data-test-id="${componentSelector}-content">
+                            <div
+                                class="${componentClass}-content"
+                                tabindex="${isDialog ? -1 : nothing}"
+                                data-test-id="${componentSelector}-content">
                                 <slot name="content"></slot>
                             </div>
                         </div>