@atlaskit/top-layer 3.2.0 → 4.1.0

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

@@ -1,9 +1,9 @@
 /* dialog-content.tsx generated by @compiled/babel-plugin v2.0.0 */
 import "./dialog-content.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { forwardRef, useCallback, useEffect, useId, useLayoutEffect, useRef } from 'react';
+import React, { forwardRef, useCallback, useId, useLayoutEffect, useRef } from 'react';
 import { cx } from '@compiled/react';
-import { bind } from 'bind-event-listener';
+import { bindAll } from 'bind-event-listener';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import noop from '@atlaskit/ds-lib/noop';
 import { useNotifyOpenLayerObserver } from '@atlaskit/layering/use-notify-open-layer-observer';
@@ -45,8 +45,8 @@ const backdropStyles = {
  *
  * Handles native `cancel` event (Escape) and backdrop click detection.
  *
- * Close flow: we never call `dialog.close()` from event handlers. We always call
- * `onClose`; the consumer decides whether to set `isOpen={false}`.
+ * Close flow: allowed user dismissal closes the native dialog before `onClose`
+ * notifies the consumer. The consumer must synchronize `isOpen` in response.
  *
  * Accessibility: render at least one focusable element (typically a close
  * button) when `isOpen` becomes `true`. Tab is always trapped inside the
@@ -56,6 +56,7 @@ export const Dialog = /*#__PURE__*/forwardRef(function Dialog({
   children,
   isOpen,
   onClose,
+  dismissedBy = 'escape-and-outside-click',
   onEnterFinish,
   onExitFinish,
   shouldAnimate = false,
@@ -73,8 +74,10 @@ export const Dialog = /*#__PURE__*/forwardRef(function Dialog({
   const dialogId = providedId !== null && providedId !== void 0 ? providedId : generatedId;
   const ownRef = useRef(null);
   const combinedRef = mergeRefs([ownRef, ref]);
+  const closeReasonRef = useRef(null);
   const {
-    phase
+    phase,
+    onToggle
   } = useAnimatedVisibility({
     isOpen,
     animationKind: 'dialog',
@@ -113,6 +116,7 @@ export const Dialog = /*#__PURE__*/forwardRef(function Dialog({
       return;
     }
     if (isOpen) {
+      closeReasonRef.current = null;
       if (!dialog.open) {
         dialog.showModal();
       }
@@ -146,45 +150,67 @@ export const Dialog = /*#__PURE__*/forwardRef(function Dialog({
     if (event.target !== event.currentTarget) {
       return;
     }
-    event.preventDefault();
+
     // Spurious Safari `cancel`: the keydown snapshot saw an open child
     // popover, so this Escape belongs to that popover (light-dismissed
     // natively). Keep the dialog open instead of forwarding to `onClose`.
     if (shouldIgnoreEscape()) {
+      event.preventDefault();
+      return;
+    }
+
+    // Without native `closedby`, cancel Escape only when dismissal is disabled.
+    // Allowed dismissal follows Popover behavior: the browser closes the element
+    // and `onClose` notifies the controlled owner of the reason.
+    if (dismissedBy === 'none') {
+      event.preventDefault();
       return;
     }
-    onClose({
-      reason: 'escape'
-    });
-  }, [onClose, shouldIgnoreEscape]);
+    closeReasonRef.current = 'escape';
+  }, [dismissedBy, shouldIgnoreEscape]);
 
-  // Handle backdrop click
+  // Handle backdrop interaction
   // Attached via bind-event-listener rather than a React prop so we avoid
   // a11y lint suppressions on the <dialog> element.
-  // Keyboard dismiss is already handled natively (Escape → onCancel above).
+  // The click listener provides light dismiss consistently across browsers.
   // `isVisible` is in deps so the listener re-binds to the new <dialog>
   // element after a host unmount / remount cycle.
-  useEffect(() => {
+  useLayoutEffect(() => {
     const dialog = ownRef.current;
     if (!dialog) {
       return;
     }
-    return bind(dialog, {
+    return bindAll(dialog, [{
       type: 'click',
       listener(event) {
-        if (event.target === event.currentTarget) {
-          onClose({
-            reason: 'overlay-click'
-          });
+        if (event.target === event.currentTarget && dismissedBy === 'escape-and-outside-click') {
+          closeReasonRef.current = 'overlay-click';
+          // Calls native close because this is emulating the native light-dismiss behavior
+          dialog.close();
         }
       }
-    });
-  }, [onClose, isVisible]);
+    }, {
+      type: 'toggle',
+      listener(event) {
+        if (event.newState === 'closed') {
+          const reason = closeReasonRef.current;
+          closeReasonRef.current = null;
+          if (reason) {
+            onClose({
+              reason
+            });
+          }
+        }
+
+        // Visibility cleanup runs after close-reason handling.
+        onToggle(event);
+      }
+    }]);
+  }, [dismissedBy, onClose, onToggle, isVisible]);
 
   // Unmount the `<dialog>` once exit completes so it does not leave an
   // empty `role="dialog"` element in the accessibility tree. On the next
-  // open the element remounts and the `[isOpen]` and `[onClose, isVisible]`
-  // effects re-run against the fresh element.
+  // open the element remounts and its effects run against the fresh element.
   if (!isVisible) {
     return null;
   }

package/dist/es2019/focus/is-in-same-layer.js

@@ -8,11 +8,5 @@ export function isInSameLayer({
   element,
   container
 }) {
-  const elementLayer = element.closest(topLayerSelector);
-  const containerLayer = container.closest(topLayerSelector);
-  // Both elements are in the "document" layer
-  if (!elementLayer && !containerLayer) {
-    return true;
-  }
-  return elementLayer === containerLayer;
+  return element.closest(topLayerSelector) === container.closest(topLayerSelector);
 }

package/dist/es2019/focus/selectors.js

@@ -2,7 +2,7 @@ export const selectors = (() => {
   // Common exclusion filter applied to every selector.
   const not = ':not([tabindex="-1"]):not([aria-disabled="true"]):not([aria-hidden="true"])';
   const notDisabled = `:not([disabled])${not}`;
-  const focusable = [`a[href]${not}`, `area[href]${not}`, `input${notDisabled}:not([type="hidden"])`, `select${notDisabled}`, `textarea${notDisabled}`, `button${notDisabled}`, `iframe${not}`, `audio[controls]${not}`, `video[controls]${not}`, `[contenteditable]:not([contenteditable="false"])${not}`, `[tabindex]${notDisabled}${not}`];
+  const focusable = [`a[href]${not}`, `area[href]${not}`, `input${notDisabled}:not([type="hidden"])`, `select${notDisabled}`, `textarea${notDisabled}`, `button${notDisabled}`, `iframe${not}`, `audio[controls]${not}`, `video[controls]${not}`, `[contenteditable]:not([contenteditable="false"])${not}`, `[tabindex]${notDisabled}`];
   return {
     focusable: focusable.join(','),
     // Build the `:focus` selector

package/dist/es2019/internal/get-aria-for-trigger.js

@@ -1,5 +1,3 @@
-import { roleToAriaHasPopup } from './role-to-aria-has-popup';
-
 /**
  * Roles accepted by `getAriaForTrigger`.
  *
@@ -9,12 +7,34 @@ import { roleToAriaHasPopup } from './role-to-aria-has-popup';
  * manually for tooltip triggers.
  */
 
+/**
+ * Valid values for the `aria-haspopup` attribute.
+ *
+ * Derived from the HTML spec - maps popover roles to what the trigger
+ * announces. `undefined` means the attribute is omitted entirely (used for
+ * non-popup roles like `tooltip`/`status`/`alert`/`note`/`log` where
+ * `aria-haspopup` would be misleading).
+ *
+ * `true` is intentionally NOT in the union - the runtime only ever produces
+ * the explicit string forms, so widening the type would invite consumers to
+ * pass `true` and get an `aria-haspopup="true"` serialisation that the
+ * runtime no longer emits.
+ */
+
 /**
  * Non-undefined subset of `TAriaHasPopupValue`. Every role accepted by
  * `getAriaForTrigger` maps to a concrete `aria-haspopup` string, so the
  * trigger always receives a defined attribute value.
  */
 
+const roleToAriaHasPopup = {
+  dialog: 'dialog',
+  alertdialog: 'dialog',
+  menu: 'menu',
+  listbox: 'listbox',
+  tree: 'tree',
+  grid: 'grid'
+};
 /**
  * Returns the ARIA attributes to spread onto a click-activated popover trigger.
  *
@@ -67,13 +87,6 @@ export function getAriaForTrigger({
   isOpen,
   popoverId
 }) {
-  // `roleToAriaHasPopup` accepts a wider role union (including tooltip-family
-  // roles that map to `undefined`). `TAriaForTriggerRole` excludes those, so
-  // the returned value is guaranteed to be a defined string. The cast narrows
-  // the wider helper signature to match.
-  const ariaHasPopup = roleToAriaHasPopup({
-    role
-  });
   // `aria-controls` is set to `undefined` while closed. The `Popover` /
   // `Dialog` primitives unmount their host element after the exit
   // animation finishes, so a closed-state `aria-controls` would point
@@ -82,7 +95,7 @@ export function getAriaForTrigger({
   // until the target exists, avoiding the dangling reference while
   // keeping the relationship live whenever it is meaningful.
   return {
-    'aria-haspopup': ariaHasPopup,
+    'aria-haspopup': roleToAriaHasPopup[role],
     'aria-expanded': isOpen,
     'aria-controls': isOpen ? popoverId : undefined
   };

package/dist/es2019/internal/role-types.js

@@ -1,59 +0,0 @@
-/**
- * Valid values for the `aria-haspopup` attribute.
- *
- * Derived from the HTML spec - maps popover roles to what the trigger
- * announces. `undefined` means the attribute is omitted entirely (used for
- * non-popup roles like `tooltip`/`status`/`alert`/`note`/`log` where
- * `aria-haspopup` would be misleading).
- *
- * `true` is intentionally NOT in the union - the runtime only ever produces
- * the explicit string forms, so widening the type would invite consumers to
- * pass `true` and get an `aria-haspopup="true"` serialisation that the
- * runtime no longer emits.
- */
-
-/**
- * Roles that require an accessible name (`label` or `labelledBy`) per WCAG 4.1.2.
- * Without a name, assistive technology cannot identify these landmarks.
- */
-
-/**
- * Roles where the accessible name is derived from content or provided externally
- * (e.g. a combobox labels its listbox, tooltip content IS the accessible name).
- */
-
-// Shared ARIA role discrimination types
-//
-// These encode the WCAG 4.1.2 constraint: roles like `dialog`, `alertdialog`,
-// and `menu` MUST have an accessible name (either `label` or `labelledBy`).
-// TypeScript enforces this at compile time via discriminated unions.
-
-/**
- * ARIA role props where a role is always required.
- *
- * Used by `TPopupContentProps`. Popup content must always declare
- * its role so assistive technology can identify the layer.
- */
-
-/**
- * ARIA role props where a role is optional.
- *
- * Used by `TPopoverProps`. The low-level primitive allows omitting
- * the role for cases where it is set externally or not needed.
- */
-
-const rolesThatMoveFocus = new Set(['dialog', 'alertdialog', 'menu', 'listbox', 'tree', 'grid']);
-
-/**
- * Returns `true` when the given popover role moves focus into the popover
- * on open, and `false` otherwise (including when `role` is `undefined`).
- */
-// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-export function shouldFocusIntoPopover({
-  role
-}) {
-  if (!role) {
-    return false;
-  }
-  return rolesThatMoveFocus.has(role);
-}

package/dist/es2019/internal/use-anchor-position.js

@@ -307,11 +307,10 @@ export function useAnchorPosition({
        * See `notes/decisions/anchor-name-lifetime.md`
        */
       trigger.style.setProperty('anchor-name', anchorName);
-      const undoPositioning = combine(setStyle({
+      return setStyle({
         element: popover,
         styles: popoverStyles
-      }));
-      return undoPositioning;
+      });
     }
 
     // JS fallback. The popover is already in the top layer via

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

@@ -1,5 +1,5 @@
-import { useEffect, useLayoutEffect, useRef, useState } from 'react';
-import { bind, bindAll } from 'bind-event-listener';
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { bind } from 'bind-event-listener';
 import { prefersReducedMotion } from './reduced-motion';
 /**
  * Using the recommended motion timings for safety net.
@@ -110,7 +110,7 @@ function runOnTransitionEndOrTimeout({
  * `entering`, `open`, `exiting`). The host element is rendered while
  * `phase !== 'closed'`, so the `exiting` phase keeps the host mounted
  * while the CSS exit transition plays (or, with animation disabled,
- * while we wait for the browser `toggle` / `close` event to fire on the
+ * while we wait for the browser's closing `toggle` event to fire on the
  * still-attached element):
  *
  * ```
@@ -130,6 +130,7 @@ export function useAnimatedVisibility({
   onExitFinish
 }) {
   const willAnimate = shouldAnimate && !prefersReducedMotion();
+  const isNativeClosedRef = useRef(false);
 
   // Promote `closed → entering`/`closed → open` synchronously during
   // render so the host element mounts in the same commit as the open
@@ -140,16 +141,23 @@ export function useAnimatedVisibility({
     }
     return willAnimate ? 'entering' : 'open';
   });
-  if (isOpen && phase === 'closed') {
+
+  // Rearm only after controlled state and the native lifecycle have both
+  // reached closed. Resetting as soon as `isOpen` becomes false can erase a
+  // closing toggle that was handled in the same React batch.
+  if (!isOpen && phase === 'closed') {
+    isNativeClosedRef.current = false;
+  }
+  if (isOpen && phase === 'closed' && !isNativeClosedRef.current) {
     setPhase(willAnimate ? 'entering' : 'open');
   }
   if (!isOpen && (phase === 'open' || phase === 'entering')) {
     // Close intent. Move to `exiting` to gate the unmount on either
-    // the exit transition (animated) or the toggle/close event
+    // the exit transition (animated) or the closing toggle event
     // (non-animated). Includes interrupted entry (`entering → exiting`).
     setPhase('exiting');
   }
-  if (isOpen && phase === 'exiting') {
+  if (isOpen && phase === 'exiting' && !isNativeClosedRef.current) {
     // Reopen mid-exit. With animation, jump back to `entering` and let
     // the entry transition restart from current visual state. Without
     // animation, jump straight to `open` (the handshake we were waiting
@@ -234,47 +242,37 @@ export function useAnimatedVisibility({
     });
   }, [phase, willAnimate, animationKind, elementRef]);
 
-  // Non-animated exit: wait for the browser's `toggle` (closed) or
-  // `close` event before unmounting, so the consumer's listener (close
-  // reason, nested focus restoration, `onClose`) and the browser's
-  // native focus restoration both run against the still-attached
-  // element. A naive `setTimeout(0)` occasionally beats the `toggle`
-  // task in Chromium and drops focus restoration.
-  //
-  // `useLayoutEffect` so the listener binds in the same commit as the
-  // show/hide layout effect that calls `hidePopover()` / `dialog.close()`.
-  // The toggle/close event is queued as a task and cannot run until the
-  // frame completes. SSR-safe: `phase` starts at `'closed'`.
-  //
-  // `onExitFinish` is fired separately (see effect below) so consumers
-  // observe it the moment `isOpen` flips to `false`.
+  // Native dismissal is authoritative. Its toggle can arrive while controlled
+  // state still says open, so remember that native state and do not
+  // reopen until `isOpen` has first moved to false.
   useLayoutEffect(() => {
-    if (phase !== 'exiting' || willAnimate) {
-      return;
+    if (phase === 'exiting' && !willAnimate && isNativeClosedRef.current) {
+      setPhase('closed');
     }
-    const element = elementRef.current;
-    if (!element) {
+  }, [phase, willAnimate]);
+  const onToggle = useCallback(event => {
+    if (event.newState === 'open') {
+      isNativeClosedRef.current = false;
       return;
     }
-    function unmount() {
-      setPhase(current => current === 'exiting' ? 'closed' : current);
+    if (event.newState !== 'closed') {
+      return;
     }
-    return bindAll(element, [{
-      type: 'toggle',
-      listener: event => {
-        if (event.newState === 'closed') {
-          unmount();
-        }
+    isNativeClosedRef.current = true;
+    setPhase(current => {
+      if (current === 'open' || current === 'entering') {
+        return 'exiting';
       }
-    }, {
-      type: 'close',
-      listener: unmount
-    }]);
-  }, [phase, willAnimate, elementRef]);
+      if (current === 'exiting' && !willAnimate) {
+        return 'closed';
+      }
+      return current;
+    });
+  }, [willAnimate]);
 
   // Non-animated exit callback. No `transitionend` to wait for, so fire
   // `onExitFinish` on the transition into `exiting` (the unmount itself
-  // is gated by the toggle/close handshake above).
+  // is gated by the closing toggle handshake above).
   const prevPhaseForExitRef = useRef('closed');
   useEffect(() => {
     const prevPhase = prevPhaseForExitRef.current;
@@ -289,6 +287,7 @@ export function useAnimatedVisibility({
     }
   }, [phase, willAnimate]);
   return {
-    phase
+    phase,
+    onToggle
   };
 }

package/dist/es2019/popover/popover.js

@@ -8,7 +8,7 @@ import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import once from '@atlaskit/ds-lib/once';
 import { useNotifyOpenLayerObserver } from '@atlaskit/layering/use-notify-open-layer-observer';
 import { resolvePlacement } from '../internal/resolve-placement';
-import { shouldFocusIntoPopover } from '../internal/role-types';
+import { shouldFocusIntoPopover } from '../internal/should-focus-into-popover';
 import { useAnimatedVisibility } from '../internal/use-animated-visibility';
 import { useFocusWrap } from '../internal/use-focus-wrap';
 import { useInitialFocus } from '../internal/use-initial-focus';
@@ -88,11 +88,7 @@ const POPUP_ROLES = new Set(['menu', 'listbox', 'dialog', 'alertdialog', 'tree',
  * ### 📜 Browser dismiss is non-cancellable
  *
  * Per the popover spec, `beforetoggle` is cancellable on open transitions
- * only, not on close. Consumers that need to ignore a specific dismiss
- * (e.g. a click on a logically-associated external trigger) must reconcile
- * inside their own `onClose` handler by calling `showPopover()` again.
- * `Popover` does not self-heal so consumers do not pay a reconcile cost
- * by default.
+ * only, not on close.
  *
  * - Spec: <https://html.spec.whatwg.org/multipage/popover.html#the-popover-attribute>
  * - <https://github.com/whatwg/html/issues/8973>
@@ -132,7 +128,8 @@ export const Popover = /*#__PURE__*/forwardRef(function Popover({
   // `useId()` colons are invalid in CSS selectors and popover target attributes.
   const popoverId = idProp !== null && idProp !== void 0 ? idProp : `popover-${autoId.replace(/:/g, '')}`;
   const {
-    phase
+    phase,
+    onToggle
   } = useAnimatedVisibility({
     isOpen,
     animationKind: 'popover',
@@ -214,6 +211,7 @@ export const Popover = /*#__PURE__*/forwardRef(function Popover({
   const handleToggle = useCallback(event => {
     const element = ownRef.current;
     if (event.newState === 'open') {
+      onToggle(event);
       return;
     }
     if (event.newState === 'closed') {
@@ -243,18 +241,18 @@ export const Popover = /*#__PURE__*/forwardRef(function Popover({
         // Reset reason so a stale 'escape' from a race with Escape keydown
         // does not corrupt the next browser-dismiss cycle.
         closeReasonRef.current = 'light-dismiss';
-        return;
+      } else {
+        // Browser dismiss (Escape/click-outside).
+        const reason = closeReasonRef.current;
+        closeReasonRef.current = 'light-dismiss';
+        // Optional: `manual` mode has no `onClose` in the forwarded type.
+        onClose === null || onClose === void 0 ? void 0 : onClose({
+          reason
+        });
       }
-
-      // Browser dismiss (Escape/click-outside).
-      const reason = closeReasonRef.current;
-      closeReasonRef.current = 'light-dismiss';
-      // Optional: `manual` mode has no `onClose` in the forwarded type.
-      onClose === null || onClose === void 0 ? void 0 : onClose({
-        reason
-      });
     }
-  }, [onClose, role]);
+    onToggle(event);
+  }, [onClose, onToggle, role]);
 
   // Bind via `useLayoutEffect`, and BEFORE the show/hide layout effect
   // below, so listeners are attached when `showPopover()` synchronously

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

@@ -1,9 +1,9 @@
 /* dialog-content.tsx generated by @compiled/babel-plugin v2.0.0 */
 import "./dialog-content.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { forwardRef, useCallback, useEffect, useId, useLayoutEffect, useRef } from 'react';
+import React, { forwardRef, useCallback, useId, useLayoutEffect, useRef } from 'react';
 import { cx } from '@compiled/react';
-import { bind } from 'bind-event-listener';
+import { bindAll } from 'bind-event-listener';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import noop from '@atlaskit/ds-lib/noop';
 import { useNotifyOpenLayerObserver } from '@atlaskit/layering/use-notify-open-layer-observer';
@@ -45,8 +45,8 @@ var backdropStyles = {
  *
  * Handles native `cancel` event (Escape) and backdrop click detection.
  *
- * Close flow: we never call `dialog.close()` from event handlers. We always call
- * `onClose`; the consumer decides whether to set `isOpen={false}`.
+ * Close flow: allowed user dismissal closes the native dialog before `onClose`
+ * notifies the consumer. The consumer must synchronize `isOpen` in response.
  *
  * Accessibility: render at least one focusable element (typically a close
  * button) when `isOpen` becomes `true`. Tab is always trapped inside the
@@ -56,6 +56,8 @@ export var Dialog = /*#__PURE__*/forwardRef(function Dialog(_ref, ref) {
   var children = _ref.children,
     isOpen = _ref.isOpen,
     onClose = _ref.onClose,
+    _ref$dismissedBy = _ref.dismissedBy,
+    dismissedBy = _ref$dismissedBy === void 0 ? 'escape-and-outside-click' : _ref$dismissedBy,
     onEnterFinish = _ref.onEnterFinish,
     onExitFinish = _ref.onExitFinish,
     _ref$shouldAnimate = _ref.shouldAnimate,
@@ -73,6 +75,7 @@ export var Dialog = /*#__PURE__*/forwardRef(function Dialog(_ref, ref) {
   var dialogId = providedId !== null && providedId !== void 0 ? providedId : generatedId;
   var ownRef = useRef(null);
   var combinedRef = mergeRefs([ownRef, ref]);
+  var closeReasonRef = useRef(null);
   var _useAnimatedVisibilit = useAnimatedVisibility({
       isOpen: isOpen,
       animationKind: 'dialog',
@@ -81,7 +84,8 @@ export var Dialog = /*#__PURE__*/forwardRef(function Dialog(_ref, ref) {
       onEnterFinish: onEnterFinish,
       onExitFinish: onExitFinish
     }),
-    phase = _useAnimatedVisibilit.phase;
+    phase = _useAnimatedVisibilit.phase,
+    onToggle = _useAnimatedVisibilit.onToggle;
 
   // True while the host element is mounted (any phase except `closed`).
   // Used as a dep so listener-rebind effects re-attach after a remount.
@@ -112,6 +116,7 @@ export var Dialog = /*#__PURE__*/forwardRef(function Dialog(_ref, ref) {
       return;
     }
     if (isOpen) {
+      closeReasonRef.current = null;
       if (!dialog.open) {
         dialog.showModal();
       }
@@ -144,45 +149,67 @@ export var Dialog = /*#__PURE__*/forwardRef(function Dialog(_ref, ref) {
     if (event.target !== event.currentTarget) {
       return;
     }
-    event.preventDefault();
+
     // Spurious Safari `cancel`: the keydown snapshot saw an open child
     // popover, so this Escape belongs to that popover (light-dismissed
     // natively). Keep the dialog open instead of forwarding to `onClose`.
     if (shouldIgnoreEscape()) {
+      event.preventDefault();
       return;
     }
-    onClose({
-      reason: 'escape'
-    });
-  }, [onClose, shouldIgnoreEscape]);
 
-  // Handle backdrop click
+    // Without native `closedby`, cancel Escape only when dismissal is disabled.
+    // Allowed dismissal follows Popover behavior: the browser closes the element
+    // and `onClose` notifies the controlled owner of the reason.
+    if (dismissedBy === 'none') {
+      event.preventDefault();
+      return;
+    }
+    closeReasonRef.current = 'escape';
+  }, [dismissedBy, shouldIgnoreEscape]);
+
+  // Handle backdrop interaction
   // Attached via bind-event-listener rather than a React prop so we avoid
   // a11y lint suppressions on the <dialog> element.
-  // Keyboard dismiss is already handled natively (Escape → onCancel above).
+  // The click listener provides light dismiss consistently across browsers.
   // `isVisible` is in deps so the listener re-binds to the new <dialog>
   // element after a host unmount / remount cycle.
-  useEffect(function () {
+  useLayoutEffect(function () {
     var dialog = ownRef.current;
     if (!dialog) {
       return;
     }
-    return bind(dialog, {
+    return bindAll(dialog, [{
       type: 'click',
       listener: function listener(event) {
-        if (event.target === event.currentTarget) {
-          onClose({
-            reason: 'overlay-click'
-          });
+        if (event.target === event.currentTarget && dismissedBy === 'escape-and-outside-click') {
+          closeReasonRef.current = 'overlay-click';
+          // Calls native close because this is emulating the native light-dismiss behavior
+          dialog.close();
         }
       }
-    });
-  }, [onClose, isVisible]);
+    }, {
+      type: 'toggle',
+      listener: function listener(event) {
+        if (event.newState === 'closed') {
+          var reason = closeReasonRef.current;
+          closeReasonRef.current = null;
+          if (reason) {
+            onClose({
+              reason: reason
+            });
+          }
+        }
+
+        // Visibility cleanup runs after close-reason handling.
+        onToggle(event);
+      }
+    }]);
+  }, [dismissedBy, onClose, onToggle, isVisible]);
 
   // Unmount the `<dialog>` once exit completes so it does not leave an
   // empty `role="dialog"` element in the accessibility tree. On the next
-  // open the element remounts and the `[isOpen]` and `[onClose, isVisible]`
-  // effects re-run against the fresh element.
+  // open the element remounts and its effects run against the fresh element.
   if (!isVisible) {
     return null;
   }

package/dist/esm/focus/is-in-same-layer.js

@@ -7,11 +7,5 @@ var topLayerSelector = '[popover], dialog, [role="dialog"], [role="alertdialog"]
 export function isInSameLayer(_ref) {
   var element = _ref.element,
     container = _ref.container;
-  var elementLayer = element.closest(topLayerSelector);
-  var containerLayer = container.closest(topLayerSelector);
-  // Both elements are in the "document" layer
-  if (!elementLayer && !containerLayer) {
-    return true;
-  }
-  return elementLayer === containerLayer;
+  return element.closest(topLayerSelector) === container.closest(topLayerSelector);
 }

package/dist/esm/focus/selectors.js

@@ -2,7 +2,7 @@ export var selectors = function () {
   // Common exclusion filter applied to every selector.
   var not = ':not([tabindex="-1"]):not([aria-disabled="true"]):not([aria-hidden="true"])';
   var notDisabled = ":not([disabled])".concat(not);
-  var focusable = ["a[href]".concat(not), "area[href]".concat(not), "input".concat(notDisabled, ":not([type=\"hidden\"])"), "select".concat(notDisabled), "textarea".concat(notDisabled), "button".concat(notDisabled), "iframe".concat(not), "audio[controls]".concat(not), "video[controls]".concat(not), "[contenteditable]:not([contenteditable=\"false\"])".concat(not), "[tabindex]".concat(notDisabled).concat(not)];
+  var focusable = ["a[href]".concat(not), "area[href]".concat(not), "input".concat(notDisabled, ":not([type=\"hidden\"])"), "select".concat(notDisabled), "textarea".concat(notDisabled), "button".concat(notDisabled), "iframe".concat(not), "audio[controls]".concat(not), "video[controls]".concat(not), "[contenteditable]:not([contenteditable=\"false\"])".concat(not), "[tabindex]".concat(notDisabled)];
   return {
     focusable: focusable.join(','),
     // Build the `:focus` selector