react-native-screen-transitions 3.11.2 → 3.12.0

package/lib/commonjs/shared/components/overlay/variations/overlay-host.js

@@ -7,34 +7,107 @@ exports.OverlayHost = void 0;
 var _native = require("@react-navigation/native");
 var _react = require("react");
 var _reactNative = require("react-native");
-var _reactNativeReanimated = require("react-native-reanimated");
+var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
+var _snapTo = require("../../../animation/snap-to");
+var _useStack = require("../../../hooks/navigation/use-stack");
 var _animation = require("../../../providers/screen/animation");
+var _slot = require("../../../providers/screen/styles/slot.provider");
+var _retainReadyOverlayResources = require("../helpers/retain-ready-overlay-resources");
+var _useOverlaySlot = require("../hooks/use-overlay-slot");
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const OverlayHost = exports.OverlayHost = /*#__PURE__*/(0, _react.memo)(function OverlayHost({
   scene,
-  overlayScreenState
+  driverScene,
+  previousOverlayScene,
+  activity,
+  layerIndex
 }) {
-  const OverlayComponent = scene.descriptor.options.overlay;
-  const screenAnimation = (0, _animation.useScreenAnimation)();
+  const overlayAnimationStore = (0, _animation.useScreenAnimationStore)(scene.route.key);
+  const driverAnimationStore = (0, _animation.useScreenAnimationStore)(driverScene.route.key);
+  const previousOverlayAnimationStore = (0, _animation.useScreenAnimationStore)(previousOverlayScene?.route.key ?? scene.route.key);
+  const driverSlots = (0, _slot.useScreenSlots)(driverScene.route.key);
+  const overlayComponentRef = (0, _react.useRef)(scene.descriptor.options.overlay);
+  const OverlayComponent = overlayComponentRef.current;
+  const readyResourcesRef = (0, _react.useRef)(null);
+  readyResourcesRef.current = (0, _retainReadyOverlayResources.retainReadyOverlayResources)(readyResourcesRef.current, overlayAnimationStore, driverScene, driverAnimationStore, driverSlots);
+  const readyResources = readyResourcesRef.current;
+  if (!OverlayComponent || !readyResources) {
+    return null;
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(ReadyOverlayHost, {
+    scene: scene,
+    driverScene: readyResources.driverScene,
+    activity: activity,
+    layerIndex: layerIndex,
+    overlayAnimationStore: readyResources.overlayAnimationStore,
+    driverAnimationStore: readyResources.driverAnimationStore,
+    previousOverlayAnimationStore: previousOverlayScene ? previousOverlayAnimationStore : undefined,
+    driverSlots: readyResources.driverSlots,
+    OverlayComponent: OverlayComponent
+  });
+});
+function ReadyOverlayHost({
+  scene,
+  driverScene,
+  activity,
+  layerIndex,
+  overlayAnimationStore,
+  driverAnimationStore,
+  previousOverlayAnimationStore,
+  driverSlots,
+  OverlayComponent
+}) {
+  const {
+    scenes,
+    focusedIndex,
+    routeKeys,
+    routes
+  } = (0, _useStack.useStack)();
+  const descriptor = scene.descriptor;
+  const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
+  const focusedDescriptor = focusedScene?.descriptor;
+  const {
+    animatedProps,
+    animatedStyle
+  } = (0, _useOverlaySlot.useOverlaySlot)({
+    overlayAnimationStore,
+    driverAnimationStore,
+    previousOverlayAnimationStore: previousOverlayAnimationStore ?? undefined,
+    driverInterpolator: driverScene.descriptor.options.screenStyleInterpolator,
+    interpolatorReady: driverSlots.interpolatorReady,
+    isIncoming: scene.route.key === driverScene.route.key
+  });
   const relativeProgress = (0, _reactNativeReanimated.useDerivedValue)(() => {
     "worklet";
 
-    return screenAnimation.get().stackProgress;
+    overlayAnimationStore.screenInterpolatorPropsRevision.get();
+    return overlayAnimationStore.screenInterpolatorProps.get().stackProgress;
   });
   const overlayProps = (0, _react.useMemo)(() => ({
-    ...overlayScreenState,
+    route: scene.route,
+    index: routeKeys.indexOf(scene.route.key),
+    options: focusedDescriptor?.options ?? {},
+    routes,
+    focusedRoute: focusedScene?.route ?? scene.route,
+    focusedIndex,
+    meta: focusedDescriptor?.options?.meta,
+    navigation: scene.descriptor.navigation,
+    snapTo: index => {
+      (0, _snapTo.snapDescriptorToIndex)(scene.descriptor, index);
+    },
     progress: relativeProgress
-  }), [relativeProgress, overlayScreenState]);
-  if (!OverlayComponent) {
-    return null;
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Animated.View, {
-    pointerEvents: "box-none",
-    style: [styles.container, styles.floating, _reactNative.StyleSheet.absoluteFill],
+  }), [scene, focusedDescriptor?.options, focusedIndex, focusedScene?.route, relativeProgress, routeKeys, routes]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
+    animatedProps: animatedProps,
+    pointerEvents: activity === "active" ? "box-none" : "none",
+    style: [styles.container, styles.floating, _reactNative.StyleSheet.absoluteFill, {
+      zIndex: 1000 + layerIndex
+    }, animatedStyle],
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_native.NavigationContext.Provider, {
-      value: scene.descriptor.navigation,
+      value: descriptor.navigation,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_native.NavigationRouteContext.Provider, {
-        value: scene.route,
+        value: descriptor.route,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
           pointerEvents: "box-none",
           style: [_reactNative.StyleSheet.absoluteFill, styles.overlay],
@@ -45,7 +118,7 @@ const OverlayHost = exports.OverlayHost = /*#__PURE__*/(0, _react.memo)(function
       })
     })
   });
-});
+}
 const styles = _reactNative.StyleSheet.create({
   overlay: {
     zIndex: 1

package/lib/commonjs/shared/components/overlay/variations/overlay-host.js.map

@@ -1 +1 @@
-{"version":3,"names":["_native","require","_react","_reactNative","_reactNativeReanimated","_animation","_jsxRuntime","OverlayHost","exports","memo","scene","overlayScreenState","OverlayComponent","descriptor","options","overlay","screenAnimation","useScreenAnimation","relativeProgress","useDerivedValue","get","stackProgress","overlayProps","useMemo","progress","jsx","Animated","View","pointerEvents","style","styles","container","floating","StyleSheet","absoluteFill","children","NavigationContext","Provider","value","navigation","NavigationRouteContext","route","create","zIndex","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/overlay-host.tsx"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAIA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AAEA,IAAAI,UAAA,GAAAJ,OAAA;AAAyE,IAAAK,WAAA,GAAAL,OAAA;AAYlE,MAAMM,WAAW,GAAAC,OAAA,CAAAD,WAAA,gBAAG,IAAAE,WAAI,EAAC,SAASF,WAAWA,CAAC;EACpDG,KAAK;EACLC;AACiB,CAAC,EAAE;EACpB,MAAMC,gBAAgB,GAAGF,KAAK,CAACG,UAAU,CAACC,OAAO,CAACC,OAAO;EAEzD,MAAMC,eAAe,GAAG,IAAAC,6BAAkB,EAAC,CAAC;EAC5C,MAAMC,gBAAgB,GAAG,IAAAC,sCAAe,EAAC,MAAM;IAC9C,SAAS;;IACT,OAAOH,eAAe,CAACI,GAAG,CAAC,CAAC,CAACC,aAAa;EAC3C,CAAC,CAAC;EAEF,MAAMC,YAAwD,GAAG,IAAAC,cAAO,EACvE,OAAO;IACN,GAAGZ,kBAAkB;IACrBa,QAAQ,EAAEN;EACX,CAAC,CAAC,EACF,CAACA,gBAAgB,EAAEP,kBAAkB,CACtC,CAAC;EAED,IAAI,CAACC,gBAAgB,EAAE;IACtB,OAAO,IAAI;EACZ;EAEA,oBACC,IAAAN,WAAA,CAAAmB,GAAA,EAACtB,YAAA,CAAAuB,QAAQ,CAACC,IAAI;IACbC,aAAa,EAAC,UAAU;IACxBC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAED,MAAM,CAACE,QAAQ,EAAEC,uBAAU,CAACC,YAAY,CAAE;IAAAC,QAAA,eAEpE,IAAA7B,WAAA,CAAAmB,GAAA,EAACzB,OAAA,CAAAoC,iBAAiB,CAACC,QAAQ;MAACC,KAAK,EAAE5B,KAAK,CAACG,UAAU,CAAC0B,UAAkB;MAAAJ,QAAA,eACrE,IAAA7B,WAAA,CAAAmB,GAAA,EAACzB,OAAA,CAAAwC,sBAAsB,CAACH,QAAQ;QAACC,KAAK,EAAE5B,KAAK,CAAC+B,KAAM;QAAAN,QAAA,eACnD,IAAA7B,WAAA,CAAAmB,GAAA,EAACtB,YAAA,CAAAwB,IAAI;UACJC,aAAa,EAAC,UAAU;UACxBC,KAAK,EAAE,CAACI,uBAAU,CAACC,YAAY,EAAEJ,MAAM,CAACf,OAAO,CAAE;UAAAoB,QAAA,eAEjD,IAAA7B,WAAA,CAAAmB,GAAA,EAACb,gBAAgB;YAAA,GAAKU;UAAY,CAAG;QAAC,CACjC;MAAC,CACyB;IAAC,CACP;EAAC,CACf,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMQ,MAAM,GAAGG,uBAAU,CAACS,MAAM,CAAC;EAChC3B,OAAO,EAAE;IACR4B,MAAM,EAAE;EACT,CAAC;EACDZ,SAAS,EAAE;IACVa,IAAI,EAAE;EACP,CAAC;EACDZ,QAAQ,EAAE;IACTW,MAAM,EAAE;EACT;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_native","require","_react","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_snapTo","_useStack","_animation","_slot","_retainReadyOverlayResources","_useOverlaySlot","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","OverlayHost","exports","memo","scene","driverScene","previousOverlayScene","activity","layerIndex","overlayAnimationStore","useScreenAnimationStore","route","key","driverAnimationStore","previousOverlayAnimationStore","driverSlots","useScreenSlots","overlayComponentRef","useRef","descriptor","options","overlay","OverlayComponent","current","readyResourcesRef","retainReadyOverlayResources","readyResources","jsx","ReadyOverlayHost","undefined","scenes","focusedIndex","routeKeys","routes","useStack","focusedScene","length","focusedDescriptor","animatedProps","animatedStyle","useOverlaySlot","driverInterpolator","screenStyleInterpolator","interpolatorReady","isIncoming","relativeProgress","useDerivedValue","screenInterpolatorPropsRevision","screenInterpolatorProps","stackProgress","overlayProps","useMemo","index","indexOf","focusedRoute","meta","navigation","snapTo","snapDescriptorToIndex","progress","View","pointerEvents","style","styles","container","floating","StyleSheet","absoluteFill","zIndex","children","NavigationContext","Provider","value","NavigationRouteContext","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/overlay-host.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/screen-container/layers/backdrop.js

@@ -24,12 +24,14 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
   isBackdropActive
 }) {
   const {
-    dismissScreen
+    isRemovePrevented,
+    requestDismiss
   } = (0, _useNavigationHelpers.useNavigationHelpers)();
   const routeKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.currentScreenKey);
   const BackdropComponent = (0, _descriptors.useDescriptorsStore)(store => store.options.backdropComponent);
   const rawSnapPoints = (0, _descriptors.useDescriptorsStore)(store => store.options.snapPoints);
-  const canDismiss = (0, _descriptors.useDescriptorsStore)(store => store.options.gestureEnabled !== false);
+  const isGestureDismissEnabled = (0, _descriptors.useDescriptorsStore)(store => store.options.gestureEnabled !== false);
+  const canDismiss = isGestureDismissEnabled && !isRemovePrevented;
   const transitionSpec = (0, _descriptors.useDescriptorsStore)(store => store.options.transitionSpec);
   const animations = _animation.AnimationStore.getBag(routeKey);
   const {
@@ -40,13 +42,13 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
   const AnimatedBackdropComponent = (0, _react.useMemo)(() => BackdropComponent && !(0, _renderComponent.usesLayerRenderProps)(BackdropComponent) ? _reactNativeReanimated.default.createAnimatedComponent(BackdropComponent) : null, [BackdropComponent]);
   const handleBackdropPress = (0, _react.useCallback)(() => {
     if (backdropBehavior === "dismiss") {
-      dismissScreen();
+      requestDismiss();
       return;
     }
     if (backdropBehavior === "collapse") {
       // No snap points → fallback to dismiss
       if (!rawSnapPoints || rawSnapPoints.length === 0) {
-        dismissScreen();
+        requestDismiss();
         return;
       }
       const gestures = _gesture.GestureStore.getBag(routeKey);
@@ -79,12 +81,14 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
           spec,
           animations,
           targetProgress,
-          animationProgress,
-          onAnimationFinish: shouldDismiss ? dismissScreen : undefined
+          animationProgress
         });
+        if (shouldDismiss) {
+          (0, _reactNativeReanimated.runOnJS)(requestDismiss)();
+        }
       })();
     }
-  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, rawSnapPoints, canDismiss, transitionSpec, dismissScreen, routeKey]);
+  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, rawSnapPoints, canDismiss, transitionSpec, requestDismiss, routeKey]);
   const animatedBackdropStyle = (0, _styles.useSlotStyles)("backdrop");
   const animatedBackdropProps = (0, _styles.useSlotProps)("backdrop");
   const backdropPointerEvents = isBackdropActive ? "auto" : "none";

package/lib/commonjs/shared/components/screen-container/layers/backdrop.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BackdropLayer","exports","memo","backdropBehavior","isBackdropActive","dismissScreen","useNavigationHelpers","routeKey","useDescriptorsStore","store","derivations","currentScreenKey","BackdropComponent","options","backdropComponent","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","transitionSpec","animations","AnimationStore","getBag","targetProgress","animationProgress","resolvedAutoSnapPoint","SystemStore","AnimatedBackdropComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleBackdropPress","useCallback","length","gestures","GestureStore","runOnUI","resolvedSnaps","point","resolvedPoint","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","spec","open","expand","DefaultSnapSpec","close","collapse","animateToProgress","markEntering","onAnimationFinish","undefined","animatedBackdropStyle","useSlotStyles","animatedBackdropProps","useSlotProps","backdropPointerEvents","backdropStyles","StyleSheet","absoluteFill","backdropProps","jsx","Pressable","style","pointerEvents","onPress","children","animatedProps","styles","props","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BackdropLayer","exports","memo","backdropBehavior","isBackdropActive","isRemovePrevented","requestDismiss","useNavigationHelpers","routeKey","useDescriptorsStore","store","derivations","currentScreenKey","BackdropComponent","options","backdropComponent","rawSnapPoints","snapPoints","isGestureDismissEnabled","gestureEnabled","canDismiss","transitionSpec","animations","AnimationStore","getBag","targetProgress","animationProgress","resolvedAutoSnapPoint","SystemStore","AnimatedBackdropComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleBackdropPress","useCallback","length","gestures","GestureStore","runOnUI","resolvedSnaps","point","resolvedPoint","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","spec","open","expand","DefaultSnapSpec","close","collapse","animateToProgress","markEntering","runOnJS","animatedBackdropStyle","useSlotStyles","animatedBackdropProps","useSlotProps","backdropPointerEvents","backdropStyles","StyleSheet","absoluteFill","backdropProps","jsx","Pressable","style","pointerEvents","onPress","undefined","children","animatedProps","styles","props","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldInterceptClose = exports.doesNavigatorOwnCloseAction = void 0;
+const containsRouteKey = (routes, routeKey) => routes.some(route => route.key === routeKey || (route.state ? containsRouteKey(route.state.routes, routeKey) : false));
+const doesNavigatorOwnCloseAction = ({
+  state,
+  action
+}) => {
+  if (typeof action.target === "string") {
+    return action.target === state.key;
+  }
+  if (typeof action.source === "string") {
+    return containsRouteKey(state.routes, action.source);
+  }
+  return true;
+};
+
+/** Only the focused removable route owns a stack close transition. */
+exports.doesNavigatorOwnCloseAction = doesNavigatorOwnCloseAction;
+const shouldInterceptClose = ({
+  enabled,
+  ownsAction,
+  ancestorDismissing,
+  routeIndex,
+  focusedIndex
+}) => enabled && ownsAction && !ancestorDismissing && routeIndex > 0 && routeIndex === focusedIndex;
+exports.shouldInterceptClose = shouldInterceptClose;
+//# sourceMappingURL=close-interception-rules.js.map

package/lib/commonjs/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["containsRouteKey","routes","routeKey","some","route","key","state","doesNavigatorOwnCloseAction","action","target","source","exports","shouldInterceptClose","enabled","ownsAction","ancestorDismissing","routeIndex","focusedIndex"],"sourceRoot":"../../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.ts"],"mappings":";;;;;;AAuBA,MAAMA,gBAAgB,GAAGA,CACxBC,MAA6B,EAC7BC,QAAgB,KAEhBD,MAAM,CAACE,IAAI,CACTC,KAAK,IACLA,KAAK,CAACC,GAAG,KAAKH,QAAQ,KACrBE,KAAK,CAACE,KAAK,GAAGN,gBAAgB,CAACI,KAAK,CAACE,KAAK,CAACL,MAAM,EAAEC,QAAQ,CAAC,GAAG,KAAK,CACvE,CAAC;AAEK,MAAMK,2BAA2B,GAAGA,CAAC;EAC3CD,KAAK;EACLE;AAID,CAAC,KAAc;EACd,IAAI,OAAOA,MAAM,CAACC,MAAM,KAAK,QAAQ,EAAE;IACtC,OAAOD,MAAM,CAACC,MAAM,KAAKH,KAAK,CAACD,GAAG;EACnC;EAEA,IAAI,OAAOG,MAAM,CAACE,MAAM,KAAK,QAAQ,EAAE;IACtC,OAAOV,gBAAgB,CAACM,KAAK,CAACL,MAAM,EAAEO,MAAM,CAACE,MAAM,CAAC;EACrD;EAEA,OAAO,IAAI;AACZ,CAAC;;AAED;AAAAC,OAAA,CAAAJ,2BAAA,GAAAA,2BAAA;AACO,MAAMK,oBAAoB,GAAGA,CAAC;EACpCC,OAAO;EACPC,UAAU;EACVC,kBAAkB;EAClBC,UAAU;EACVC;AACuB,CAAC,KACxBJ,OAAO,IACPC,UAAU,IACV,CAACC,kBAAkB,IACnBC,UAAU,GAAG,CAAC,IACdA,UAAU,KAAKC,YAAY;AAACN,OAAA,CAAAC,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-completion.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useCloseCompletion = void 0;
+var _reactNativeReanimated = require("react-native-reanimated");
+const useCloseCompletion = ({
+  closing,
+  animationProgress,
+  onComplete
+}) => {
+  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
+    "worklet";
+
+    return !!closing.get() && animationProgress.get() <= 0;
+  }, (complete, previouslyComplete) => {
+    "worklet";
+
+    if (complete && !previouslyComplete) {
+      (0, _reactNativeReanimated.runOnJS)(onComplete)();
+    }
+  });
+};
+exports.useCloseCompletion = useCloseCompletion;
+//# sourceMappingURL=use-close-completion.js.map

package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-completion.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNativeReanimated","require","useCloseCompletion","closing","animationProgress","onComplete","useAnimatedReaction","get","complete","previouslyComplete","runOnJS","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-close-completion.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAMO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,iBAAiB;EACjBC;AAKD,CAAC,KAAK;EACL,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,CAAC,CAACH,OAAO,CAACI,GAAG,CAAC,CAAC,IAAIH,iBAAiB,CAACG,GAAG,CAAC,CAAC,IAAI,CAAC;EACvD,CAAC,EACD,CAACC,QAAQ,EAAEC,kBAAkB,KAAK;IACjC,SAAS;;IACT,IAAID,QAAQ,IAAI,CAACC,kBAAkB,EAAE;MACpC,IAAAC,8BAAO,EAACL,UAAU,CAAC,CAAC,CAAC;IACtB;EACD,CACD,CAAC;AACF,CAAC;AAACM,OAAA,CAAAT,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-transition-intent.js

@@ -5,119 +5,96 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useCloseTransitionIntent = useCloseTransitionIntent;
 var _react = require("react");
+var _useNavigationHelpers = require("../../../hooks/navigation/use-navigation-helpers");
 var _useStableCallback = _interopRequireDefault(require("../../../hooks/use-stable-callback"));
+var _hasTransitionsEnabled = require("../../../providers/screen/animation/helpers/has-transitions-enabled");
 var _descriptors = require("../../../providers/screen/descriptors");
 var _blankStack = require("../../../providers/stack/blank-stack.provider");
 var _core = require("../../../providers/stack/core.provider");
 var _gesture = require("../../../stores/gesture.store");
-var _system = require("../../../stores/system.store");
 var _stack = require("../../../types/stack.types");
+var _closeActionReplay = require("../../../utils/navigation/close-action-replay");
+var _closeInterceptionRules = require("./helpers/close-interception-rules");
 var _resetStoresForScreen = require("./helpers/reset-stores-for-screen");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: STACK_TYPE is stable per navigator */
-
-const useBlankStackClose = ({
-  current,
-  requestLifecycleTransition,
-  resetStores
-}) => {
+function useCloseTransitionIntent(current) {
+  const routeKey = current.route.key;
+  const {
+    STACK_TYPE: stackType,
+    TRANSITIONS_ALWAYS_ON: transitionsAlwaysOn
+  } = (0, _core.useStackCoreStore)(store => store.flags);
   const handleCloseRoute = (0, _blankStack.useBlankStackStore)(store => store?.handleCloseRoute);
-  const isClosing = (0, _blankStack.useBlankStackStore)(store => store?.scenesByKey[current.route.key]?.activity === "closing");
-  (0, _react.useLayoutEffect)(() => {
-    if (!isClosing) {
-      return;
-    }
-    requestLifecycleTransition(_system.LifecycleTransitionRequestKind.BlankStackClose, 0);
-  }, [isClosing, requestLifecycleTransition]);
-  const handleBlankStackCloseEnd = (0, _useStableCallback.default)(finished => {
-    if (!finished) return;
-    if (!handleCloseRoute) {
-      throw new Error("Blank stack close handler was not found.");
-    }
-    handleCloseRoute({
-      route: current.route
-    });
-    requestAnimationFrame(() => {
-      resetStores();
-    });
-  });
-  return {
-    handleBlankStackCloseEnd
-  };
-};
-
-/**
- * Native stack close - listens to beforeRemove navigation event.
- */
-const useNativeStackClose = ({
-  current,
-  requestLifecycleTransition,
-  resetStores
-}) => {
-  const parentScreenKey = (0, _descriptors.useDescriptorsStore)(store => store.derivations.parentScreenKey);
+  const isBlankStackClosing = (0, _blankStack.useBlankStackStore)(store => store?.scenesByKey[routeKey]?.activity === "closing");
+  const ancestorKeys = (0, _descriptors.useDescriptorsStore)(store => store.derivations.ancestorKeys);
+  const parentScreenKey = ancestorKeys[0];
+  const {
+    dismissScreen,
+    requestDismiss
+  } = (0, _useNavigationHelpers.useNavigationHelpers)();
   const pendingActionRef = (0, _react.useRef)(null);
   const nearestAncestorDismissing = (0, _react.useMemo)(() => {
     if (!parentScreenKey) return null;
     return _gesture.GestureStore.peekBag(parentScreenKey)?.dismissing ?? null;
   }, [parentScreenKey]);
-  const handleNativeCloseEnd = (0, _useStableCallback.default)(finished => {
-    if (!finished || !pendingActionRef.current) {
-      pendingActionRef.current = null;
-      return;
+  (0, _react.useLayoutEffect)(() => {
+    if (isBlankStackClosing) {
+      requestDismiss();
     }
-    current.navigation.dispatch(pendingActionRef.current);
+  }, [isBlankStackClosing, requestDismiss]);
+  const completeClose = (0, _useStableCallback.default)(() => {
+    const pendingAction = pendingActionRef.current;
     pendingActionRef.current = null;
-    requestAnimationFrame(() => {
-      resetStores();
-    });
+    if (pendingAction) {
+      (0, _closeActionReplay.dispatchCloseAction)(pendingAction, action => {
+        current.navigation.dispatch(action);
+      });
+    } else if (stackType !== _stack.StackType.NATIVE && handleCloseRoute) {
+      handleCloseRoute({
+        route: current.route
+      });
+    } else {
+      dismissScreen();
+    }
+    (0, _resetStoresForScreen.resetStoresForScreen)(routeKey);
   });
-  const handleBeforeRemove = (0, _useStableCallback.default)(e => {
-    const options = current.options;
-    const isEnabled = options.enableTransitions;
-    const navigation = current.navigation;
-    const routeKey = current.route.key;
-    const state = navigation.getState();
+  const handleBeforeRemove = (0, _useStableCallback.default)(event => {
+    if ((0, _closeActionReplay.isCloseActionReplay)(event.data.action)) {
+      return;
+    }
+    const state = current.navigation.getState();
     const routeIndex = state.routes.findIndex(route => route.key === routeKey);
-    const isFirstScreen = routeIndex <= 0;
-    if (!isEnabled || nearestAncestorDismissing?.get() || isFirstScreen) {
-      resetStores();
+    const action = event.data.action;
+    const ownsAction = (0, _closeInterceptionRules.doesNavigatorOwnCloseAction)({
+      state,
+      action
+    });
+    const shouldIntercept = (0, _closeInterceptionRules.shouldInterceptClose)({
+      enabled: (0, _hasTransitionsEnabled.hasTransitionsEnabled)(current.options, transitionsAlwaysOn),
+      ownsAction,
+      ancestorDismissing: !!nearestAncestorDismissing?.get(),
+      routeIndex,
+      focusedIndex: state.index
+    });
+    if (!shouldIntercept) {
+      return;
+    }
+    pendingActionRef.current ??= event.data.action;
+    if (!requestDismiss()) {
+      pendingActionRef.current = null;
       return;
     }
-    e.preventDefault();
-    pendingActionRef.current = e.data.action;
-    requestLifecycleTransition(_system.LifecycleTransitionRequestKind.NativeClose, 0);
+    event.preventDefault();
   });
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: navigation listener should only rebind when the navigator instance changes
   (0, _react.useLayoutEffect)(() => {
+    if (stackType !== _stack.StackType.NATIVE) {
+      return;
+    }
     return current.navigation.addListener?.("beforeRemove", handleBeforeRemove);
-  }, [current.navigation]);
+  }, [current.navigation, stackType]);
   return {
-    handleNativeCloseEnd
-  };
-};
-
-/**
- * Handles close transition intent and returns finish callbacks for cleanup.
- */
-function useCloseTransitionIntent(current, system) {
-  const routeKey = current.route.key;
-  const stackType = (0, _core.useStackCoreStore)(store => store.flags.STACK_TYPE);
-  const isNativeStack = stackType === _stack.StackType.NATIVE;
-  const {
-    requestLifecycleTransition
-  } = system.actions;
-  const resetStores = (0, _useStableCallback.default)(() => {
-    (0, _resetStoresForScreen.resetStoresForScreen)(routeKey);
-  });
-  const closeParams = {
-    current,
-    requestLifecycleTransition,
-    resetStores
+    completeClose
   };
-  if (isNativeStack) {
-    return useNativeStackClose(closeParams);
-  }
-  return useBlankStackClose(closeParams);
 }
 //# sourceMappingURL=use-close-transition-intent.js.map

package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-transition-intent.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_useStableCallback","_interopRequireDefault","_descriptors","_blankStack","_core","_gesture","_system","_stack","_resetStoresForScreen","e","__esModule","default","useBlankStackClose","current","requestLifecycleTransition","resetStores","handleCloseRoute","useBlankStackStore","store","isClosing","scenesByKey","route","key","activity","useLayoutEffect","LifecycleTransitionRequestKind","BlankStackClose","handleBlankStackCloseEnd","useStableCallback","finished","Error","requestAnimationFrame","useNativeStackClose","parentScreenKey","useDescriptorsStore","derivations","pendingActionRef","useRef","nearestAncestorDismissing","useMemo","GestureStore","peekBag","dismissing","handleNativeCloseEnd","navigation","dispatch","handleBeforeRemove","options","isEnabled","enableTransitions","routeKey","state","getState","routeIndex","routes","findIndex","isFirstScreen","get","preventDefault","data","action","NativeClose","addListener","useCloseTransitionIntent","system","stackType","useStackCoreStore","flags","STACK_TYPE","isNativeStack","StackType","NATIVE","actions","resetStoresForScreen","closeParams"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-close-transition-intent.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_useNavigationHelpers","_useStableCallback","_interopRequireDefault","_hasTransitionsEnabled","_descriptors","_blankStack","_core","_gesture","_stack","_closeActionReplay","_closeInterceptionRules","_resetStoresForScreen","e","__esModule","default","useCloseTransitionIntent","current","routeKey","route","key","STACK_TYPE","stackType","TRANSITIONS_ALWAYS_ON","transitionsAlwaysOn","useStackCoreStore","store","flags","handleCloseRoute","useBlankStackStore","isBlankStackClosing","scenesByKey","activity","ancestorKeys","useDescriptorsStore","derivations","parentScreenKey","dismissScreen","requestDismiss","useNavigationHelpers","pendingActionRef","useRef","nearestAncestorDismissing","useMemo","GestureStore","peekBag","dismissing","useLayoutEffect","completeClose","useStableCallback","pendingAction","dispatchCloseAction","action","navigation","dispatch","StackType","NATIVE","resetStoresForScreen","handleBeforeRemove","event","isCloseActionReplay","data","state","getState","routeIndex","routes","findIndex","ownsAction","doesNavigatorOwnCloseAction","shouldIntercept","shouldInterceptClose","enabled","hasTransitionsEnabled","options","ancestorDismissing","get","focusedIndex","index","preventDefault","addListener"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-close-transition-intent.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-transition-start-controller.js

@@ -11,9 +11,7 @@ var _animateToProgress = require("../../../utils/animation/animate-to-progress")
 const useTransitionStartController = ({
   current,
   animations,
-  system,
-  onBlankStackCloseFinish,
-  onNativeCloseFinish
+  system
 }) => {
   const {
     targetProgress,
@@ -41,7 +39,6 @@ const useTransitionStartController = ({
     if (blockCount > 0) {
       return;
     }
-    const onAnimationFinish = kind === _system.LifecycleTransitionRequestKind.BlankStackClose ? onBlankStackCloseFinish : kind === _system.LifecycleTransitionRequestKind.NativeClose ? onNativeCloseFinish : undefined;
     (0, _animateToProgress.animateToProgress)({
       target,
       spec: transitionSpec,
@@ -49,7 +46,6 @@ const useTransitionStartController = ({
       animations,
       targetProgress,
       animationProgress,
-      onAnimationFinish,
       isDragging
     });
     clearLifecycleTransitionRequest();

package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-transition-start-controller.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeReanimated","require","_gesture","_system","_animateToProgress","useTransitionStartController","current","animations","system","onBlankStackCloseFinish","onNativeCloseFinish","targetProgress","animationProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","isDragging","GestureStore","getValue","route","key","useAnimatedReaction","get","next","kind","target","blockCount","LifecycleTransitionRequestKind","None","onAnimationFinish","BlankStackClose","NativeClose","undefined","animateToProgress","spec","emitWillAnimate","Open","entering","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAIA,IAAAG,kBAAA,GAAAH,OAAA;AAEO,MAAMI,4BAA4B,GAAGA,CAAC;EAC5CC,OAAO;EACPC,UAAU;EACVC,MAAM;EACNC,uBAAuB;EACvBC;AAOD,CAAC,KAAK;EACL,MAAM;IACLC,cAAc;IACdC,iBAAiB;IACjBC,2BAA2B;IAC3BC,6BAA6B;IAC7BC;EACD,CAAC,GAAGP,MAAM;EACV,MAAM;IAAEQ;EAAgC,CAAC,GAAGR,MAAM,CAACS,OAAO;EAC1D,MAAMC,cAAc,GAAGZ,OAAO,CAACa,OAAO,CAACD,cAAc;EACrD,MAAME,UAAU,GAAGC,qBAAY,CAACC,QAAQ,CAAChB,OAAO,CAACiB,KAAK,CAACC,GAAG,EAAE,UAAU,CAAC;EAEvE,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNZ,2BAA2B,CAACa,GAAG,CAAC,CAAC,EACjCZ,6BAA6B,CAACY,GAAG,CAAC,CAAC,EACnCX,+BAA+B,CAACW,GAAG,CAAC,CAAC,CACrC;EACF,CAAC,EACAC,IAAI,IAAK;IACT,SAAS;;IACT,MAAM,CAACC,IAAI,EAAEC,MAAM,EAAEC,UAAU,CAAC,GAAGH,IAAI;IAEvC,IAAIC,IAAI,KAAKG,sCAA8B,CAACC,IAAI,EAAE;MACjD;IACD;IAEA,IAAIF,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEA,MAAMG,iBAAiB,GACtBL,IAAI,KAAKG,sCAA8B,CAACG,eAAe,GACpDzB,uBAAuB,GACvBmB,IAAI,KAAKG,sCAA8B,CAACI,WAAW,GAClDzB,mBAAmB,GACnB0B,SAAS;IAEd,IAAAC,oCAAiB,EAAC;MACjBR,MAAM;MACNS,IAAI,EAAEpB,cAAc;MACpBqB,eAAe,EACdX,IAAI,KAAKG,sCAA8B,CAACS,IAAI,IAC5C,CAACjC,UAAU,CAACkC,QAAQ,CAACf,GAAG,CAAC,CAAC;MAC3BnB,UAAU;MACVI,cAAc;MACdC,iBAAiB;MACjBqB,iBAAiB;MACjBb;IACD,CAAC,CAAC;IAEFJ,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC;AAAC0B,OAAA,CAAArC,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeReanimated","require","_gesture","_system","_animateToProgress","useTransitionStartController","current","animations","system","targetProgress","animationProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","isDragging","GestureStore","getValue","route","key","useAnimatedReaction","get","next","kind","target","blockCount","LifecycleTransitionRequestKind","None","animateToProgress","spec","emitWillAnimate","Open","entering","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAIA,IAAAG,kBAAA,GAAAH,OAAA;AAEO,MAAMI,4BAA4B,GAAGA,CAAC;EAC5CC,OAAO;EACPC,UAAU;EACVC;AAKD,CAAC,KAAK;EACL,MAAM;IACLC,cAAc;IACdC,iBAAiB;IACjBC,2BAA2B;IAC3BC,6BAA6B;IAC7BC;EACD,CAAC,GAAGL,MAAM;EACV,MAAM;IAAEM;EAAgC,CAAC,GAAGN,MAAM,CAACO,OAAO;EAC1D,MAAMC,cAAc,GAAGV,OAAO,CAACW,OAAO,CAACD,cAAc;EACrD,MAAME,UAAU,GAAGC,qBAAY,CAACC,QAAQ,CAACd,OAAO,CAACe,KAAK,CAACC,GAAG,EAAE,UAAU,CAAC;EAEvE,IAAAC,0CAAmB,EAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNZ,2BAA2B,CAACa,GAAG,CAAC,CAAC,EACjCZ,6BAA6B,CAACY,GAAG,CAAC,CAAC,EACnCX,+BAA+B,CAACW,GAAG,CAAC,CAAC,CACrC;EACF,CAAC,EACAC,IAAI,IAAK;IACT,SAAS;;IACT,MAAM,CAACC,IAAI,EAAEC,MAAM,EAAEC,UAAU,CAAC,GAAGH,IAAI;IAEvC,IAAIC,IAAI,KAAKG,sCAA8B,CAACC,IAAI,EAAE;MACjD;IACD;IAEA,IAAIF,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEA,IAAAG,oCAAiB,EAAC;MACjBJ,MAAM;MACNK,IAAI,EAAEhB,cAAc;MACpBiB,eAAe,EACdP,IAAI,KAAKG,sCAA8B,CAACK,IAAI,IAC5C,CAAC3B,UAAU,CAAC4B,QAAQ,CAACX,GAAG,CAAC,CAAC;MAC3BjB,UAAU;MACVE,cAAc;MACdC,iBAAiB;MACjBQ;IACD,CAAC,CAAC;IAEFJ,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC;AAACsB,OAAA,CAAA/B,4BAAA,GAAAA,4BAAA","ignoreList":[]}

package/lib/commonjs/shared/components/screen-lifecycle/index.js

@@ -8,6 +8,7 @@ var _descriptors = require("../../providers/screen/descriptors");
 var _animation = require("../../stores/animation.store");
 var _system = require("../../stores/system.store");
 var _useScreenHistory = require("./hooks/history/use-screen-history");
+var _useCloseCompletion = require("./hooks/use-close-completion");
 var _useCloseTransitionIntent = require("./hooks/use-close-transition-intent");
 var _useOpenTransitionIntent = require("./hooks/use-open-transition-intent");
 var _useTransitionStartController = require("./hooks/use-transition-start-controller");
@@ -23,16 +24,18 @@ const ScreenLifecycle = ({
   const animations = _animation.AnimationStore.getBag(current.route.key);
   const system = _system.SystemStore.getBag(current.route.key);
   const {
-    handleBlankStackCloseEnd,
-    handleNativeCloseEnd
-  } = (0, _useCloseTransitionIntent.useCloseTransitionIntent)(current, system);
+    completeClose
+  } = (0, _useCloseTransitionIntent.useCloseTransitionIntent)(current);
   (0, _useOpenTransitionIntent.useOpenTransitionIntent)(current, animations, system);
   (0, _useTransitionStartController.useTransitionStartController)({
     current,
     animations,
-    system,
-    onBlankStackCloseFinish: handleBlankStackCloseEnd,
-    onNativeCloseFinish: handleNativeCloseEnd
+    system
+  });
+  (0, _useCloseCompletion.useCloseCompletion)({
+    closing: animations.closing,
+    animationProgress: system.animationProgress,
+    onComplete: completeClose
   });
   (0, _useScreenHistory.useScreenHistory)(current, previous, animations);
   return children;