@atlaskit/top-layer 4.4.3 → 4.4.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/top-layer
 
+## 4.4.5
+
+### Patch Changes
+
+- [`4aa51e925cecb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4aa51e925cecb) -
+  Handle environments that do not support matching the `:popover-open` selector during close
+  settlement.
+
+## 4.4.4
+
+### Patch Changes
+
+- [`610d564dbc5dd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/610d564dbc5dd) -
+  Behind `platform-dst-top-layer`, harden the Popover and Dialog animation lifecycle state machine
+  and completion callbacks, restore focus before controlled Popover closure removes native
+  listeners, and preserve Modal Dialog open-complete callbacks across reopen cycles.
+
 ## 4.4.3
 
 ### Patch Changes

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

@@ -1,4 +1,4 @@
-/* dialog-content.tsx generated by @compiled/babel-plugin v2.0.0 */
+/* dialog-content.tsx generated by @compiled/babel-plugin v3.0.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -85,6 +85,13 @@ var Dialog = exports.Dialog = /*#__PURE__*/(0, _react.forwardRef)(function Dialo
   var ownRef = (0, _react.useRef)(null);
   var combinedRef = (0, _mergeRefs.default)([ownRef, ref]);
   var closeReasonRef = (0, _react.useRef)(null);
+  var dismissedByRef = (0, _react.useRef)(dismissedBy);
+  var onCloseRef = (0, _react.useRef)(onClose);
+  // Keep native event handlers stable while ensuring they read the latest committed props.
+  (0, _react.useLayoutEffect)(function () {
+    dismissedByRef.current = dismissedBy;
+    onCloseRef.current = onClose;
+  }, [dismissedBy, onClose]);
   var _useAnimatedVisibilit = (0, _useAnimatedVisibility.useAnimatedVisibility)({
       isOpen: isOpen,
       shouldAnimate: shouldAnimate,
@@ -93,11 +100,52 @@ var Dialog = exports.Dialog = /*#__PURE__*/(0, _react.forwardRef)(function Dialo
       onExitFinish: onExitFinish
     }),
     phase = _useAnimatedVisibilit.phase,
+    isMounted = _useAnimatedVisibilit.isMounted,
+    onBeforeToggle = _useAnimatedVisibilit.onBeforeToggle,
     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.
-  var isVisible = phase !== 'closed';
+  // Ordering is important: bind native lifecycle listeners before the later
+  // layout effect calls showModal() or close(), because `beforetoggle` fires
+  // synchronously during those calls.
+  (0, _react.useLayoutEffect)(function () {
+    if (!isMounted) {
+      return;
+    }
+    var dialog = ownRef.current;
+    if (!dialog) {
+      return;
+    }
+    return (0, _bindEventListener.bindAll)(dialog, [{
+      type: 'beforetoggle',
+      listener: onBeforeToggle
+    }, {
+      // Browsers retarget clicks on ::backdrop to the <dialog> element.
+      // Close on backdrop click when outside-click dismissal is enabled.
+      type: 'click',
+      listener: function listener(event) {
+        if (event.target === event.currentTarget && dismissedByRef.current === 'escape-and-outside-click') {
+          closeReasonRef.current = 'overlay-click';
+          dialog.close();
+        }
+      }
+    }, {
+      type: 'toggle',
+      listener: function listener(event) {
+        if (event.newState === 'closed') {
+          var reason = closeReasonRef.current;
+          closeReasonRef.current = null;
+          // A reason is only set for user-initiated closes. When React closes the
+          // dialog because isOpen changed, the consumer already knows.
+          if (reason) {
+            onCloseRef.current({
+              reason: reason
+            });
+          }
+        }
+        onToggle(event);
+      }
+    }]);
+  }, [isMounted, onBeforeToggle, onToggle]);
 
   // Native `<dialog>.showModal()` traps focus but wraps through `<body>` at
   // the boundary (A → B → C → body → A). This hook intercepts Tab to wrap
@@ -143,7 +191,7 @@ var Dialog = exports.Dialog = /*#__PURE__*/(0, _react.forwardRef)(function Dialo
   // See notes/decisions/safari-escape-nested-popover-in-dialog.md
   var _useSafariEscapeFix = (0, _useSafariEscapeFix2.useSafariEscapeFix)({
       dialogRef: ownRef,
-      isVisible: isVisible
+      isVisible: isMounted
     }),
     shouldIgnoreEscape = _useSafariEscapeFix.shouldIgnoreEscape;
 
@@ -176,49 +224,11 @@ var Dialog = exports.Dialog = /*#__PURE__*/(0, _react.forwardRef)(function Dialo
     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.
-  // 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.
-  (0, _react.useLayoutEffect)(function () {
-    var dialog = ownRef.current;
-    if (!dialog) {
-      return;
-    }
-    return (0, _bindEventListener.bindAll)(dialog, [{
-      type: 'click',
-      listener: function listener(event) {
-        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();
-        }
-      }
-    }, {
-      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 its effects run against the fresh element.
-  if (!isVisible) {
+  // empty `role="dialog"` element in the accessibility tree. A later open
+  // remounts a fresh element, so the listener-binding and native-visibility
+  // effects run against that element.
+  if (!isMounted) {
     return null;
   }
   var shouldAnimateBackdrop = !shouldHideBackdrop && shouldAnimate;

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

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useAnimatedVisibility = useAnimatedVisibility;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 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; }
 function runCancellableSettlement(_ref) {
   var schedule = _ref.schedule,
     onSettled = _ref.onSettled;
@@ -19,6 +22,7 @@ function runCancellableSettlement(_ref) {
     onSettled();
   });
   return function () {
+    // Prevent an interrupted or unmounted lifecycle from firing a stale callback.
     isCancelled = true;
   };
 }
@@ -41,6 +45,19 @@ 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`,
@@ -53,11 +70,11 @@ function runOnAnimationsSettled(_ref2) {
  *   animation disabled the lifecycle goes directly `closed → open`.
  * - `open`: host element is mounted and settled. No transition is
  *   playing.
- * - `exiting`: `isOpen` has flipped to `false` but the host element
- *   is still mounted. Emitted while the CSS exit transition is playing
- *   (animation enabled) OR while we wait for the browser's
- *   `toggle`/`close` event to fire on the still-attached element so
- *   focus restoration can run (animation disabled).
+ * - `exiting`: a native close has begun but the host element remains
+ *   mounted. Usually this follows `isOpen` changing to `false`, but it can
+ *   also begin with a browser-initiated dismissal while controlled intent
+ *   is still open. With animation disabled, this phase lasts until the
+ *   browser's closed `toggle` fires so native focus restoration can finish.
  *
  * State machine:
  * ```
@@ -67,210 +84,273 @@ function runOnAnimationsSettled(_ref2) {
  *                   exiting  → entering (reopen mid-exit, animated)
  *                   exiting  → open     (reopen mid-handshake, non-animated)
  * ```
- *
- * `phase !== 'closed'` is the canonical "host is currently in the DOM
- * and on screen" predicate.
  */
 
+function getInitialVisibilityState(_ref4) {
+  var isOpen = _ref4.isOpen,
+    willAnimate = _ref4.willAnimate;
+  if (!isOpen) {
+    return {
+      phase: 'closed',
+      controlledIntent: 'closed'
+    };
+  }
+  if (willAnimate) {
+    return {
+      phase: 'entering',
+      controlledIntent: 'open'
+    };
+  }
+  return {
+    phase: 'open',
+    controlledIntent: 'open'
+  };
+}
+
 /**
- * Manages the children mount/unmount lifecycle around CSS exit transitions.
- *
- * Used by both `Popover` and `Dialog` to share the same animation lifecycle
- * logic. Those components own their own show/hide mechanisms (showPopover /
- * hidePopover vs showModal / close) and event handling - this hook only
- * manages the relationship between `isOpen` and when children are rendered.
+ * Applies one lifecycle event to the current visibility phase.
  *
- * ## Problem
- *
- * We want to delay the unmount of children until a CSS exit transition has
- * finished playing. If we unmount children the moment `isOpen` becomes
- * `false`, the exit animation is never visible - the content just disappears.
+ * Events that are stale for the current phase are ignored. This allows
+ * animation callbacks and native close events to settle safely after an
+ * interrupted lifecycle.
+ */
+function getNextVisibilityState(state, action) {
+  if (action.type === 'open-requested') {
+    var shouldEnter = state.phase === 'closed' || state.phase === 'exiting' && state.controlledIntent === 'closed';
+    if (shouldEnter && action.willAnimate) {
+      return {
+        phase: 'entering',
+        controlledIntent: 'open'
+      };
+    }
+    if (shouldEnter) {
+      return {
+        phase: 'open',
+        controlledIntent: 'open'
+      };
+    }
+    return _objectSpread(_objectSpread({}, state), {}, {
+      controlledIntent: 'open'
+    });
+  }
+  if (action.type === 'close-requested') {
+    return _objectSpread(_objectSpread({}, state), {}, {
+      controlledIntent: 'closed'
+    });
+  }
+  if (action.type === 'exit-started') {
+    if (state.phase !== 'open' && state.phase !== 'entering') {
+      return state;
+    }
+    return _objectSpread(_objectSpread({}, state), {}, {
+      phase: 'exiting'
+    });
+  }
+  if (action.type === 'entry-settled') {
+    if (state.phase !== 'entering') {
+      return state;
+    }
+    return _objectSpread(_objectSpread({}, state), {}, {
+      phase: 'open'
+    });
+  }
+  if (action.type === 'exit-settled') {
+    if (state.phase !== 'exiting') {
+      return state;
+    }
+    return _objectSpread(_objectSpread({}, state), {}, {
+      phase: 'closed'
+    });
+  }
+  return state;
+}
+
+/**
+ * Coordinates controlled intent, native visibility, lifecycle phase, and host
+ * mounting around CSS exit transitions. The canonical contract is documented in
+ * `notes/architecture/animations.md#canonical-visibility-lifecycle-contract`.
  *
- * ## How it works
+ * Used by both `Popover` and `Dialog` to share the same lifecycle logic. Those
+ * components own native event binding, show and hide commands, and
+ * component-specific event handling. This hook returns stable `onBeforeToggle`
+ * and `onToggle` callbacks that advance lifecycle phase and host mounting.
  *
- * The lifecycle is modeled as a `phase` discriminated union (`closed`,
- * `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's closing `toggle` event to fire on the
- * still-attached element):
+ * The host element is rendered while `phase !== 'closed'`. The `exiting`
+ * phase keeps it mounted until its CSS animation settles or, with animation
+ * disabled, until the browser reports that the native element has closed.
  *
  * ```
  * isOpen:  true ──────────────── false
  * phase:   open ──────────────── exiting ─── (exit settle) ─── closed
  * ```
- *
- * Every effect dispatches on the single `phase` value instead of a
- * cross-product of booleans.
  */
-function useAnimatedVisibility(_ref3) {
-  var isOpen = _ref3.isOpen,
-    shouldAnimate = _ref3.shouldAnimate,
-    elementRef = _ref3.elementRef,
-    onEnterFinish = _ref3.onEnterFinish,
-    onExitFinish = _ref3.onExitFinish;
+function useAnimatedVisibility(_ref5) {
+  var isOpen = _ref5.isOpen,
+    shouldAnimate = _ref5.shouldAnimate,
+    elementRef = _ref5.elementRef,
+    onEnterFinish = _ref5.onEnterFinish,
+    onExitFinish = _ref5.onExitFinish;
   var willAnimate = shouldAnimate && !(0, _reducedMotion.prefersReducedMotion)();
-  var isNativeClosedRef = (0, _react.useRef)(false);
-
-  // Promote `closed → entering`/`closed → open` synchronously during
-  // render so the host element mounts in the same commit as the open
-  // intent. All other transitions are driven by phase-specific effects.
-  var _useState = (0, _react.useState)(function () {
-      if (!isOpen) {
-        return 'closed';
-      }
-      return willAnimate ? 'entering' : 'open';
-    }),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    phase = _useState2[0],
-    setPhase = _useState2[1];
+  var _useReducer = (0, _react.useReducer)(getNextVisibilityState, {
+      isOpen: isOpen,
+      willAnimate: willAnimate
+    }, getInitialVisibilityState),
+    _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
+    visibilityState = _useReducer2[0],
+    dispatch = _useReducer2[1];
+  var phase = visibilityState.phase,
+    controlledIntent = visibilityState.controlledIntent;
 
-  // 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 closing toggle event
-    // (non-animated). Includes interrupted entry (`entering → exiting`).
-    setPhase('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
-    // for is no longer relevant; the consumer wants the host visible
-    // again synchronously).
-    setPhase(willAnimate ? 'entering' : 'open');
-  }
-
-  // Keep stable refs to the latest callbacks so effects and promise callbacks
+  // Keep stable refs to the latest callbacks so effects and animation settlement closures
   // always call the current callback without needing them in dependency arrays.
   var onEnterFinishRef = (0, _react.useRef)(onEnterFinish);
-  onEnterFinishRef.current = onEnterFinish;
   var onExitFinishRef = (0, _react.useRef)(onExitFinish);
-  onExitFinishRef.current = onExitFinish;
+  var willAnimateRef = (0, _react.useRef)(willAnimate);
+  (0, _react.useLayoutEffect)(function () {
+    onEnterFinishRef.current = onEnterFinish;
+    onExitFinishRef.current = onExitFinish;
+    willAnimateRef.current = willAnimate;
+  }, [onEnterFinish, onExitFinish, willAnimate]);
+
+  // Synchronize controlled intent during render so opening mounts the host in
+  // the same commit. Keeping the processed intent in reducer state prevents a
+  // browser-driven exit from being mistaken for a new controlled open request.
+  if (isOpen && controlledIntent === 'closed') {
+    dispatch({
+      type: 'open-requested',
+      willAnimate: willAnimate
+    });
+  }
+  if (!isOpen && controlledIntent === 'open') {
+    dispatch({
+      type: 'close-requested'
+    });
+  }
 
-  // Animated entry: wait for all active animations and move to `open`.
+  // Entry can commit `open` before its callback because the host stays mounted.
+  // This ensures consumers observe the settled DOM rather than entering styles.
+  // Treat the phase before the initial commit as closed so an initially open host
+  // notifies consumers.
+  var prevPhaseRef = (0, _react.useRef)('closed');
   (0, _react.useEffect)(function () {
-    if (phase !== 'entering') {
+    var prevPhase = prevPhaseRef.current;
+    prevPhaseRef.current = phase;
+    if (prevPhase === phase) {
       return;
     }
-    var element = elementRef.current;
-    if (!element) {
-      return;
+    if (phase === 'open') {
+      var _onEnterFinishRef$cur;
+      (_onEnterFinishRef$cur = onEnterFinishRef.current) === null || _onEnterFinishRef$cur === void 0 || _onEnterFinishRef$cur.call(onEnterFinishRef);
     }
-    return runOnAnimationsSettled({
-      element: element,
-      onSettled: function onSettled() {
-        var _onEnterFinishRef$cur;
-        // Fire the consumer callback before transitioning phase so any
-        // state the consumer reads (refs, DOM nodes) is still attached
-        // in the same synchronous tick, regardless of React batching
-        // semantics.
-        (_onEnterFinishRef$cur = onEnterFinishRef.current) === null || _onEnterFinishRef$cur === void 0 || _onEnterFinishRef$cur.call(onEnterFinishRef);
-        setPhase(function (current) {
-          return current === 'entering' ? 'open' : current;
-        });
-      }
-    });
-  }, [phase, elementRef]);
+  }, [phase]);
+  var isMounted = phase !== 'closed';
+  var cancelExitSettlementRef = (0, _react.useRef)(function () {});
 
-  // Non-animated entry callback. The lifecycle goes `closed → open`
-  // directly with no `entering` phase; fire `onEnterFinish` on that jump.
-  // A previous-phase ref avoids double-firing on the animated path.
-  var prevPhaseForEntryRef = (0, _react.useRef)('closed');
-  (0, _react.useEffect)(function () {
-    var prevPhase = prevPhaseForEntryRef.current;
-    prevPhaseForEntryRef.current = phase;
+  // Exit must notify consumers before `closed` unmounts the host.
+  var settleExit = (0, _react.useCallback)(function () {
+    var _onExitFinishRef$curr;
+    (_onExitFinishRef$curr = onExitFinishRef.current) === null || _onExitFinishRef$curr === void 0 || _onExitFinishRef$curr.call(onExitFinishRef);
+    dispatch({
+      type: 'exit-settled'
+    });
+  }, []);
 
-    // Animated entry settle goes through `entering` and already fired
-    // onEnterFinish above; only handle the non-animated direct jumps.
-    if (prevPhase !== 'open' && phase === 'open' && prevPhase !== 'entering') {
-      var _onEnterFinishRef$cur2;
-      (_onEnterFinishRef$cur2 = onEnterFinishRef.current) === null || _onEnterFinishRef$cur2 === void 0 || _onEnterFinishRef$cur2.call(onEnterFinishRef);
+  // Primitives bind these stable callbacks to their native lifecycle events.
+  // This keeps event ownership at the primitive while the hook owns state transitions.
+  var onBeforeToggle = (0, _react.useCallback)(function (event) {
+    // Any native transition supersedes a previous exit snapshot. This prevents
+    // a stale settlement from closing a host that is reopening or closing again.
+    cancelExitSettlementRef.current();
+    // Snapshot currentTarget because the DOM clears it after event dispatch.
+    var element = event.currentTarget;
+    if (event.newState === 'open' && element instanceof HTMLElement) {
+      element.removeAttribute('inert');
+      element.removeAttribute('aria-hidden');
     }
-  }, [phase]);
+    if (event.newState === 'closed') {
+      if (element instanceof HTMLElement) {
+        // We use a microtask to let native focus restoration happen before making the element inert.
+        // The browser restores focus after beforetoggle returns, during its close steps.
+        queueMicrotask(function () {
+          // A controlled close can be interrupted by isOpen changing back to true,
+          // which reopens the element before this microtask runs.
+          if (isNativeElementOpen({
+            element: element
+          })) {
+            return;
+          }
 
-  // Animated exit: wait for all active animations, fire `onExitFinish`,
-  // then move to `closed` to unmount the host.
-  (0, _react.useEffect)(function () {
-    if (phase !== 'exiting' || !willAnimate) {
+          // Exit animations keep closed content rendered, so make it non-interactive and hide it from assistive technology.
+          element.setAttribute('inert', '');
+          // Tooling does not consistently treat inert content as hidden, even though the browser does.
+          element.setAttribute('aria-hidden', 'true');
+        });
+      }
+      dispatch({
+        type: 'exit-started'
+      });
+    }
+  }, []);
+  var onToggle = (0, _react.useCallback)(function (event) {
+    if (event.newState !== 'closed') {
+      return;
+    }
+    if (!willAnimateRef.current) {
+      cancelExitSettlementRef.current = runCancellableSettlement({
+        schedule: queueMicrotask,
+        onSettled: settleExit
+      });
       return;
     }
     var element = elementRef.current;
     if (!element) {
       return;
     }
-    return runOnAnimationsSettled({
+
+    // The closed `toggle` is task-queued after synchronous `beforetoggle`.
+    // Snapshot here so the exiting phase styles have committed and the list
+    // represents the animations that actually govern exit settlement.
+    cancelExitSettlementRef.current = runOnAnimationsSettled({
       element: element,
-      onSettled: function onSettled() {
-        var _onExitFinishRef$curr;
-        // Fire the consumer callback before transitioning phase to
-        // `closed`. The phase change drives the host element unmount,
-        // and consumers expect to be able to read the element (or a
-        // forwarded ref to it) inside `onExitFinish`. Doing this in
-        // the safe order avoids relying on React's automatic batching
-        // to keep the element attached across the callback.
-        (_onExitFinishRef$curr = onExitFinishRef.current) === null || _onExitFinishRef$curr === void 0 || _onExitFinishRef$curr.call(onExitFinishRef);
-        setPhase(function (current) {
-          return current === 'exiting' ? 'closed' : current;
-        });
-      }
+      onSettled: settleExit
     });
-  }, [phase, willAnimate, elementRef]);
-
-  // 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.
+  }, [elementRef, settleExit]);
   (0, _react.useLayoutEffect)(function () {
-    if (phase === 'exiting' && !willAnimate && isNativeClosedRef.current) {
-      setPhase('closed');
+    return function () {
+      // Prevent a pending animation or microtask from notifying after unmount.
+      cancelExitSettlementRef.current();
+    };
+  }, []);
+
+  // Entry settlement only removes entering styles. Its callback runs after the
+  // resulting `open` commit in the effect above.
+  (0, _react.useEffect)(function settleEntry() {
+    if (phase !== 'entering') {
+      return;
     }
-  }, [phase, willAnimate]);
-  var onToggle = (0, _react.useCallback)(function (event) {
-    if (event.newState === 'open') {
-      isNativeClosedRef.current = false;
+    if (!willAnimate) {
+      dispatch({
+        type: 'entry-settled'
+      });
       return;
     }
-    if (event.newState !== 'closed') {
+    var element = elementRef.current;
+    if (!element) {
       return;
     }
-    isNativeClosedRef.current = true;
-    setPhase(function (current) {
-      if (current === 'open' || current === 'entering') {
-        return 'exiting';
-      }
-      if (current === 'exiting' && !willAnimate) {
-        return 'closed';
+    return runOnAnimationsSettled({
+      element: element,
+      onSettled: function onSettled() {
+        dispatch({
+          type: 'entry-settled'
+        });
       }
-      return current;
     });
-  }, [willAnimate]);
-
-  // Non-animated exit callback. There are no animations to wait for, so fire
-  // `onExitFinish` on the transition into `exiting` (the unmount itself
-  // is gated by the closing toggle handshake above).
-  var prevPhaseForExitRef = (0, _react.useRef)('closed');
-  (0, _react.useEffect)(function () {
-    var prevPhase = prevPhaseForExitRef.current;
-    prevPhaseForExitRef.current = phase;
-
-    // Only fire on the non-animated transition into `exiting`. The
-    // animated path's `exiting → closed` settle already fires
-    // `onExitFinish` from `runOnAnimationsSettled`.
-    if (prevPhase !== 'exiting' && phase === 'exiting' && !willAnimate) {
-      var _onExitFinishRef$curr2;
-      (_onExitFinishRef$curr2 = onExitFinishRef.current) === null || _onExitFinishRef$curr2 === void 0 || _onExitFinishRef$curr2.call(onExitFinishRef);
-    }
-  }, [phase, willAnimate]);
+  }, [phase, willAnimate, elementRef]);
   return {
     phase: phase,
+    isMounted: isMounted,
+    onBeforeToggle: onBeforeToggle,
     onToggle: onToggle
   };
 }