@atlaskit/top-layer 4.4.5 → 5.0.1

package/dist/cjs/internal/use-anchored-popover.js

@@ -0,0 +1,277 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useAnchoredPopover = useAnchoredPopover;
+var _react = require("react");
+var _useId = require("@atlaskit/ds-lib/use-id");
+var _applyAnchorPositioning = require("./anchor-positioning/apply-anchor-positioning");
+var _anchoredPopoverSize = require("./anchored-popover-size");
+var _applyJavascriptFallbackPositioning = require("./javascript-fallback/apply-javascript-fallback-positioning");
+var _resolvePlacement = require("./resolve-placement");
+var _supportsAnchorPositioning = require("./supports-anchor-positioning");
+var _supportsAnchorSize = require("./supports-anchor-size");
+/**
+ * Positioning AND anchor-relative sizing for top-layer popovers. Anchors an
+ * ELEMENT; to anchor a viewport coordinate use `useAnchoredPopoverAtPoint`.
+ *
+ * Two runtime paths, each a function that applies its styles and returns the
+ * cleanup: CSS Anchor Positioning in `./anchor-positioning`, and the JavaScript
+ * fallback in `./javascript-fallback`. The path is resolved ONCE, at the top of
+ * the hook, and threaded through positioning, sizing and margins.
+ *
+ * See `notes/architecture/positioning.md` and
+ * `notes/decisions/fit-available-space.md`.
+ */
+
+/**
+ * Which way the popover's inline axis runs. Maps every physical measurement below
+ * onto a logical axis: the viewport unit of each cap and the anchor's measured
+ * size. A style read, not a layout read, so it is cheap enough to take for every
+ * popover.
+ */
+function getPopoverWritingMode(_ref) {
+  var popover = _ref.popover;
+  // `String()` because not every test environment implements `writing-mode`.
+  var writingMode = String(getComputedStyle(popover).writingMode);
+  var isVertical = writingMode.startsWith('vertical') || writingMode.startsWith('sideways');
+  return isVertical ? 'vertical' : 'horizontal';
+}
+
+/**
+ * Measured stand-in for `anchor-size(self-*)`, used wherever `anchor-size()` is
+ * not: the JavaScript fallback, and browsers with anchor positioning but no
+ * `anchor-size()`.
+ *
+ * `offsetWidth` / `offsetHeight` are physical, so the axis is picked from the
+ * POPOVER's `writing-mode`. Deliberately not memoized: a cached anchor size is a
+ * stale one. Runs once per effect, not per frame.
+ */
+function measureAnchorSize(_ref2) {
+  var anchor = _ref2.anchor,
+    writingMode = _ref2.writingMode;
+  if (writingMode === 'vertical') {
+    return {
+      inline: "".concat(anchor.offsetHeight, "px"),
+      block: "".concat(anchor.offsetWidth, "px")
+    };
+  }
+  return {
+    inline: "".concat(anchor.offsetWidth, "px"),
+    block: "".concat(anchor.offsetHeight, "px")
+  };
+}
+var NO_ANCHOR_SIZE = {
+  inline: null,
+  block: null
+};
+var CSS_ANCHOR_SIZE = {
+  inline: 'anchor-size(self-inline)',
+  block: 'anchor-size(self-block)'
+};
+function isAnchorRelative(size) {
+  return size === 'match-anchor' || size === 'min-anchor';
+}
+
+/**
+ * The `anchor-name` written to an anchor that does not already carry one, as a CSS
+ * `<dashed-ident>`. `useId()` is the same source as every other id in the design
+ * system, including the popover's own `id` that `aria-controls` and `popovertarget`
+ * point at, so it is unique exactly where those are and collides exactly where
+ * they do. See `useAnchoredPopover` for the one case that needs the host's help.
+ *
+ * `@atlaskit/ds-lib`'s `useId` already swaps React's `:` and `«»` for `_`. The
+ * replace covers a host `identifierPrefix`, which may carry characters a
+ * `<dashed-ident>` cannot.
+ */
+function useNewAnchorName() {
+  var id = (0, _useId.useId)();
+  return (0, _react.useMemo)(function () {
+    return "--anchor-".concat(id.replace(/[^A-Za-z0-9_-]/g, '_'));
+  }, [id]);
+}
+
+/**
+ * A referentially-stable, fully-resolved `TPlacement`, so a fresh inline
+ * `placement` object does not re-run the effect.
+ */
+function useStablePlacement(placement) {
+  var resolved = (0, _resolvePlacement.resolvePlacement)({
+    placement: placement
+  });
+  var axis = resolved.axis;
+  var edge = resolved.edge;
+  var align = resolved.align;
+  var minSize = resolved.minSize;
+  var gap = resolved.offset.gap;
+  var shiftValue = resolved.offset.crossAxisShift.value;
+  var shiftDirection = resolved.offset.crossAxisShift.direction;
+  // Rebuilt from primitive deps, so the factory does not close over `resolved`
+  // and exhaustive-deps can verify it.
+  return (0, _react.useMemo)(function () {
+    return {
+      axis: axis,
+      edge: edge,
+      align: align,
+      minSize: minSize,
+      offset: {
+        gap: gap,
+        crossAxisShift: {
+          value: shiftValue,
+          direction: shiftDirection
+        }
+      }
+    };
+  }, [axis, edge, align, minSize, gap, shiftValue, shiftDirection]);
+}
+
+/**
+ * Exported so `useAnchoredPopoverAtPoint` can forward the options it does not own.
+ */
+
+/**
+ * Positions and sizes a popover relative to an anchor. Owns every inline style on
+ * the popover host: where it goes, how big it is relative to its anchor, and the
+ * margins that keep it clear of the anchor and the viewport edge. It knows nothing
+ * about visibility or animation - compose it with `Popover`.
+ *
+ * On modern browsers the browser handles flipping via CSS Anchor Positioning;
+ * otherwise it falls back to measured `position: fixed` coordinates, re-run on
+ * scroll and resize.
+ *
+ * `inlineSize` and `blockSize` both default to `'content'`. Two rules are
+ * surprising: fitting one axis also fits an axis left on `'content'`, and fitting
+ * either axis floors the placement axis. See `TPopoverAxisSize`.
+ *
+ * **Several React roots on one page.** The `anchor-name` this hook writes to an
+ * anchor that has none is minted from `useId()`, like every other id in the design
+ * system. `useId()` is unique within a root; across roots it is unique for
+ * client-rendered roots but NOT for roots that hydrate the same markup, where it
+ * is derived from tree position. Two anchors carrying one name resolve to the last
+ * in tree order, so a popover can attach to another root's trigger. A host that
+ * hydrates more than one root must give each a distinct `identifierPrefix` (on
+ * `hydrateRoot` and the matching server render). That is already required for the
+ * popover's own `id`, which `aria-controls` and `popovertarget` point at, and for
+ * every `aria-*` id the design system mints. A bundle with two copies of
+ * `react-dom` has the same exposure for client-rendered roots.
+ *
+ * @example Position a popover below its trigger
+ * ```tsx
+ * const triggerRef = useRef<HTMLButtonElement>(null);
+ * const popoverRef = useRef<HTMLDivElement>(null);
+ *
+ * useAnchoredPopover({
+ *   anchorRef: triggerRef,
+ *   popoverRef,
+ *   placement: { axis: 'block', edge: 'end' },
+ *   isOpen,
+ * });
+ * ```
+ *
+ * @example Match the trigger's width and keep the popover on screen
+ * ```tsx
+ * // What `<Popup shouldFitContainer shouldFitViewport>` maps to.
+ * useAnchoredPopover({
+ *   anchorRef: triggerRef,
+ *   popoverRef,
+ *   placement: { axis: 'block', edge: 'end' },
+ *   isOpen,
+ *   inlineSize: 'match-anchor',
+ *   blockSize: 'max-available',
+ * });
+ * ```
+ *
+ * @example Switch to a cursor position mid-mount
+ * ```tsx
+ * // Complementary `isEnabled`, so exactly one hook owns the popover.
+ * const shared = { popoverRef, placement, isOpen };
+ *
+ * useAnchoredPopover({ ...shared, anchorRef: triggerRef, isEnabled: !mousePos });
+ * useAnchoredPopoverAtPoint({
+ *   ...shared,
+ *   isEnabled: Boolean(mousePos),
+ *   getPoint: () => mousePosRef.current,
+ * });
+ * ```
+ */
+function useAnchoredPopover(_ref3) {
+  var anchorRef = _ref3.anchorRef,
+    popoverRef = _ref3.popoverRef,
+    placement = _ref3.placement,
+    isOpen = _ref3.isOpen,
+    _ref3$isEnabled = _ref3.isEnabled,
+    isEnabled = _ref3$isEnabled === void 0 ? true : _ref3$isEnabled,
+    _ref3$inlineSize = _ref3.inlineSize,
+    inlineSize = _ref3$inlineSize === void 0 ? 'content' : _ref3$inlineSize,
+    _ref3$blockSize = _ref3.blockSize,
+    blockSize = _ref3$blockSize === void 0 ? 'content' : _ref3$blockSize,
+    _ref3$shouldPreserveI = _ref3.shouldPreserveInlineSize,
+    shouldPreserveInlineSize = _ref3$shouldPreserveI === void 0 ? false : _ref3$shouldPreserveI,
+    _ref3$forceFallbackPo = _ref3.forceFallbackPositioning,
+    forceFallbackPositioning = _ref3$forceFallbackPo === void 0 ? false : _ref3$forceFallbackPo;
+  // Stable for the life of the hook instance, so it follows a replacement anchor
+  // element (the point hook remounts its `<div>`).
+  var fallbackAnchorName = useNewAnchorName();
+  var stablePlacement = useStablePlacement(placement);
+  (0, _react.useLayoutEffect)(function () {
+    if (!isEnabled) {
+      return;
+    }
+
+    // Resolved once, so positioning, sizing and margins cannot disagree about it.
+    var isUsingCssAnchorPositioning = (0, _supportsAnchorPositioning.supportsAnchorPositioning)() && !forceFallbackPositioning;
+
+    // BOTH probes: a browser can have positioning without sizing, and
+    // `anchor-size()` needs the `position-anchor` only the CSS path writes.
+    var canUseAnchorSize = isUsingCssAnchorPositioning && (0, _supportsAnchorSize.supportsAnchorSize)();
+    var trigger = anchorRef.current;
+    var popover = popoverRef.current;
+    if (!trigger || !popover) {
+      return;
+    }
+
+    // Fitting also reserves padding from the viewport edge as a margin.
+    var isFitting = inlineSize === 'max-available' || blockSize === 'max-available';
+
+    // Always read: the viewport caps are always written, and their unit follows
+    // the popover's writing mode.
+    var writingMode = getPopoverWritingMode({
+      popover: popover
+    });
+
+    // Skipped where possible, so a position-only consumer pays no layout read.
+    // Fitting on the CSS path needs it to clamp the default flip floor; see
+    // `getDefaultPlacementAxisFloor`.
+    var needsAnchorSize = isAnchorRelative(inlineSize) || isAnchorRelative(blockSize) || isFitting && isUsingCssAnchorPositioning;
+    var anchorSize = needsAnchorSize ? canUseAnchorSize ? CSS_ANCHOR_SIZE : measureAnchorSize({
+      anchor: trigger,
+      writingMode: writingMode
+    }) : NO_ANCHOR_SIZE;
+    var sizeStyles = (0, _anchoredPopoverSize.getAnchoredPopoverSizeDeclarations)({
+      placement: stablePlacement,
+      inlineSize: inlineSize,
+      blockSize: blockSize,
+      isUsingCssAnchorPositioning: isUsingCssAnchorPositioning,
+      anchorSize: anchorSize,
+      writingMode: writingMode,
+      shouldPreserveInlineSize: shouldPreserveInlineSize
+    });
+    if (isUsingCssAnchorPositioning) {
+      return (0, _applyAnchorPositioning.applyAnchorPositioning)({
+        anchor: trigger,
+        popover: popover,
+        placement: stablePlacement,
+        sizeStyles: sizeStyles,
+        isFitting: isFitting,
+        fallbackAnchorName: fallbackAnchorName
+      });
+    }
+    return (0, _applyJavascriptFallbackPositioning.applyJavaScriptFallbackPositioning)({
+      anchor: trigger,
+      popover: popover,
+      placement: stablePlacement,
+      sizeStyles: sizeStyles
+    });
+  }, [isEnabled, anchorRef, popoverRef, stablePlacement, inlineSize, blockSize, shouldPreserveInlineSize, fallbackAnchorName, forceFallbackPositioning, isOpen]);
+}

package/dist/cjs/internal/use-animated-visibility.js

@@ -8,6 +8,7 @@ exports.useAnimatedVisibility = useAnimatedVisibility;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
+var _isNativeElementOpen = require("./is-native-element-open");
 var _reducedMotion = require("./reduced-motion");
 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) { (0, _defineProperty2.default)(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; }
@@ -45,19 +46,6 @@ function runOnAnimationsSettled(_ref2) {
     }
   });
 }
-function isNativeElementOpen(_ref3) {
-  var element = _ref3.element;
-  if (element instanceof HTMLDialogElement) {
-    return element.open;
-  }
-
-  // Some DOM implementations throw for unsupported pseudo-classes.
-  try {
-    return element.matches(':popover-open');
-  } catch (_unused) {
-    return false;
-  }
-}
 
 /**
  * Visibility lifecycle phase shared between `useAnimatedVisibility`,
@@ -86,9 +74,9 @@ function isNativeElementOpen(_ref3) {
  * ```
  */
 
-function getInitialVisibilityState(_ref4) {
-  var isOpen = _ref4.isOpen,
-    willAnimate = _ref4.willAnimate;
+function getInitialVisibilityState(_ref3) {
+  var isOpen = _ref3.isOpen,
+    willAnimate = _ref3.willAnimate;
   if (!isOpen) {
     return {
       phase: 'closed',
@@ -184,12 +172,12 @@ function getNextVisibilityState(state, action) {
  * phase:   open ──────────────── exiting ─── (exit settle) ─── closed
  * ```
  */
-function useAnimatedVisibility(_ref5) {
-  var isOpen = _ref5.isOpen,
-    shouldAnimate = _ref5.shouldAnimate,
-    elementRef = _ref5.elementRef,
-    onEnterFinish = _ref5.onEnterFinish,
-    onExitFinish = _ref5.onExitFinish;
+function useAnimatedVisibility(_ref4) {
+  var isOpen = _ref4.isOpen,
+    shouldAnimate = _ref4.shouldAnimate,
+    elementRef = _ref4.elementRef,
+    onEnterFinish = _ref4.onEnterFinish,
+    onExitFinish = _ref4.onExitFinish;
   var willAnimate = shouldAnimate && !(0, _reducedMotion.prefersReducedMotion)();
   var _useReducer = (0, _react.useReducer)(getNextVisibilityState, {
       isOpen: isOpen,
@@ -274,7 +262,7 @@ function useAnimatedVisibility(_ref5) {
         queueMicrotask(function () {
           // A controlled close can be interrupted by isOpen changing back to true,
           // which reopens the element before this microtask runs.
-          if (isNativeElementOpen({
+          if ((0, _isNativeElementOpen.isNativeElementOpen)({
             element: element
           })) {
             return;

package/dist/cjs/popover/popover.compiled.css

@@ -22,6 +22,10 @@
 ._n3tdidpf{padding-bottom:0}
 ._o5724jg8{white-space:normal}
 ._otyridpf{margin-bottom:0}
+._p6861txw:popover-open{display:flex}
 ._u5f3idpf{padding-right:0}
 ._y3gnv2br{text-align:start}
+:where(._1yp3idpf)>*{min-inline-size:0}
+:where(._51hckb7n)>*{flex-grow:1}
+:where(._f5r5idpf)>*{min-block-size:0}
 @media (prefers-reduced-motion:reduce){._bl8aglyw{animation-name:none}._156y147i{transition-duration:var(--ds-duration-instant,0ms)}}

package/dist/cjs/popover/popover.js

@@ -15,8 +15,8 @@ var _bindEventListener = require("bind-event-listener");
 var _mergeRefs = _interopRequireDefault(require("@atlaskit/ds-lib/merge-refs"));
 var _once = _interopRequireDefault(require("@atlaskit/ds-lib/once"));
 var _useNotifyOpenLayerObserver = require("@atlaskit/layering/use-notify-open-layer-observer");
+var _isNativeElementOpen = require("../internal/is-native-element-open");
 var _resolvePlacement2 = require("../internal/resolve-placement");
-var _shouldFocusIntoPopover = require("../internal/should-focus-into-popover");
 var _useAnimatedVisibility = require("../internal/use-animated-visibility");
 var _useFocusWrap = require("../internal/use-focus-wrap");
 var _useInitialFocus = require("../internal/use-initial-focus");
@@ -42,15 +42,22 @@ var supportsPopoverHint = (0, _once.default)(function () {
 // avoided this by rendering at `<body>`). Excludes `color`/`font` (theming) and
 // `direction`/`unicode-bidi` (RTL must inherit).
 //
+// Not `all: initial`: the target is what `<body>` gave the portal path, not the
+// spec initial values (UA serif, black, `color-scheme: normal`), and as an author
+// declaration it would also override the UA `[popover]` rules (`position: fixed`,
+// `display: none` when closed).
+//
 // KEEP IN SYNC with the identical `surfaceResetStyles` in `dialog/dialog-content.tsx`.
 // ADS forbids sharing styles across files (`no-exported-styles` /
 // `no-imported-style-values` — Compiled styles are null at runtime), so the reset is
-// co-located and duplicated deliberately.
+// co-located and duplicated deliberately. The `satisfies` check below fails the
+// build if either copy drifts.
 var surfaceResetStyles = {
   root: "_lcxv1wug _o5724jg8 _1nmz4jg8 _1i4q4jg8 _y3gnv2br _azhwidpf _1p1dglyw"
 };
+true;
 var styles = {
-  root: "_19itglyw _ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _19pkidpf _2hwxidpf _otyridpf _18u0idpf _1r041wug _1reoewfl _18m9ewfl _bfhk1j28 _4t3i1wug",
+  root: "_19itglyw _ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _19pkidpf _2hwxidpf _otyridpf _18u0idpf _1r041wug _1reoewfl _18m9ewfl _bfhk1j28 _4t3i1wug _p6861txw _51hckb7n _1yp3idpf _f5r5idpf",
   motion: "_k8m011k7 _1oecdn4k _1s9z1a5r _1o511hrf _bl8aglyw _156y147i",
   enter: "_y44v179n",
   exit: "_y44vof1f"
@@ -88,7 +95,7 @@ var POPUP_ROLES = new Set(['menu', 'listbox', 'dialog', 'alertdialog', 'tree', '
 
 /**
  * Unopinionated top-layer primitive. Owns visibility and animation only;
- * compose with `useAnchorPosition` / `useWidthFromAnchor` for positioning.
+ * compose with `useAnchoredPopover` for positioning and sizing.
  *
  * ### 🔌 Visibility
  *
@@ -140,14 +147,12 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
   // `useId()` colons are invalid in CSS selectors and popover target attributes.
   var popoverId = idProp !== null && idProp !== void 0 ? idProp : "popover-".concat(autoId.replace(/:/g, ''));
 
-  // Keep semantic callbacks current without rebinding native lifecycle
+  // Keep the semantic callback current without rebinding native lifecycle
   // listeners during the same commit that calls showPopover()/hidePopover().
   var onCloseRef = (0, _react.useRef)(onClose);
-  var roleRef = (0, _react.useRef)(role);
   (0, _react.useLayoutEffect)(function () {
     onCloseRef.current = onClose;
-    roleRef.current = role;
-  }, [onClose, role]);
+  }, [onClose]);
 
   // Register with open layer observer so `closeLayers()` and open-count
   // subscriptions work. Only popup-like roles register as `popup`; passive
@@ -181,65 +186,60 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
     return popupMotionStyles[axis][edge];
   }, [placement, shouldAnimate]);
 
-  // Prevents toggle handler from calling onClose for our own hidePopover() calls.
-  var programmaticCloseRef = (0, _react.useRef)(false);
-
-  // Set in capture-phase keydown so the toggle handler knows close reason.
+  // Tracks the close reason, including our own hidePopover() calls.
   var closeReasonRef = (0, _react.useRef)('light-dismiss');
 
   // Snapshot of pre-open focus, used to restore focus for nested popovers
-  // with focus-capturing roles (browser only restores the outermost).
-  var previouslyFocusedElementRef = (0, _react.useRef)(null);
+  // because the browser only restores the outermost.
+  var focusRestorationTargetRef = (0, _react.useRef)(null);
   var handleBeforeToggle = (0, _react.useCallback)(function (event) {
-    if (event.newState !== 'open') {
+    var popover = event.currentTarget;
+    if (!(popover instanceof HTMLElement)) {
       return;
     }
-    // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- need active element snapshot
-    var active = document.activeElement;
-    previouslyFocusedElementRef.current = active instanceof HTMLElement ? active : null;
-  }, []);
-  var restorePreviouslyFocusedElement = (0, _react.useCallback)(function () {
-    var previouslyFocused = previouslyFocusedElementRef.current;
-    previouslyFocusedElementRef.current = null;
-    if (previouslyFocused !== null && previouslyFocused.isConnected && (0, _shouldFocusIntoPopover.shouldFocusIntoPopover)({
-      role: roleRef.current
-    })) {
-      previouslyFocused.focus({
-        preventScroll: true
-      });
+    var ownerDocument = popover.ownerDocument;
+    var activeElement = ownerDocument.activeElement;
+    if (event.newState === 'open') {
+      focusRestorationTargetRef.current = activeElement instanceof HTMLElement ? activeElement : null;
+      return;
+    }
+
+    // Check before closing so focus already on body is not mistaken for focus lost during close.
+    if (closeReasonRef.current === 'light-dismiss' || !popover.contains(activeElement)) {
+      focusRestorationTargetRef.current = null;
     }
   }, []);
-  var handleToggleClosed = (0, _react.useCallback)(function (_event) {
-    var _onCloseRef$current2;
-    // Nested-popover focus restoration fallback (browser only
-    // restores outermost; Firefox skips nested entirely).
-    // Restore only when the role moved focus in on open AND the
-    // close was Escape/programmatic. For light dismiss, the
-    // click target keeps focus per HTML spec
-    // (`focusPreviousElement=false`).
-    var reason = closeReasonRef.current;
-    var isProgrammatic = programmaticCloseRef.current;
-    if (reason === 'escape' || isProgrammatic) {
-      restorePreviouslyFocusedElement();
-    } else {
-      previouslyFocusedElementRef.current = null;
+  var handleToggleClosed = (0, _react.useCallback)(function (event) {
+    var popover = event.currentTarget;
+    if (!(popover instanceof HTMLElement)) {
+      return;
     }
-
+    var focusRestorationTarget = focusRestorationTargetRef.current;
+    focusRestorationTargetRef.current = null;
+    var reason = closeReasonRef.current;
     // Reset reason so a stale 'escape' from a race with Escape keydown
     // does not corrupt the next browser-dismiss cycle.
     closeReasonRef.current = 'light-dismiss';
-
-    // Programmatic close: consumer already knows.
-    if (isProgrammatic) {
-      return;
+    if (focusRestorationTarget) {
+      var ownerDocument = popover.ownerDocument;
+      // Native restoration has finished. Preserve focus moved outside the popover.
+      var activeElementAfterClose = ownerDocument.activeElement;
+      if (activeElementAfterClose === ownerDocument.body || popover.contains(activeElementAfterClose)) {
+        // Match native popover restoration, which does not scroll the viewport.
+        focusRestorationTarget.focus({
+          preventScroll: true
+        });
+      }
     }
 
-    // Browser dismiss (Escape/click-outside).
-    // Optional: `manual` mode has no `onClose` in the forwarded type.
-    (_onCloseRef$current2 = onCloseRef.current) === null || _onCloseRef$current2 === void 0 || _onCloseRef$current2.call(onCloseRef, {
-      reason: reason
-    });
-  }, [restorePreviouslyFocusedElement]);
+    // Programmatic closes are already known to the consumer.
+    if (reason !== 'programmatic') {
+      var _onCloseRef$current2;
+      (_onCloseRef$current2 = onCloseRef.current) === null || _onCloseRef$current2 === void 0 || _onCloseRef$current2.call(onCloseRef, {
+        reason: reason
+      });
+    }
+  }, []);
   var _useAnimatedVisibilit = (0, _useAnimatedVisibility.useAnimatedVisibility)({
       isOpen: isOpen,
       shouldAnimate: shouldAnimate,
@@ -254,9 +254,9 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
 
   // Focus management: initial focus on entry (role-dependent), Tab cycling
   // for dialog roles. Restoration is native for outermost popovers; nested
-  // focus-capturing roles are handled above via the `beforetoggle` snapshot.
+  // popovers are handled above via the `beforetoggle` snapshot.
   // Passing `phase` keeps `useFocusWrap` attached through the animated-exit
-  // window (WCAG 2.4.3 guard). See notes/architecture/focus-restoration.md.
+  // window (WCAG 2.4.3 guard). See notes/architecture/focus.md.
   (0, _useFocusWrap.useFocusWrap)({
     elementRef: ownRef,
     role: role,
@@ -271,7 +271,7 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
   // Bind via `useLayoutEffect`, and BEFORE the show/hide layout effect
   // below, so listeners are attached when `showPopover()` synchronously
   // dispatches `beforetoggle`. A regular `useEffect` would miss that
-  // first dispatch, dropping the `previouslyFocusedElementRef` snapshot
+  // first dispatch, dropping the `focusRestorationTargetRef` snapshot
   // and breaking nested-popover focus restoration on close. React runs
   // layout effects in source order on the same commit.
   (0, _react.useLayoutEffect)(function () {
@@ -284,7 +284,10 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
     var unbindEscape = (0, _bindEventListener.bind)(element, {
       type: 'keydown',
       listener: function listener(event) {
-        if (event.key === 'Escape') {
+        // Ignore Escape events dispatched after native close.
+        if (event.key === 'Escape' && (0, _isNativeElementOpen.isNativeElementOpen)({
+          element: element
+        })) {
           closeReasonRef.current = 'escape';
         }
       },
@@ -301,7 +304,7 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
         onToggle(event);
       }
     });
-    // Snapshot `document.activeElement` before `useInitialFocus` moves it,
+    // Snapshot the active element before `useInitialFocus` moves it,
     // then advance the shared visibility lifecycle.
     var unbindBeforeToggle = (0, _bindEventListener.bind)(element, {
       type: 'beforetoggle',
@@ -326,7 +329,6 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
       return;
     }
     if (isOpen) {
-      programmaticCloseRef.current = false;
       // Clear stale 'escape' from a prior cycle: the ref outlives
       // the host element, and interrupted close lifecycles may not reach
       // `handleToggleClosed` to reset it.
@@ -335,13 +337,13 @@ var Popover = exports.Popover = /*#__PURE__*/(0, _react.forwardRef)(function Pop
         element.showPopover();
       } catch (_unused) {}
       return function () {
-        programmaticCloseRef.current = true;
+        closeReasonRef.current = 'programmatic';
         try {
           element.hidePopover();
         } catch (_unused2) {}
       };
     }
-    programmaticCloseRef.current = true;
+    closeReasonRef.current = 'programmatic';
     try {
       element.hidePopover();
     } catch (_unused3) {}

package/dist/cjs/testing/polyfill.js

@@ -16,9 +16,9 @@ var _bindEventListener = require("bind-event-listener");
  *  - Popover open state tracked via `data-popover-open` (no `:popover-open` in jsdom).
  *  - Auto popovers: maintain an open stack, perform light-dismiss on document mousedown
  *    outside the open chain, and dismiss the topmost on Escape.
- *  - On open, removes any inline `opacity: 0` from the popover element so callers that
- *    rely on a `ResizeObserver` reveal callback (e.g. `use-anchor-position`) become
- *    visible in jsdom, where layout-driven RO callbacks never fire.
+ *  - On open, removes any inline `opacity: 0` from the popover element, so the
+ *    JavaScript positioning fallback's `ResizeObserver` reveal is not needed in
+ *    jsdom, where its non-zero-layout guard can never pass.
  *
  * Companion `toBeVisible` patch lives at `./to-be-visible`.
  *
@@ -249,10 +249,9 @@ function stackForMode(_ref9) {
   return null;
 }
 
-// Polyfill-only. Real browsers reveal the popover once `ResizeObserver`
-// callbacks fire after the first layout pass. jsdom has no layout, so we clear
-// any inline `opacity: 0` (set by callers like `use-anchor-position`) once
-// the open toggle has fired.
+// Polyfill-only. Real browsers reveal the popover on the first non-zero layout
+// their `ResizeObserver` reports; jsdom always reports 0, so that guard never
+// passes and the inline `opacity: 0` is cleared on the open toggle instead.
 function clearOpacityOnOpenToggle(_ref0) {
   var element = _ref0.element;
   var unbind = (0, _bindEventListener.bind)(element, {

package/dist/es2019/dialog/dialog-content.js

@@ -19,9 +19,11 @@ import { useSafariEscapeFix } from '../internal/use-safari-escape-fix';
 //
 // KEEP IN SYNC with the identical `surfaceResetStyles` in `popover/popover.tsx`
 // (ADS forbids sharing styles across files, so it is co-located and duplicated).
+// The `satisfies` check below fails the build if either copy drifts.
 const surfaceResetStyles = {
   root: "_lcxv1wug _o5724jg8 _1nmz4jg8 _1i4q4jg8 _y3gnv2br _azhwidpf _1p1dglyw"
 };
+true;
 const dialogStyles = {
   root: "_19itglyw _19pk1wug _2hwx1wug _otyr1wug _18u01wug _1q51ze3t _y4tize3t _85i5ze3t _bozgze3t _p12fglyw _c71lglyw _bfhk1j28",
   motion: "_k8m011k7 _1oeci9qs _1s9z1a5r _1o511hrf _bl8aglyw _156y147i",

package/dist/es2019/entry-points/use-popover-id.js

@@ -1,17 +1,13 @@
 import { useId } from '@atlaskit/ds-lib/use-id';
+
 /**
- * Returns a stable HTML `id` used to wire a trigger element to its popover
- * via ARIA (`aria-controls`) and the Popover API (`popovertarget`).
+ * A stable `id` for wiring a trigger to its popover: the popover's `id`, and the
+ * trigger's matching `aria-controls` / `popovertarget`.
  *
- * The returned value is intended for the `id` attribute on the popover and
- * for the matching `aria-controls` / `popovertarget` references on the
- * trigger. It is NOT a CSS `anchor-name` value: CSS anchor positioning is
- * handled internally by `useAnchorPosition`, which mints and applies its
- * own `anchor-name` on the trigger element.
+ * NOT a CSS `anchor-name` - `useAnchoredPopover` mints and writes its own.
  */
 export function usePopoverId() {
-  // `@atlaskit/ds-lib/use-id` already strips characters that React's
-  // `useId` produces (`:`, `«`, `»`) which are invalid in HTML ID
-  // tokens. The `popover-` prefix is purely for DOM debug clarity.
+  // `@atlaskit/ds-lib/use-id`, not React's `useId`: React's output contains
+  // `:`, `«` and `»`, which are invalid in an HTML id token.
   return `popover-${useId()}`;
 }