react-native-screen-transitions 3.11.2 → 3.11.3

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

@@ -2,7 +2,7 @@
 
 import { memo, useCallback, useMemo } from "react";
 import { Pressable, StyleSheet } from "react-native";
-import Animated, { runOnUI } from "react-native-reanimated";
+import Animated, { runOnJS, runOnUI } from "react-native-reanimated";
 import { DefaultSnapSpec } from "../../../configs/specs";
 import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
@@ -19,12 +19,14 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
   isBackdropActive
 }) {
   const {
-    dismissScreen
+    isRemovePrevented,
+    requestDismiss
   } = useNavigationHelpers();
   const routeKey = useDescriptorsStore(store => store.derivations.currentScreenKey);
   const BackdropComponent = useDescriptorsStore(store => store.options.backdropComponent);
   const rawSnapPoints = useDescriptorsStore(store => store.options.snapPoints);
-  const canDismiss = useDescriptorsStore(store => store.options.gestureEnabled !== false);
+  const isGestureDismissEnabled = useDescriptorsStore(store => store.options.gestureEnabled !== false);
+  const canDismiss = isGestureDismissEnabled && !isRemovePrevented;
   const transitionSpec = useDescriptorsStore(store => store.options.transitionSpec);
   const animations = AnimationStore.getBag(routeKey);
   const {
@@ -35,13 +37,13 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
   const AnimatedBackdropComponent = useMemo(() => BackdropComponent && !usesLayerRenderProps(BackdropComponent) ? Animated.createAnimatedComponent(BackdropComponent) : null, [BackdropComponent]);
   const handleBackdropPress = 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 = GestureStore.getBag(routeKey);
@@ -74,12 +76,14 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
           spec,
           animations,
           targetProgress,
-          animationProgress,
-          onAnimationFinish: shouldDismiss ? dismissScreen : undefined
+          animationProgress
         });
+        if (shouldDismiss) {
+          runOnJS(requestDismiss)();
+        }
       })();
     }
-  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, rawSnapPoints, canDismiss, transitionSpec, dismissScreen, routeKey]);
+  }, [animations, targetProgress, animationProgress, resolvedAutoSnapPoint, backdropBehavior, rawSnapPoints, canDismiss, transitionSpec, requestDismiss, routeKey]);
   const animatedBackdropStyle = useSlotStyles("backdrop");
   const animatedBackdropProps = useSlotProps("backdrop");
   const backdropPointerEvents = isBackdropActive ? "auto" : "none";

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

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","runOnUI","DefaultSnapSpec","useNavigationHelpers","useDescriptorsStore","useSlotProps","useSlotStyles","AnimationStore","GestureStore","SystemStore","animateToProgress","findCollapseTarget","usesLayerRenderProps","jsx","_jsx","BackdropLayer","backdropBehavior","isBackdropActive","dismissScreen","routeKey","store","derivations","currentScreenKey","BackdropComponent","options","backdropComponent","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","transitionSpec","animations","getBag","targetProgress","animationProgress","resolvedAutoSnapPoint","AnimatedBackdropComponent","createAnimatedComponent","handleBackdropPress","length","gestures","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","transitionProgress","dismissing","set","spec","open","expand","close","collapse","markEntering","onAnimationFinish","undefined","animatedBackdropStyle","animatedBackdropProps","backdropPointerEvents","backdropStyles","absoluteFill","backdropProps","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":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","runOnJS","runOnUI","DefaultSnapSpec","useNavigationHelpers","useDescriptorsStore","useSlotProps","useSlotStyles","AnimationStore","GestureStore","SystemStore","animateToProgress","findCollapseTarget","usesLayerRenderProps","jsx","_jsx","BackdropLayer","backdropBehavior","isBackdropActive","isRemovePrevented","requestDismiss","routeKey","store","derivations","currentScreenKey","BackdropComponent","options","backdropComponent","rawSnapPoints","snapPoints","isGestureDismissEnabled","gestureEnabled","canDismiss","transitionSpec","animations","getBag","targetProgress","animationProgress","resolvedAutoSnapPoint","AnimatedBackdropComponent","createAnimatedComponent","handleBackdropPress","length","gestures","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","transitionProgress","dismissing","set","spec","open","expand","close","collapse","markEntering","animatedBackdropStyle","animatedBackdropProps","backdropPointerEvents","backdropStyles","absoluteFill","backdropProps","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/module/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.js

@@ -0,0 +1,25 @@
+"use strict";
+
+const containsRouteKey = (routes, routeKey) => routes.some(route => route.key === routeKey || (route.state ? containsRouteKey(route.state.routes, routeKey) : false));
+export 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. */
+export const shouldInterceptClose = ({
+  enabled,
+  ownsAction,
+  ancestorDismissing,
+  routeIndex,
+  focusedIndex
+}) => enabled && ownsAction && !ancestorDismissing && routeIndex > 0 && routeIndex === focusedIndex;
+//# sourceMappingURL=close-interception-rules.js.map

package/lib/module/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","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;AAEF,OAAO,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;AACA,OAAO,MAAMC,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","ignoreList":[]}

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

@@ -0,0 +1,21 @@
+"use strict";
+
+import { runOnJS, useAnimatedReaction } from "react-native-reanimated";
+export const useCloseCompletion = ({
+  closing,
+  animationProgress,
+  onComplete
+}) => {
+  useAnimatedReaction(() => {
+    "worklet";
+
+    return !!closing.get() && animationProgress.get() <= 0;
+  }, (complete, previouslyComplete) => {
+    "worklet";
+
+    if (complete && !previouslyComplete) {
+      runOnJS(onComplete)();
+    }
+  });
+};
+//# sourceMappingURL=use-close-completion.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["runOnJS","useAnimatedReaction","useCloseCompletion","closing","animationProgress","onComplete","get","complete","previouslyComplete"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-close-completion.ts"],"mappings":";;AAAA,SACCA,OAAO,EAEPC,mBAAmB,QACb,yBAAyB;AAEhC,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC,OAAO;EACPC,iBAAiB;EACjBC;AAKD,CAAC,KAAK;EACLJ,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAO,CAAC,CAACE,OAAO,CAACG,GAAG,CAAC,CAAC,IAAIF,iBAAiB,CAACE,GAAG,CAAC,CAAC,IAAI,CAAC;EACvD,CAAC,EACD,CAACC,QAAQ,EAAEC,kBAAkB,KAAK;IACjC,SAAS;;IACT,IAAID,QAAQ,IAAI,CAACC,kBAAkB,EAAE;MACpCR,OAAO,CAACK,UAAU,CAAC,CAAC,CAAC;IACtB;EACD,CACD,CAAC;AACF,CAAC","ignoreList":[]}

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

@@ -1,85 +1,84 @@
 "use strict";
 
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: STACK_TYPE is stable per navigator */
 import { useLayoutEffect, useMemo, useRef } from "react";
+import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
 import useStableCallback from "../../../hooks/use-stable-callback";
+import { hasTransitionsEnabled } from "../../../providers/screen/animation/helpers/has-transitions-enabled";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
 import { useStackCoreStore } from "../../../providers/stack/core.provider";
 import { GestureStore } from "../../../stores/gesture.store";
-import { LifecycleTransitionRequestKind } from "../../../stores/system.store";
 import { StackType } from "../../../types/stack.types";
+import { dispatchCloseAction, isCloseActionReplay } from "../../../utils/navigation/close-action-replay";
+import { doesNavigatorOwnCloseAction, shouldInterceptClose } from "./helpers/close-interception-rules";
 import { resetStoresForScreen } from "./helpers/reset-stores-for-screen";
-const useBlankStackClose = ({
-  current,
-  requestLifecycleTransition,
-  resetStores
-}) => {
+export function useCloseTransitionIntent(current) {
+  const routeKey = current.route.key;
+  const {
+    STACK_TYPE: stackType,
+    TRANSITIONS_ALWAYS_ON: transitionsAlwaysOn
+  } = useStackCoreStore(store => store.flags);
   const handleCloseRoute = useBlankStackStore(store => store?.handleCloseRoute);
-  const isClosing = useBlankStackStore(store => store?.scenesByKey[current.route.key]?.activity === "closing");
-  useLayoutEffect(() => {
-    if (!isClosing) {
-      return;
-    }
-    requestLifecycleTransition(LifecycleTransitionRequestKind.BlankStackClose, 0);
-  }, [isClosing, requestLifecycleTransition]);
-  const handleBlankStackCloseEnd = useStableCallback(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 = useDescriptorsStore(store => store.derivations.parentScreenKey);
+  const isBlankStackClosing = useBlankStackStore(store => store?.scenesByKey[routeKey]?.activity === "closing");
+  const ancestorKeys = useDescriptorsStore(store => store.derivations.ancestorKeys);
+  const parentScreenKey = ancestorKeys[0];
+  const {
+    dismissScreen,
+    requestDismiss
+  } = useNavigationHelpers();
   const pendingActionRef = useRef(null);
   const nearestAncestorDismissing = useMemo(() => {
     if (!parentScreenKey) return null;
     return GestureStore.peekBag(parentScreenKey)?.dismissing ?? null;
   }, [parentScreenKey]);
-  const handleNativeCloseEnd = useStableCallback(finished => {
-    if (!finished || !pendingActionRef.current) {
-      pendingActionRef.current = null;
-      return;
+  useLayoutEffect(() => {
+    if (isBlankStackClosing) {
+      requestDismiss();
     }
-    current.navigation.dispatch(pendingActionRef.current);
+  }, [isBlankStackClosing, requestDismiss]);
+  const completeClose = useStableCallback(() => {
+    const pendingAction = pendingActionRef.current;
     pendingActionRef.current = null;
-    requestAnimationFrame(() => {
-      resetStores();
-    });
+    if (pendingAction) {
+      dispatchCloseAction(pendingAction, action => {
+        current.navigation.dispatch(action);
+      });
+    } else if (stackType !== StackType.NATIVE && handleCloseRoute) {
+      handleCloseRoute({
+        route: current.route
+      });
+    } else {
+      dismissScreen();
+    }
+    resetStoresForScreen(routeKey);
   });
-  const handleBeforeRemove = useStableCallback(e => {
-    const options = current.options;
-    const isEnabled = options.enableTransitions;
-    const navigation = current.navigation;
-    const routeKey = current.route.key;
-    const state = navigation.getState();
+  const handleBeforeRemove = useStableCallback(event => {
+    if (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 = doesNavigatorOwnCloseAction({
+      state,
+      action
+    });
+    const shouldIntercept = shouldInterceptClose({
+      enabled: 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(LifecycleTransitionRequestKind.NativeClose, 0);
+    event.preventDefault();
   });
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: navigation listener should only rebind when the navigator instance changes
@@ -87,31 +86,7 @@ const useNativeStackClose = ({
     return current.navigation.addListener?.("beforeRemove", handleBeforeRemove);
   }, [current.navigation]);
   return {
-    handleNativeCloseEnd
-  };
-};
-
-/**
- * Handles close transition intent and returns finish callbacks for cleanup.
- */
-export function useCloseTransitionIntent(current, system) {
-  const routeKey = current.route.key;
-  const stackType = useStackCoreStore(store => store.flags.STACK_TYPE);
-  const isNativeStack = stackType === StackType.NATIVE;
-  const {
-    requestLifecycleTransition
-  } = system.actions;
-  const resetStores = useStableCallback(() => {
-    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/module/shared/components/screen-lifecycle/hooks/use-close-transition-intent.js.map

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

@@ -7,9 +7,7 @@ import { animateToProgress } from "../../../utils/animation/animate-to-progress"
 export const useTransitionStartController = ({
   current,
   animations,
-  system,
-  onBlankStackCloseFinish,
-  onNativeCloseFinish
+  system
 }) => {
   const {
     targetProgress,
@@ -37,7 +35,6 @@ export const useTransitionStartController = ({
     if (blockCount > 0) {
       return;
     }
-    const onAnimationFinish = kind === LifecycleTransitionRequestKind.BlankStackClose ? onBlankStackCloseFinish : kind === LifecycleTransitionRequestKind.NativeClose ? onNativeCloseFinish : undefined;
     animateToProgress({
       target,
       spec: transitionSpec,
@@ -45,7 +42,6 @@ export const useTransitionStartController = ({
       animations,
       targetProgress,
       animationProgress,
-      onAnimationFinish,
       isDragging
     });
     clearLifecycleTransitionRequest();

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

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","GestureStore","LifecycleTransitionRequestKind","animateToProgress","useTransitionStartController","current","animations","system","onBlankStackCloseFinish","onNativeCloseFinish","targetProgress","animationProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","isDragging","getValue","route","key","get","next","kind","target","blockCount","None","onAnimationFinish","BlankStackClose","NativeClose","undefined","spec","emitWillAnimate","Open","entering"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAG7D,SAASC,YAAY,QAAQ,+BAA+B;AAC5D,SACCC,8BAA8B,QAExB,8BAA8B;AACrC,SAASC,iBAAiB,QAAQ,8CAA8C;AAEhF,OAAO,MAAMC,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,GAAGlB,YAAY,CAACmB,QAAQ,CAACf,OAAO,CAACgB,KAAK,CAACC,GAAG,EAAE,UAAU,CAAC;EAEvEtB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNY,2BAA2B,CAACW,GAAG,CAAC,CAAC,EACjCV,6BAA6B,CAACU,GAAG,CAAC,CAAC,EACnCT,+BAA+B,CAACS,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,KAAKvB,8BAA8B,CAAC0B,IAAI,EAAE;MACjD;IACD;IAEA,IAAID,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEA,MAAME,iBAAiB,GACtBJ,IAAI,KAAKvB,8BAA8B,CAAC4B,eAAe,GACpDtB,uBAAuB,GACvBiB,IAAI,KAAKvB,8BAA8B,CAAC6B,WAAW,GAClDtB,mBAAmB,GACnBuB,SAAS;IAEd7B,iBAAiB,CAAC;MACjBuB,MAAM;MACNO,IAAI,EAAEhB,cAAc;MACpBiB,eAAe,EACdT,IAAI,KAAKvB,8BAA8B,CAACiC,IAAI,IAC5C,CAAC7B,UAAU,CAAC8B,QAAQ,CAACb,GAAG,CAAC,CAAC;MAC3BjB,UAAU;MACVI,cAAc;MACdC,iBAAiB;MACjBkB,iBAAiB;MACjBV;IACD,CAAC,CAAC;IAEFJ,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","GestureStore","LifecycleTransitionRequestKind","animateToProgress","useTransitionStartController","current","animations","system","targetProgress","animationProgress","pendingLifecycleRequestKind","pendingLifecycleRequestTarget","pendingLifecycleStartBlockCount","clearLifecycleTransitionRequest","actions","transitionSpec","options","isDragging","getValue","route","key","get","next","kind","target","blockCount","None","spec","emitWillAnimate","Open","entering"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-lifecycle/hooks/use-transition-start-controller.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,yBAAyB;AAG7D,SAASC,YAAY,QAAQ,+BAA+B;AAC5D,SACCC,8BAA8B,QAExB,8BAA8B;AACrC,SAASC,iBAAiB,QAAQ,8CAA8C;AAEhF,OAAO,MAAMC,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,GAAGhB,YAAY,CAACiB,QAAQ,CAACb,OAAO,CAACc,KAAK,CAACC,GAAG,EAAE,UAAU,CAAC;EAEvEpB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAO,CACNU,2BAA2B,CAACW,GAAG,CAAC,CAAC,EACjCV,6BAA6B,CAACU,GAAG,CAAC,CAAC,EACnCT,+BAA+B,CAACS,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,KAAKrB,8BAA8B,CAACwB,IAAI,EAAE;MACjD;IACD;IAEA,IAAID,UAAU,GAAG,CAAC,EAAE;MACnB;IACD;IAEAtB,iBAAiB,CAAC;MACjBqB,MAAM;MACNG,IAAI,EAAEZ,cAAc;MACpBa,eAAe,EACdL,IAAI,KAAKrB,8BAA8B,CAAC2B,IAAI,IAC5C,CAACvB,UAAU,CAACwB,QAAQ,CAACT,GAAG,CAAC,CAAC;MAC3Bf,UAAU;MACVE,cAAc;MACdC,iBAAiB;MACjBQ;IACD,CAAC,CAAC;IAEFJ,+BAA+B,CAAC,CAAC;EAClC,CACD,CAAC;AACF,CAAC","ignoreList":[]}

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

@@ -4,6 +4,7 @@ import { useDescriptorsStore } from "../../providers/screen/descriptors";
 import { AnimationStore } from "../../stores/animation.store";
 import { SystemStore } from "../../stores/system.store";
 import { useScreenHistory } from "./hooks/history/use-screen-history";
+import { useCloseCompletion } from "./hooks/use-close-completion";
 import { useCloseTransitionIntent } from "./hooks/use-close-transition-intent";
 import { useOpenTransitionIntent } from "./hooks/use-open-transition-intent";
 import { useTransitionStartController } from "./hooks/use-transition-start-controller";
@@ -19,16 +20,18 @@ export const ScreenLifecycle = ({
   const animations = AnimationStore.getBag(current.route.key);
   const system = SystemStore.getBag(current.route.key);
   const {
-    handleBlankStackCloseEnd,
-    handleNativeCloseEnd
-  } = useCloseTransitionIntent(current, system);
+    completeClose
+  } = useCloseTransitionIntent(current);
   useOpenTransitionIntent(current, animations, system);
   useTransitionStartController({
     current,
     animations,
-    system,
-    onBlankStackCloseFinish: handleBlankStackCloseEnd,
-    onNativeCloseFinish: handleNativeCloseEnd
+    system
+  });
+  useCloseCompletion({
+    closing: animations.closing,
+    animationProgress: system.animationProgress,
+    onComplete: completeClose
   });
   useScreenHistory(current, previous, animations);
   return children;

package/lib/module/shared/components/screen-lifecycle/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDescriptorsStore","AnimationStore","SystemStore","useScreenHistory","useCloseTransitionIntent","useOpenTransitionIntent","useTransitionStartController","ScreenLifecycle","children","current","store","previous","animations","getBag","route","key","system","handleBlankStackCloseEnd","handleNativeCloseEnd","onBlankStackCloseFinish","onNativeCloseFinish"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-lifecycle/index.tsx"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,SAASC,WAAW,QAAQ,2BAA2B;AACvD,SAASC,gBAAgB,QAAQ,oCAAoC;AACrE,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,uBAAuB,QAAQ,oCAAoC;AAC5E,SAASC,4BAA4B,QAAQ,yCAAyC;AAMtF;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EACvD,MAAMC,OAAO,GAAGT,mBAAmB,CAAEU,KAAK,IAAKA,KAAK,CAACD,OAAO,CAAC;EAC7D,MAAME,QAAQ,GAAGX,mBAAmB,CAAEU,KAAK,IAAKA,KAAK,CAACC,QAAQ,CAAC;EAE/D,MAAMC,UAAU,GAAGX,cAAc,CAACY,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAC3D,MAAMC,MAAM,GAAGd,WAAW,CAACW,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAEpD,MAAM;IAAEE,wBAAwB;IAAEC;EAAqB,CAAC,GACvDd,wBAAwB,CAACK,OAAO,EAAEO,MAAM,CAAC;EAE1CX,uBAAuB,CAACI,OAAO,EAAEG,UAAU,EAAEI,MAAM,CAAC;EAEpDV,4BAA4B,CAAC;IAC5BG,OAAO;IACPG,UAAU;IACVI,MAAM;IACNG,uBAAuB,EAAEF,wBAAwB;IACjDG,mBAAmB,EAAEF;EACtB,CAAC,CAAC;EAEFf,gBAAgB,CAACM,OAAO,EAAEE,QAAQ,EAAEC,UAAU,CAAC;EAE/C,OAAOJ,QAAQ;AAChB,CAAC","ignoreList":[]}
+{"version":3,"names":["useDescriptorsStore","AnimationStore","SystemStore","useScreenHistory","useCloseCompletion","useCloseTransitionIntent","useOpenTransitionIntent","useTransitionStartController","ScreenLifecycle","children","current","store","previous","animations","getBag","route","key","system","completeClose","closing","animationProgress","onComplete"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-lifecycle/index.tsx"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,SAASC,WAAW,QAAQ,2BAA2B;AACvD,SAASC,gBAAgB,QAAQ,oCAAoC;AACrE,SAASC,kBAAkB,QAAQ,8BAA8B;AACjE,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,uBAAuB,QAAQ,oCAAoC;AAC5E,SAASC,4BAA4B,QAAQ,yCAAyC;AAMtF;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EACvD,MAAMC,OAAO,GAAGV,mBAAmB,CAAEW,KAAK,IAAKA,KAAK,CAACD,OAAO,CAAC;EAC7D,MAAME,QAAQ,GAAGZ,mBAAmB,CAAEW,KAAK,IAAKA,KAAK,CAACC,QAAQ,CAAC;EAE/D,MAAMC,UAAU,GAAGZ,cAAc,CAACa,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAC3D,MAAMC,MAAM,GAAGf,WAAW,CAACY,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAEpD,MAAM;IAAEE;EAAc,CAAC,GAAGb,wBAAwB,CAACK,OAAO,CAAC;EAE3DJ,uBAAuB,CAACI,OAAO,EAAEG,UAAU,EAAEI,MAAM,CAAC;EAEpDV,4BAA4B,CAAC;IAC5BG,OAAO;IACPG,UAAU;IACVI;EACD,CAAC,CAAC;EAEFb,kBAAkB,CAAC;IAClBe,OAAO,EAAEN,UAAU,CAACM,OAAO;IAC3BC,iBAAiB,EAAEH,MAAM,CAACG,iBAAiB;IAC3CC,UAAU,EAAEH;EACb,CAAC,CAAC;EAEFf,gBAAgB,CAACO,OAAO,EAAEE,QAAQ,EAAEC,UAAU,CAAC;EAE/C,OAAOJ,QAAQ;AAChB,CAAC","ignoreList":[]}

package/lib/module/shared/hooks/navigation/use-navigation-helpers.js

@@ -1,32 +1,54 @@
 "use strict";
 
-import { StackActions } from "@react-navigation/native";
+import { StackActions, usePreventRemoveContext } from "@react-navigation/native";
 import { useCallback } from "react";
 import { useDescriptorsStore } from "../../providers/screen/descriptors";
+import { AnimationStore } from "../../stores/animation.store";
+import { LifecycleTransitionRequestKind, SystemStore } from "../../stores/system.store";
+import { dispatchCloseAction } from "../../utils/navigation/close-action-replay";
 import { useStack } from "./use-stack";
 export function useNavigationHelpers() {
   const route = useDescriptorsStore(store => store.current.route);
   const navigation = useDescriptorsStore(store => store.current.navigation);
   const requestStackDismiss = useStack(stack => stack.requestDismiss);
-  const requestDismiss = useCallback(() => {
-    return requestStackDismiss?.({
-      route
-    }) ?? false;
-  }, [route, requestStackDismiss]);
+  const {
+    preventedRoutes
+  } = usePreventRemoveContext();
+  const isRemovePrevented = preventedRoutes[route.key]?.preventRemove === true;
   const dismissScreen = useCallback(() => {
     const state = navigation.getState();
     const routeIndex = state.routes.findIndex(stateRoute => stateRoute.key === route.key);
     const routeStillPresent = routeIndex !== -1;
     if (!routeStillPresent || routeIndex === 0) return false;
-    navigation.dispatch({
+    const action = {
       ...StackActions.pop(),
       source: route.key,
       target: state.key
+    };
+    dispatchCloseAction(action, closeAction => {
+      navigation.dispatch(closeAction);
     });
     return true;
   }, [navigation, route.key]);
+  const requestDismiss = useCallback(() => {
+    if (isRemovePrevented) return false;
+    if (requestStackDismiss) {
+      if (!requestStackDismiss({
+        route
+      })) return false;
+    } else {
+      const state = navigation.getState();
+      const routeIndex = state.routes.findIndex(stateRoute => stateRoute.key === route.key);
+      if (routeIndex <= 0) return false;
+    }
+    if (!AnimationStore.getValue(route.key, "closing").get()) {
+      SystemStore.getBag(route.key).actions.requestLifecycleTransition(LifecycleTransitionRequestKind.Close, 0);
+    }
+    return true;
+  }, [isRemovePrevented, navigation, route, requestStackDismiss]);
   return {
     dismissScreen,
+    isRemovePrevented,
     requestDismiss
   };
 }

package/lib/module/shared/hooks/navigation/use-navigation-helpers.js.map

@@ -1 +1 @@
-{"version":3,"names":["StackActions","useCallback","useDescriptorsStore","useStack","useNavigationHelpers","route","store","current","navigation","requestStackDismiss","stack","requestDismiss","dismissScreen","state","getState","routeIndex","routes","findIndex","stateRoute","key","routeStillPresent","dispatch","pop","source","target"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-navigation-helpers.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,0BAA0B;AACvD,SAASC,WAAW,QAAQ,OAAO;AACnC,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,QAAQ,QAAQ,aAAa;AAEtC,OAAO,SAASC,oBAAoBA,CAAA,EAAG;EACtC,MAAMC,KAAK,GAAGH,mBAAmB,CAAEI,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC;EACjE,MAAMG,UAAU,GAAGN,mBAAmB,CAAEI,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,UAAU,CAAC;EAC3E,MAAMC,mBAAmB,GAAGN,QAAQ,CAAEO,KAAK,IAAKA,KAAK,CAACC,cAAc,CAAC;EAErE,MAAMA,cAAc,GAAGV,WAAW,CAAC,MAAe;IACjD,OAAOQ,mBAAmB,GAAG;MAAEJ;IAAM,CAAC,CAAC,IAAI,KAAK;EACjD,CAAC,EAAE,CAACA,KAAK,EAAEI,mBAAmB,CAAC,CAAC;EAEhC,MAAMG,aAAa,GAAGX,WAAW,CAAC,MAAe;IAChD,MAAMY,KAAK,GAAGL,UAAU,CAACM,QAAQ,CAAC,CAAC;IACnC,MAAMC,UAAU,GAAGF,KAAK,CAACG,MAAM,CAACC,SAAS,CACvCC,UAAU,IAAKA,UAAU,CAACC,GAAG,KAAKd,KAAK,CAACc,GAC1C,CAAC;IACD,MAAMC,iBAAiB,GAAGL,UAAU,KAAK,CAAC,CAAC;IAC3C,IAAI,CAACK,iBAAiB,IAAIL,UAAU,KAAK,CAAC,EAAE,OAAO,KAAK;IAExDP,UAAU,CAACa,QAAQ,CAAC;MACnB,GAAGrB,YAAY,CAACsB,GAAG,CAAC,CAAC;MACrBC,MAAM,EAAElB,KAAK,CAACc,GAAG;MACjBK,MAAM,EAAEX,KAAK,CAACM;IACf,CAAC,CAAC;IACF,OAAO,IAAI;EACZ,CAAC,EAAE,CAACX,UAAU,EAAEH,KAAK,CAACc,GAAG,CAAC,CAAC;EAE3B,OAAO;IAAEP,aAAa;IAAED;EAAe,CAAC;AACzC","ignoreList":[]}
+{"version":3,"names":["StackActions","usePreventRemoveContext","useCallback","useDescriptorsStore","AnimationStore","LifecycleTransitionRequestKind","SystemStore","dispatchCloseAction","useStack","useNavigationHelpers","route","store","current","navigation","requestStackDismiss","stack","requestDismiss","preventedRoutes","isRemovePrevented","key","preventRemove","dismissScreen","state","getState","routeIndex","routes","findIndex","stateRoute","routeStillPresent","action","pop","source","target","closeAction","dispatch","getValue","get","getBag","actions","requestLifecycleTransition","Close"],"sourceRoot":"../../../../../src","sources":["shared/hooks/navigation/use-navigation-helpers.ts"],"mappings":";;AAAA,SACCA,YAAY,EACZC,uBAAuB,QACjB,0BAA0B;AACjC,SAASC,WAAW,QAAQ,OAAO;AACnC,SAASC,mBAAmB,QAAQ,oCAAoC;AACxE,SAASC,cAAc,QAAQ,8BAA8B;AAC7D,SACCC,8BAA8B,EAC9BC,WAAW,QACL,2BAA2B;AAClC,SAASC,mBAAmB,QAAQ,4CAA4C;AAChF,SAASC,QAAQ,QAAQ,aAAa;AAEtC,OAAO,SAASC,oBAAoBA,CAAA,EAAG;EACtC,MAAMC,KAAK,GAAGP,mBAAmB,CAAEQ,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC;EACjE,MAAMG,UAAU,GAAGV,mBAAmB,CAAEQ,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,UAAU,CAAC;EAC3E,MAAMC,mBAAmB,GAAGN,QAAQ,CAAEO,KAAK,IAAKA,KAAK,CAACC,cAAc,CAAC;EACrE,MAAM;IAAEC;EAAgB,CAAC,GAAGhB,uBAAuB,CAAC,CAAC;EACrD,MAAMiB,iBAAiB,GAAGD,eAAe,CAACP,KAAK,CAACS,GAAG,CAAC,EAAEC,aAAa,KAAK,IAAI;EAE5E,MAAMC,aAAa,GAAGnB,WAAW,CAAC,MAAe;IAChD,MAAMoB,KAAK,GAAGT,UAAU,CAACU,QAAQ,CAAC,CAAC;IACnC,MAAMC,UAAU,GAAGF,KAAK,CAACG,MAAM,CAACC,SAAS,CACvCC,UAAU,IAAKA,UAAU,CAACR,GAAG,KAAKT,KAAK,CAACS,GAC1C,CAAC;IACD,MAAMS,iBAAiB,GAAGJ,UAAU,KAAK,CAAC,CAAC;IAC3C,IAAI,CAACI,iBAAiB,IAAIJ,UAAU,KAAK,CAAC,EAAE,OAAO,KAAK;IAExD,MAAMK,MAAM,GAAG;MACd,GAAG7B,YAAY,CAAC8B,GAAG,CAAC,CAAC;MACrBC,MAAM,EAAErB,KAAK,CAACS,GAAG;MACjBa,MAAM,EAAEV,KAAK,CAACH;IACf,CAAC;IACDZ,mBAAmB,CAACsB,MAAM,EAAGI,WAAW,IAAK;MAC5CpB,UAAU,CAACqB,QAAQ,CAACD,WAAW,CAAC;IACjC,CAAC,CAAC;IACF,OAAO,IAAI;EACZ,CAAC,EAAE,CAACpB,UAAU,EAAEH,KAAK,CAACS,GAAG,CAAC,CAAC;EAE3B,MAAMH,cAAc,GAAGd,WAAW,CAAC,MAAe;IACjD,IAAIgB,iBAAiB,EAAE,OAAO,KAAK;IAEnC,IAAIJ,mBAAmB,EAAE;MACxB,IAAI,CAACA,mBAAmB,CAAC;QAAEJ;MAAM,CAAC,CAAC,EAAE,OAAO,KAAK;IAClD,CAAC,MAAM;MACN,MAAMY,KAAK,GAAGT,UAAU,CAACU,QAAQ,CAAC,CAAC;MACnC,MAAMC,UAAU,GAAGF,KAAK,CAACG,MAAM,CAACC,SAAS,CACvCC,UAAU,IAAKA,UAAU,CAACR,GAAG,KAAKT,KAAK,CAACS,GAC1C,CAAC;MACD,IAAIK,UAAU,IAAI,CAAC,EAAE,OAAO,KAAK;IAClC;IAEA,IAAI,CAACpB,cAAc,CAAC+B,QAAQ,CAACzB,KAAK,CAACS,GAAG,EAAE,SAAS,CAAC,CAACiB,GAAG,CAAC,CAAC,EAAE;MACzD9B,WAAW,CAAC+B,MAAM,CAAC3B,KAAK,CAACS,GAAG,CAAC,CAACmB,OAAO,CAACC,0BAA0B,CAC/DlC,8BAA8B,CAACmC,KAAK,EACpC,CACD,CAAC;IACF;IACA,OAAO,IAAI;EACZ,CAAC,EAAE,CAACtB,iBAAiB,EAAEL,UAAU,EAAEH,KAAK,EAAEI,mBAAmB,CAAC,CAAC;EAE/D,OAAO;IAAEO,aAAa;IAAEH,iBAAiB;IAAEF;EAAe,CAAC;AAC5D","ignoreList":[]}

package/lib/module/shared/providers/helpers/measured-bounds-writes.js

@@ -30,8 +30,7 @@ export const applyMeasuredBoundsWrites = params => {
   }
   if (linkWrite?.type === "destination") {
     setDestination(linkWrite.pairKey, linkId, currentScreenKey, measured, preparedStyles, group, {
-      handoff,
-      escapeClipping
+      handoff
     });
   }
 };

package/lib/module/shared/providers/helpers/measured-bounds-writes.js.map

@@ -1 +1 @@
-{"version":3,"names":["setEntry","setDestination","setSource","applyMeasuredBoundsWrites","params","entryTag","linkId","group","currentScreenKey","measured","preparedStyles","linkWrite","handoff","escapeClipping","bounds","type","pairKey"],"sourceRoot":"../../../../../src","sources":["shared/providers/helpers/measured-bounds-writes.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,uCAAuC;AAChE,SAASC,cAAc,EAAEC,SAAS,QAAQ,qCAAqC;AAyB/E,OAAO,MAAMC,yBAAyB,GACrCC,MAAuC,IACnC;EACJ,SAAS;;EACT,MAAM;IACLC,QAAQ;IACRC,MAAM;IACNC,KAAK;IACLC,gBAAgB;IAChBC,QAAQ;IACRC,cAAc;IACdC,SAAS;IACTC,OAAO;IACPC;EACD,CAAC,GAAGT,MAAM;;EAEV;EACA;EACAJ,QAAQ,CAACK,QAAQ,EAAEG,gBAAgB,EAAE;IACpCM,MAAM,EAAEL;EACT,CAAC,CAAC;EAEF,IAAIE,SAAS,EAAEI,IAAI,KAAK,QAAQ,EAAE;IACjCb,SAAS,CACRS,SAAS,CAACK,OAAO,EACjBV,MAAM,EACNE,gBAAgB,EAChBC,QAAQ,EACRC,cAAc,EACdH,KAAK,EACL;MAAEK,OAAO;MAAEC;IAAe,CAC3B,CAAC;EACF;EAEA,IAAIF,SAAS,EAAEI,IAAI,KAAK,aAAa,EAAE;IACtCd,cAAc,CACbU,SAAS,CAACK,OAAO,EACjBV,MAAM,EACNE,gBAAgB,EAChBC,QAAQ,EACRC,cAAc,EACdH,KAAK,EACL;MAAEK,OAAO;MAAEC;IAAe,CAC3B,CAAC;EACF;AACD,CAAC","ignoreList":[]}
+{"version":3,"names":["setEntry","setDestination","setSource","applyMeasuredBoundsWrites","params","entryTag","linkId","group","currentScreenKey","measured","preparedStyles","linkWrite","handoff","escapeClipping","bounds","type","pairKey"],"sourceRoot":"../../../../../src","sources":["shared/providers/helpers/measured-bounds-writes.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,uCAAuC;AAChE,SAASC,cAAc,EAAEC,SAAS,QAAQ,qCAAqC;AAyB/E,OAAO,MAAMC,yBAAyB,GACrCC,MAAuC,IACnC;EACJ,SAAS;;EACT,MAAM;IACLC,QAAQ;IACRC,MAAM;IACNC,KAAK;IACLC,gBAAgB;IAChBC,QAAQ;IACRC,cAAc;IACdC,SAAS;IACTC,OAAO;IACPC;EACD,CAAC,GAAGT,MAAM;;EAEV;EACA;EACAJ,QAAQ,CAACK,QAAQ,EAAEG,gBAAgB,EAAE;IACpCM,MAAM,EAAEL;EACT,CAAC,CAAC;EAEF,IAAIE,SAAS,EAAEI,IAAI,KAAK,QAAQ,EAAE;IACjCb,SAAS,CACRS,SAAS,CAACK,OAAO,EACjBV,MAAM,EACNE,gBAAgB,EAChBC,QAAQ,EACRC,cAAc,EACdH,KAAK,EACL;MAAEK,OAAO;MAAEC;IAAe,CAC3B,CAAC;EACF;EAEA,IAAIF,SAAS,EAAEI,IAAI,KAAK,aAAa,EAAE;IACtCd,cAAc,CACbU,SAAS,CAACK,OAAO,EACjBV,MAAM,EACNE,gBAAgB,EAChBC,QAAQ,EACRC,cAAc,EACdH,KAAK,EACL;MAAEK;IAAQ,CACX,CAAC;EACF;AACD,CAAC","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { usePreventRemoveContext } from "@react-navigation/native";
 import { useMemo } from "react";
 import { useDescriptorsStore } from "../../descriptors";
 import { useGestureStore } from "../gestures.provider";
@@ -8,10 +9,16 @@ export function useScreenGestureConfig() {
   const gestureContext = useGestureStore();
   const options = useDescriptorsStore(store => store.options);
   const isFirstKey = useDescriptorsStore(store => store.derivations.isFirstKey);
+  const currentScreenKey = useDescriptorsStore(store => store.derivations.currentScreenKey);
+  const {
+    preventedRoutes
+  } = usePreventRemoveContext();
+  const isRemovePrevented = preventedRoutes[currentScreenKey]?.preventRemove === true;
   return useMemo(() => resolveScreenGestureConfig({
     options,
     isFirstKey,
-    gestureContext
-  }), [isFirstKey, options, gestureContext]);
+    gestureContext,
+    isRemovePrevented
+  }), [isFirstKey, options, gestureContext, isRemovePrevented]);
 }
 //# sourceMappingURL=use-screen-gesture-config.js.map

package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useDescriptorsStore","useGestureStore","resolveScreenGestureConfig","useScreenGestureConfig","gestureContext","options","store","isFirstKey","derivations"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,mBAAmB,QAAQ,mBAAmB;AACvD,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,0BAA0B,QAAQ,kBAAkB;AAG7D,OAAO,SAASC,sBAAsBA,CAAA,EAAwB;EAC7D,MAAMC,cAAc,GAAGH,eAAe,CAAC,CAAC;EACxC,MAAMI,OAAO,GAAGL,mBAAmB,CAAEM,KAAK,IAAKA,KAAK,CAACD,OAAO,CAAC;EAC7D,MAAME,UAAU,GAAGP,mBAAmB,CACpCM,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACD,UAC9B,CAAC;EAED,OAAOR,OAAO,CACb,MACCG,0BAA0B,CAAC;IAC1BG,OAAO;IACPE,UAAU;IACVH;EACD,CAAC,CAAC,EACH,CAACG,UAAU,EAAEF,OAAO,EAAED,cAAc,CACrC,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["usePreventRemoveContext","useMemo","useDescriptorsStore","useGestureStore","resolveScreenGestureConfig","useScreenGestureConfig","gestureContext","options","store","isFirstKey","derivations","currentScreenKey","preventedRoutes","isRemovePrevented","preventRemove"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts"],"mappings":";;AAAA,SAASA,uBAAuB,QAAQ,0BAA0B;AAClE,SAASC,OAAO,QAAQ,OAAO;AAC/B,SAASC,mBAAmB,QAAQ,mBAAmB;AACvD,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,0BAA0B,QAAQ,kBAAkB;AAG7D,OAAO,SAASC,sBAAsBA,CAAA,EAAwB;EAC7D,MAAMC,cAAc,GAAGH,eAAe,CAAC,CAAC;EACxC,MAAMI,OAAO,GAAGL,mBAAmB,CAAEM,KAAK,IAAKA,KAAK,CAACD,OAAO,CAAC;EAC7D,MAAME,UAAU,GAAGP,mBAAmB,CACpCM,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACD,UAC9B,CAAC;EACD,MAAME,gBAAgB,GAAGT,mBAAmB,CAC1CM,KAAK,IAAKA,KAAK,CAACE,WAAW,CAACC,gBAC9B,CAAC;EACD,MAAM;IAAEC;EAAgB,CAAC,GAAGZ,uBAAuB,CAAC,CAAC;EACrD,MAAMa,iBAAiB,GACtBD,eAAe,CAACD,gBAAgB,CAAC,EAAEG,aAAa,KAAK,IAAI;EAE1D,OAAOb,OAAO,CACb,MACCG,0BAA0B,CAAC;IAC1BG,OAAO;IACPE,UAAU;IACVH,cAAc;IACdO;EACD,CAAC,CAAC,EACH,CAACJ,UAAU,EAAEF,OAAO,EAAED,cAAc,EAAEO,iBAAiB,CACxD,CAAC;AACF","ignoreList":[]}

package/lib/module/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.js

@@ -68,7 +68,7 @@ export const trackPanGesture = (event, rawEvent, gestures, dimensions) => {
     velocity
   };
 };
-export const finalizePanRelease = (release, runtime, dismissScreen, dimensions, rawEvent, requestDismiss, gestureCompositionOwner) => {
+export const finalizePanRelease = (release, runtime, dimensions, rawEvent, requestDismiss, gestureCompositionOwner) => {
   "worklet";
 
   const {
@@ -111,12 +111,8 @@ export const finalizePanRelease = (release, runtime, dismissScreen, dimensions,
     system.targetProgress.set(plan.target);
     return;
   }
-  if (plan.shouldDismiss && requestDismiss) {
-    runOnJS(requestDismiss)();
-  }
   animateToProgress({
     target: plan.target,
-    onAnimationFinish: plan.shouldDismiss ? dismissScreen : undefined,
     spec: plan.transitionSpec,
     emitWillAnimate: false,
     markEntering: false,
@@ -125,5 +121,8 @@ export const finalizePanRelease = (release, runtime, dismissScreen, dimensions,
     animations,
     initialVelocity: plan.progressVelocity
   });
+  if (plan.shouldDismiss && requestDismiss) {
+    runOnJS(requestDismiss)();
+  }
 };
 //# sourceMappingURL=pan-lifecycle.js.map