@atlaskit/top-layer 0.1.5 → 0.2.0

package/dist/esm/internal/anchor-positioning-fallback.js

@@ -1,9 +1,23 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/**
+ * JS fallback positioning math. Used only when the browser does not
+ * support CSS Anchor Positioning (less than 6% of users).
+ *
+ * Consumer-supplied `offset.gap` and `offset.crossAxisShift` are
+ * honored: the caller (`useAnchorPosition`) resolves CSS length strings
+ * (tokens, calc, var, etc) to pixels via a DOM probe before passing them
+ * in. The caller also keeps the popover hidden (`opacity: 0`) until the
+ * first measurement completes, so the popover never paints at the wrong
+ * position.
+ */
+
 /**
  * Computes the base {top, left} position based on the primary edge,
  * flipping to the opposite side when there is not enough space.
+ *
+ * `gap` is applied along the main axis between trigger and popover.
  */
 function computeEdgePosition(_ref) {
   var axis = _ref.axis,
@@ -12,13 +26,15 @@ function computeEdgePosition(_ref) {
     popoverWidth = _ref.popoverWidth,
     popoverHeight = _ref.popoverHeight,
     viewport = _ref.viewport,
-    offset = _ref.offset;
+    gap = _ref.gap;
   if (axis === 'block' && edge === 'end') {
     // Below trigger
     var spaceBelow = viewport.height - triggerRect.bottom;
     var spaceAbove = triggerRect.top;
+    var fitsBelow = spaceBelow >= popoverHeight + gap;
+    var useBelow = fitsBelow || spaceBelow >= spaceAbove;
     return {
-      top: spaceBelow >= popoverHeight + offset || spaceBelow >= spaceAbove ? triggerRect.bottom + offset : triggerRect.top - popoverHeight - offset,
+      top: useBelow ? triggerRect.bottom + gap : triggerRect.top - popoverHeight - gap,
       left: triggerRect.left + triggerRect.width / 2 - popoverWidth / 2
     };
   }
@@ -26,8 +42,10 @@ function computeEdgePosition(_ref) {
     // Above trigger
     var _spaceAbove = triggerRect.top;
     var _spaceBelow = viewport.height - triggerRect.bottom;
+    var fitsAbove = _spaceAbove >= popoverHeight + gap;
+    var useAbove = fitsAbove || _spaceAbove >= _spaceBelow;
     return {
-      top: _spaceAbove >= popoverHeight + offset || _spaceAbove >= _spaceBelow ? triggerRect.top - popoverHeight - offset : triggerRect.bottom + offset,
+      top: useAbove ? triggerRect.top - popoverHeight - gap : triggerRect.bottom + gap,
       left: triggerRect.left + triggerRect.width / 2 - popoverWidth / 2
     };
   }
@@ -35,24 +53,28 @@ function computeEdgePosition(_ref) {
     // Right of trigger
     var spaceRight = viewport.width - triggerRect.right;
     var spaceLeft = triggerRect.left;
+    var fitsRight = spaceRight >= popoverWidth + gap;
+    var useRight = fitsRight || spaceRight >= spaceLeft;
     return {
       top: triggerRect.top + triggerRect.height / 2 - popoverHeight / 2,
-      left: spaceRight >= popoverWidth + offset || spaceRight >= spaceLeft ? triggerRect.right + offset : triggerRect.left - popoverWidth - offset
+      left: useRight ? triggerRect.right + gap : triggerRect.left - popoverWidth - gap
     };
   }
   if (axis === 'inline' && edge === 'start') {
     // Left of trigger
     var _spaceLeft = triggerRect.left;
     var _spaceRight = viewport.width - triggerRect.right;
+    var fitsLeft = _spaceLeft >= popoverWidth + gap;
+    var useLeft = fitsLeft || _spaceLeft >= _spaceRight;
     return {
       top: triggerRect.top + triggerRect.height / 2 - popoverHeight / 2,
-      left: _spaceLeft >= popoverWidth + offset || _spaceLeft >= _spaceRight ? triggerRect.left - popoverWidth - offset : triggerRect.right + offset
+      left: useLeft ? triggerRect.left - popoverWidth - gap : triggerRect.right + gap
     };
   }
 
   // Unreachable for valid placements; defaults to below trigger
   return {
-    top: triggerRect.bottom + offset,
+    top: triggerRect.bottom + gap,
     left: triggerRect.left + triggerRect.width / 2 - popoverWidth / 2
   };
 }
@@ -99,26 +121,58 @@ function applyAlignment(_ref2) {
 }
 
 /**
- * JS fallback: compute popover position from trigger rect and viewport.
+ * Applies the cross-axis shift offset.
  *
- * Placement algorithm (from the document):
- * - "block" placement: show above/below, picking the side with more space if flipping needed
- * - "inline" placement: show left/right, picking the side with more space if flipping needed
- * - "auto" placement: show on the edge with the most available space
+ * The sign mirrors the CSS path (see `crossAxisShiftMargin` in
+ * `use-anchor-positioning.tsx`):
+ *   - `align: 'start' | 'center'` + `forwards`  → push toward end (positive)
+ *   - `align: 'end'`              + `forwards`  → push toward start (negative)
+ *   - `backwards` flips the sign in both cases.
+ */
+function applyCrossAxisShift(_ref3) {
+  var position = _ref3.position,
+    axis = _ref3.axis,
+    align = _ref3.align,
+    crossAxisShift = _ref3.crossAxisShift;
+  if (crossAxisShift.value === 0) {
+    return position;
+  }
+  var directionSign = crossAxisShift.direction === 'forwards' ? 1 : -1;
+  var sideSign = align === 'end' ? -1 : 1;
+  var delta = crossAxisShift.value * directionSign * sideSign;
+
+  // Cross-axis is the OPPOSITE of the placement axis.
+  if (axis === 'block') {
+    return _objectSpread(_objectSpread({}, position), {}, {
+      left: position.left + delta
+    });
+  }
+  return _objectSpread(_objectSpread({}, position), {}, {
+    top: position.top + delta
+  });
+}
+
+/**
+ * Computes popover position from trigger rect and viewport, flipping to
+ * the side with more space when needed. Re-runs on scroll/resize.
  *
- * Re-runs on scroll (capture on window) and resize events.
+ * `gap` and `crossAxisShift` are pre-resolved to pixels by the
+ * caller (see `resolveCssLengthToPixels`), so this function stays purely
+ * numeric.
  */
-export function computeFallbackPosition(_ref3) {
-  var triggerRect = _ref3.triggerRect,
-    popoverEl = _ref3.popoverEl,
-    placement = _ref3.placement,
-    viewport = _ref3.viewport,
-    offset = _ref3.offset;
+export function computeFallbackPosition(_ref4) {
+  var triggerRect = _ref4.triggerRect,
+    popoverEl = _ref4.popoverEl,
+    placement = _ref4.placement,
+    viewport = _ref4.viewport,
+    gap = _ref4.gap,
+    crossAxisShift = _ref4.crossAxisShift;
   var axis = placement.axis,
     edge = placement.edge,
     align = placement.align;
 
-  // Measure popover dimensions (it might not have layout yet if just shown)
+  // Measure popover dimensions. Callers must ensure the popover has
+  // laid out before calling this (it should not be `display: none`).
   var popoverWidth = popoverEl.offsetWidth;
   var popoverHeight = popoverEl.offsetHeight;
   var basePosition = computeEdgePosition({
@@ -128,7 +182,7 @@ export function computeFallbackPosition(_ref3) {
     popoverWidth: popoverWidth,
     popoverHeight: popoverHeight,
     viewport: viewport,
-    offset: offset
+    gap: gap
   });
   var alignedPosition = applyAlignment({
     position: basePosition,
@@ -138,10 +192,16 @@ export function computeFallbackPosition(_ref3) {
     popoverWidth: popoverWidth,
     popoverHeight: popoverHeight
   });
+  var shiftedPosition = applyCrossAxisShift({
+    position: alignedPosition,
+    axis: axis,
+    align: align,
+    crossAxisShift: crossAxisShift
+  });
 
   // Clamp to viewport so the popover is never offscreen
   return {
-    top: Math.max(0, Math.min(alignedPosition.top, viewport.height - popoverHeight)),
-    left: Math.max(0, Math.min(alignedPosition.left, viewport.width - popoverWidth))
+    top: Math.max(0, Math.min(shiftedPosition.top, viewport.height - popoverHeight)),
+    left: Math.max(0, Math.min(shiftedPosition.left, viewport.width - popoverWidth))
   };
 }

package/dist/esm/internal/resolve-css-length-to-pixels.js

@@ -0,0 +1,47 @@
+/**
+ * Resolves a CSS length value to a pixel number using a hidden DOM probe.
+ *
+ * Used by the JS positioning fallback: consumer offsets can be numbers,
+ * `${n}px` strings, tokenised `var(--ds-space-100, 8px)` strings, `calc()`
+ * expressions, viewport units, etc. Parsing arbitrary CSS in JS is fragile
+ * (and impossible for `calc(var(...))` without a layout context), so we let
+ * the browser do the math.
+ *
+ * The probe is appended to `container` so it inherits the same containing
+ * block, font size, and custom-property scope as the popover. We use `width`
+ * because it accepts any CSS length, including negative `calc()` results
+ * (negative widths are clamped to 0 — see note below).
+ *
+ * Cost: one synchronous reflow per call. The fallback only resolves on
+ * placement/offset changes, not on every scroll/resize update, so this is
+ * not a hot path.
+ */
+export function resolveCssLengthToPixels(_ref) {
+  var value = _ref.value,
+    container = _ref.container;
+  if (typeof value === 'number') {
+    return value;
+  }
+
+  // Fast path: bare `${n}px` strings come from the consumer normalisation
+  // in `getPlacement`. Avoid a reflow when we can.
+  var pxMatch = value.match(/^(-?\d+(?:\.\d+)?)px$/);
+  if (pxMatch) {
+    return Number(pxMatch[1]);
+  }
+  var probe = container.ownerDocument.createElement('div');
+  probe.style.position = 'absolute';
+  probe.style.visibility = 'hidden';
+  probe.style.pointerEvents = 'none';
+  probe.style.height = '0';
+  probe.style.padding = '0';
+  probe.style.border = '0';
+  // `width` clamps negatives to 0; use `margin-left` instead so signs are
+  // preserved. `getComputedStyle` returns the resolved pixel value for
+  // margin-* properties even when the source was a token / calc / var.
+  probe.style.marginLeft = value;
+  container.appendChild(probe);
+  var resolved = parseFloat(getComputedStyle(probe).marginLeft);
+  container.removeChild(probe);
+  return Number.isFinite(resolved) ? resolved : 0;
+}

package/dist/esm/internal/resolve-css-length.js

@@ -0,0 +1,12 @@
+/**
+ * Normalizes an offset to a CSS length string. Numbers become `${n}px`;
+ * strings pass through. Apply at the API boundary so internal code only
+ * deals with strings.
+ */
+export function toCssLengthString(_ref) {
+  var value = _ref.value;
+  if (typeof value === 'number') {
+    return "".concat(value, "px");
+  }
+  return value;
+}

package/dist/esm/internal/resolve-placement.js

@@ -1,18 +1,60 @@
+import { toCssLengthString } from './resolve-css-length';
+
+/**
+ * Default gap between trigger and popover. Resolves to a design
+ * token (`space.100`) so the value follows the design system's spacing
+ * scale. Used when `placement.offset.gap` is not provided.
+ */
+var DEFAULT_GAP = "var(--ds-space-100, 8px)";
+
+/**
+ * Cross-axis shift. `value` is a CSS length string (consumer numbers are
+ * normalized to `${n}px`). `direction` is `'forwards'` (toward end) or
+ * `'backwards'` (toward start).
+ */
+
+/**
+ * Fully-resolved placement (internal). Use `getPlacement` for partial input.
+ * `offset.gap` and `offset.crossAxisShift.value` are always CSS
+ * length strings.
+ */
+
 /**
- * Fully-resolved placement (internal). All fields are required.
- * Use getPlacement({ placement: partial }) to obtain from partial input.
+ * Partial placement options. `offset.gap` and
+ * `offset.crossAxisShift.value` accept either a number (pixels) or a
+ * CSS length string (e.g. `token('space.100')`).
+ *
+ * The two offset axes are named for clarity at the call site:
+ *   - `gap`     — distance away from the trigger along the placement axis
+ *   - `crossAxisShift`  — nudge along the trigger edge (perpendicular to the placement axis)
  */
 
 /**
- * Resolves a partial placement to its fully-specified form.
- * Defaults: `axis: 'block'`, `edge: 'end'`, `align: 'center'`.
+ * Resolves a partial placement to its fully-specified form. Number offsets
+ * are normalized to `${n}px` strings.
+ *
+ * Defaults: `axis: 'block'`, `edge: 'end'`, `align: 'center'`,
+ * `offset.gap: token('space.100', '8px')`,
+ * `offset.crossAxisShift: { value: '0px', direction: 'forwards' }`.
  */
 export function getPlacement(_ref) {
-  var _placement$axis, _placement$edge, _placement$align;
+  var _placement$offset, _placement$axis, _placement$edge, _placement$align, _placement$offset$cro, _placement$offset2, _placement$offset$cro2, _placement$offset3;
   var placement = _ref.placement;
+  var consumerGap = (_placement$offset = placement.offset) === null || _placement$offset === void 0 ? void 0 : _placement$offset.gap;
   return {
     axis: (_placement$axis = placement.axis) !== null && _placement$axis !== void 0 ? _placement$axis : 'block',
     edge: (_placement$edge = placement.edge) !== null && _placement$edge !== void 0 ? _placement$edge : 'end',
-    align: (_placement$align = placement.align) !== null && _placement$align !== void 0 ? _placement$align : 'center'
+    align: (_placement$align = placement.align) !== null && _placement$align !== void 0 ? _placement$align : 'center',
+    offset: {
+      gap: consumerGap === undefined ? DEFAULT_GAP : toCssLengthString({
+        value: consumerGap
+      }),
+      crossAxisShift: {
+        value: toCssLengthString({
+          value: (_placement$offset$cro = (_placement$offset2 = placement.offset) === null || _placement$offset2 === void 0 || (_placement$offset2 = _placement$offset2.crossAxisShift) === null || _placement$offset2 === void 0 ? void 0 : _placement$offset2.value) !== null && _placement$offset$cro !== void 0 ? _placement$offset$cro : 0
+        }),
+        direction: (_placement$offset$cro2 = (_placement$offset3 = placement.offset) === null || _placement$offset3 === void 0 || (_placement$offset3 = _placement$offset3.crossAxisShift) === null || _placement$offset3 === void 0 ? void 0 : _placement$offset3.direction) !== null && _placement$offset$cro2 !== void 0 ? _placement$offset$cro2 : 'forwards'
+      }
+    }
   };
 }

package/dist/esm/internal/use-anchor-positioning.js

@@ -1,9 +1,24 @@
+/**
+ * Anchor positioning for top-layer popovers. See
+ * `notes/architecture/positioning.md` for the full model.
+ *
+ * Two runtime paths: CSS Anchor Positioning (modern browsers) and a JS
+ * fallback that measures the trigger and writes `top`/`left`.
+ *
+ * Both paths honour `offset.gap` and `offset.crossAxisShift`. The
+ * CSS path passes the values through as strings; the JS fallback resolves
+ * them to pixels via a hidden DOM probe (see `resolveCssLengthToPixels`)
+ * so tokens, `calc()`, `var()`, etc all work. The JS fallback hides the
+ * popover with `opacity: 0` until the first measurement completes, so it
+ * is never painted at the wrong location.
+ */
 import { useId, useLayoutEffect } from 'react';
 import { bind } from 'bind-event-listener';
 import rafSchedule from 'raf-schd';
 import once from '@atlaskit/ds-lib/once';
 import { computeFallbackPosition } from './anchor-positioning-fallback';
 import { combine } from './combine';
+import { resolveCssLengthToPixels } from './resolve-css-length-to-pixels';
 import { getPlacement } from './resolve-placement';
 import { setStyle } from './set-style';
 export { getPlacement } from './resolve-placement';
@@ -87,6 +102,19 @@ export function placementToTryFallbacks(_ref2) {
   return ["".concat(sameEdge, " span-").concat(crossAxis, "-end"), "".concat(sameEdge, " span-").concat(crossAxis, "-start"), flipKeyword, "".concat(oppositeEdge, " span-").concat(crossAxis, "-end"), "".concat(oppositeEdge, " span-").concat(crossAxis, "-start")].join(', ');
 }
 
+/**
+ * Returns true when the popover is currently open. Wrapped because the
+ * `:popover-open` pseudo-class is not implemented in some test environments
+ * (e.g. jsdom), where `matches` throws on unknown selectors.
+ */
+function isPopoverOpen(popover) {
+  try {
+    return popover.matches(':popover-open');
+  } catch (_unused) {
+    return false;
+  }
+}
+
 /**
  * Detects whether the browser supports CSS Anchor Positioning.
  * Uses `once()` for lazy evaluation — safe for SSR and avoids hydration mismatches.
@@ -98,12 +126,6 @@ var supportsAnchorPositioning = once(function () {
   return CSS.supports('anchor-name', '--a');
 });
 
-/**
- * Default gap between the popover and its trigger (in pixels).
- * Maps to `space.100` (8px) in the design token scale.
- */
-var DEFAULT_OFFSET = 8;
-
 /**
  * Returns the CSS margin declaration that creates a gap between the
  * popover and its trigger on the side facing the anchor.
@@ -116,7 +138,7 @@ function edgeMargin(_ref3) {
     offset = _ref3.offset;
   var axis = placement.axis,
     edge = placement.edge;
-  var value = "".concat(offset, "px");
+  var value = offset;
   if (axis === 'block' && edge === 'end') {
     return {
       property: 'margin-block-start',
@@ -147,6 +169,33 @@ function edgeMargin(_ref3) {
   };
 }
 
+/**
+ * Cross-axis shift margin. Margin side matches the popover's anchored
+ * cross-axis edge: `align: 'start'` uses the START margin, `align: 'end'`
+ * uses the END margin with the sign inverted (so `forwards` is always
+ * positive), `align: 'center'` uses START. Margin on the un-anchored side
+ * has no effect under CSS Anchor Positioning.
+ */
+function crossAxisShiftMargin(_ref4) {
+  var placement = _ref4.placement,
+    crossAxisShiftCssValue = _ref4.crossAxisShiftCssValue,
+    direction = _ref4.direction;
+  var axis = placement.axis,
+    align = placement.align;
+  var directionSign = direction === 'forwards' ? 1 : -1;
+  var crossAxis = axis === 'block' ? 'inline' : 'block';
+  var useEndSide = align === 'end';
+  var side = useEndSide ? 'end' : 'start';
+  var sideSign = useEndSide ? -1 : 1;
+  var finalSign = directionSign * sideSign;
+  // Wrap any string in calc() with the sign factor. CSS handles the math.
+  var value = finalSign === 1 ? crossAxisShiftCssValue : "calc(-1 * ".concat(crossAxisShiftCssValue, ")");
+  return {
+    property: "margin-".concat(crossAxis, "-").concat(side),
+    value: value
+  };
+}
+
 /**
  * Hook that positions an element relative to an anchor element using
  * CSS Anchor Positioning (with a JS fallback for older browsers).
@@ -163,15 +212,13 @@ function edgeMargin(_ref3) {
  * `position: fixed` with measured coordinates, re-running on scroll (capture)
  * and resize events.
  */
-export function useAnchorPosition(_ref4) {
-  var anchorRef = _ref4.anchorRef,
-    popoverRef = _ref4.popoverRef,
-    placement = _ref4.placement,
-    _ref4$offset = _ref4.offset,
-    offset = _ref4$offset === void 0 ? DEFAULT_OFFSET : _ref4$offset,
-    _ref4$forceFallbackPo = _ref4.forceFallbackPositioning,
-    forceFallbackPositioning = _ref4$forceFallbackPo === void 0 ? false : _ref4$forceFallbackPo,
-    arrow = _ref4.arrow;
+export function useAnchorPosition(_ref5) {
+  var anchorRef = _ref5.anchorRef,
+    popoverRef = _ref5.popoverRef,
+    placement = _ref5.placement,
+    _ref5$forceFallbackPo = _ref5.forceFallbackPositioning,
+    forceFallbackPositioning = _ref5$forceFallbackPo === void 0 ? false : _ref5$forceFallbackPo,
+    arrow = _ref5.arrow;
   var id = useId();
   var anchorName = "--anchor-".concat(id.replace(/:/g, ''));
   useLayoutEffect(function () {
@@ -183,11 +230,18 @@ export function useAnchorPosition(_ref4) {
     var resolvedPlacement = getPlacement({
       placement: placement
     });
+    var gapCssValue = resolvedPlacement.offset.gap;
+    var crossAxisShiftCssValue = resolvedPlacement.offset.crossAxisShift.value;
     var shouldForceFallback = Boolean(forceFallbackPositioning);
     if (supportsAnchorPositioning() && !shouldForceFallback) {
       var gap = edgeMargin({
         placement: resolvedPlacement,
-        offset: offset
+        offset: gapCssValue
+      });
+      var crossAxisShift = crossAxisShiftMargin({
+        placement: resolvedPlacement,
+        crossAxisShiftCssValue: crossAxisShiftCssValue,
+        direction: resolvedPlacement.offset.crossAxisShift.direction
       });
       var popoverStyles = [{
         property: 'position-anchor',
@@ -214,17 +268,62 @@ export function useAnchorPosition(_ref4) {
         property: 'inset',
         value: 'auto'
       },
-      // Gap between the popover and its trigger
+      // Main-axis gap between the popover and its trigger
       {
         property: gap.property,
         value: gap.value
+      },
+      // Cross-axis shift
+      {
+        property: crossAxisShift.property,
+        value: crossAxisShift.value
       }];
+
+      // Surface the active cross-axis shift value as a custom property so
+      // each named arrow @position-try rule can re-apply it after a flip.
+      // The four properties cover (cross-axis, side); only one is non-zero
+      // at a time.
+      popoverStyles.push({
+        property: '--ds-cross-axis-shift-margin-start',
+        value: '0px'
+      });
+      popoverStyles.push({
+        property: '--ds-cross-axis-shift-margin-end',
+        value: '0px'
+      });
+      popoverStyles.push({
+        property: '--ds-cross-axis-shift-margin-block-start',
+        value: '0px'
+      });
+      popoverStyles.push({
+        property: '--ds-cross-axis-shift-margin-block-end',
+        value: '0px'
+      });
+      var crossAxisShiftActive = crossAxisShiftMargin({
+        placement: resolvedPlacement,
+        crossAxisShiftCssValue: crossAxisShiftCssValue,
+        direction: resolvedPlacement.offset.crossAxisShift.direction
+      });
+      // Map margin property to its corresponding custom property name.
+      var customPropertyByMarginProperty = {
+        'margin-inline-start': '--ds-cross-axis-shift-margin-start',
+        'margin-inline-end': '--ds-cross-axis-shift-margin-end',
+        'margin-block-start': '--ds-cross-axis-shift-margin-block-start',
+        'margin-block-end': '--ds-cross-axis-shift-margin-block-end'
+      };
+      var crossAxisShiftCustomProperty = customPropertyByMarginProperty[crossAxisShiftActive.property];
+      if (crossAxisShiftCustomProperty) {
+        popoverStyles.push({
+          property: crossAxisShiftCustomProperty,
+          value: crossAxisShiftActive.value
+        });
+      }
       if (arrow) {
         // Set the arrow size variable used by the injected arrow CSS
         // and the @position-try rules for margin values.
         popoverStyles.push({
           property: '--ds-arrow-size',
-          value: "".concat(offset, "px")
+          value: gapCssValue
         });
         // Mark the popover root as the arrow host. The ARROW_CSS targets
         // [data-ds-popover-arrow] to apply clip-path: inset(0) margin-box
@@ -262,6 +361,7 @@ export function useAnchorPosition(_ref4) {
       }]
     });
     function update() {
+      var _popover$parentElemen;
       if (!trigger || !popover) {
         return;
       }
@@ -270,41 +370,86 @@ export function useAnchorPosition(_ref4) {
         width: window.innerWidth,
         height: window.innerHeight
       };
+
+      // Resolve consumer-supplied CSS length strings (tokens, calc, var,
+      // px, rem, etc) to pixels. The probe is mounted next to the popover
+      // so it inherits the same custom-property scope and font size.
+      // `popover.parentElement` is guaranteed to exist for any rendered
+      // popover (the popover itself is appended somewhere in the tree),
+      // but fall back to the popover element if not for safety.
+      var probeContainer = (_popover$parentElemen = popover.parentElement) !== null && _popover$parentElemen !== void 0 ? _popover$parentElemen : popover;
+      var gapPx = resolveCssLengthToPixels({
+        value: gapCssValue,
+        container: probeContainer
+      });
+      var crossAxisShiftPx = resolveCssLengthToPixels({
+        value: crossAxisShiftCssValue,
+        container: probeContainer
+      });
       var _computeFallbackPosit = computeFallbackPosition({
           triggerRect: triggerRect,
           popoverEl: popover,
           placement: resolvedPlacement,
           viewport: viewport,
-          offset: offset
+          gap: gapPx,
+          crossAxisShift: {
+            value: crossAxisShiftPx,
+            direction: resolvedPlacement.offset.crossAxisShift.direction
+          }
         }),
         top = _computeFallbackPosit.top,
         left = _computeFallbackPosit.left;
       popover.style.setProperty('top', "".concat(top, "px"));
       popover.style.setProperty('left', "".concat(left, "px"));
+      // Reveal the popover only after it has been positioned.
+      // See the toggle listener below for why we hide on open.
+      popover.style.removeProperty('opacity');
     }
 
     // Throttle scroll/resize updates to one per animation frame
     var scheduledUpdate = rafSchedule(update);
-    var pendingFrame = null;
+
+    // Wait for the FIRST valid layout before measuring: the popover
+    // is `display: none` until `showPopover()`, and some browsers
+    // fire `toggle` before layout, so RAF-after-toggle is unreliable.
+    // ResizeObserver fires once the browser has real dimensions.
+    // Self-disconnects after one valid measurement; ongoing
+    // scroll/resize is handled by the window listeners below.
+    var resizeObserver = new ResizeObserver(function () {
+      if (popover.offsetWidth > 0 && popover.offsetHeight > 0) {
+        update();
+        resizeObserver.disconnect();
+      }
+    });
+
+    // If the popover is already open by the time this effect runs (for
+    // example, the parent `useAnchorPosition` effect runs after the child
+    // `Popover` effect that called `showPopover()`), the initial `toggle`
+    // event has already fired and our listener below would miss it. Start
+    // observing immediately so the first measurement still happens.
+    if (isPopoverOpen(popover)) {
+      popover.style.setProperty('opacity', '0');
+      resizeObserver.observe(popover);
+    }
     var undoPositioning = combine(cleanupBaseStyles,
-    // Position when the popover transitions to visible.
-    // The popover starts hidden (`display: none` per the popover
-    // UA stylesheet), so `offsetWidth`/`offsetHeight` are 0 until
-    // `showPopover()` is called. We defer positioning to the next
-    // animation frame because some browsers (Firefox) fire the
-    // `toggle` event synchronously during `showPopover()`, before
-    // the element has been laid out — so dimensions are still 0.
-    // Waiting one frame guarantees layout has run and measurements
-    // are accurate.
+    // On every open: hide synchronously so the user never sees
+    // the UA-default position, then re-observe for a fresh
+    // measurement. We use `opacity: 0` rather than
+    // `visibility: hidden` because Firefox skips visibility-hidden
+    // elements during `<dialog>` initial-focus traversal — see
+    // `form-in-popup.spec.tsx` on `desktop-firefox`.
     bind(popover, {
       type: 'toggle',
       listener: function listener(event) {
         var toggleEvent = event;
         if (toggleEvent.newState === 'open') {
-          pendingFrame = requestAnimationFrame(update);
+          popover.style.setProperty('opacity', '0');
+          resizeObserver.observe(popover);
         }
       }
-    }), bind(window, {
+    }), function () {
+      return resizeObserver.disconnect();
+    }, bind(window, {
       type: 'scroll',
       listener: scheduledUpdate,
       options: {
@@ -319,12 +464,10 @@ export function useAnchorPosition(_ref4) {
       }
     }), function () {
       scheduledUpdate.cancel();
-      if (pendingFrame !== null) {
-        cancelAnimationFrame(pendingFrame);
-      }
       popover.style.removeProperty('top');
       popover.style.removeProperty('left');
+      popover.style.removeProperty('opacity');
     });
     return undoPositioning;
-  }, [anchorRef, popoverRef, placement, anchorName, offset, forceFallbackPositioning, arrow]);
+  }, [anchorRef, popoverRef, placement, anchorName, forceFallbackPositioning, arrow]);
 }