react-native-screen-transitions 4.0.0-alpha.6 → 4.0.0-alpha.8

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

@@ -6,34 +6,108 @@ Object.defineProperty(exports, "__esModule", {
 exports.OverlayHost = void 0;
 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 _navigationHost = require("../../../providers/navigation/navigation-host.provider");
 var _animation = require("../../../providers/screen/animation");
+var _slot = require("../../../providers/screen/styles/slot.provider");
+var _blankStack = require("../../../providers/stack/blank-stack.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.useOptionalScreenAnimationStore)(scene.route.key);
+  const driverAnimationStore = (0, _animation.useOptionalScreenAnimationStore)(driverScene.route.key);
+  const previousOverlayAnimationStore = (0, _animation.useOptionalScreenAnimationStore)(previousOverlayScene?.route.key ?? scene.route.key);
+  const driverSlots = (0, _slot.useOptionalScreenSlotStore)(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, _blankStack.useBlankStackStore)();
+  const descriptor = scene.descriptor;
+  const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
+  const focusedDescriptor = focusedScene?.descriptor;
+  const {
+    animatedProps,
+    animatedStyle
+  } = (0, _useOverlaySlot.useOverlaySlot)({
+    overlayAnimationStore,
+    overlayInterpolator: scene.descriptor.options.screenStyleInterpolator,
+    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)(_navigationHost.NavigationScreenProvider, {
-      navigation: scene.descriptor.navigation,
-      route: scene.route,
+      navigation: descriptor.navigation,
+      route: descriptor.route,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
         pointerEvents: "box-none",
         style: [_reactNative.StyleSheet.absoluteFill, styles.overlay],
@@ -43,7 +117,7 @@ const OverlayHost = exports.OverlayHost = /*#__PURE__*/(0, _react.memo)(function
       })
     })
   });
-});
+}
 const styles = _reactNative.StyleSheet.create({
   overlay: {
     zIndex: 1

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_navigationHost","_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","NavigationScreenProvider","navigation","route","create","zIndex","flex"],"sourceRoot":"../../../../../src","sources":["components/overlay/variations/overlay-host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AAEA,IAAAG,eAAA,GAAAH,OAAA;AACA,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,EAACvB,YAAA,CAAAwB,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,EAACrB,eAAA,CAAAgC,wBAAwB;MACxBC,UAAU,EAAE3B,KAAK,CAACG,UAAU,CAACwB,UAAW;MACxCC,KAAK,EAAE5B,KAAK,CAAC4B,KAAM;MAAAH,QAAA,eAEnB,IAAA7B,WAAA,CAAAmB,GAAA,EAACvB,YAAA,CAAAyB,IAAI;QACJC,aAAa,EAAC,UAAU;QACxBC,KAAK,EAAE,CAACI,uBAAU,CAACC,YAAY,EAAEJ,MAAM,CAACf,OAAO,CAAE;QAAAoB,QAAA,eAEjD,IAAA7B,WAAA,CAAAmB,GAAA,EAACb,gBAAgB;UAAA,GAAKU;QAAY,CAAG;MAAC,CACjC;IAAC,CACkB;EAAC,CACb,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMQ,MAAM,GAAGG,uBAAU,CAACM,MAAM,CAAC;EAChCxB,OAAO,EAAE;IACRyB,MAAM,EAAE;EACT,CAAC;EACDT,SAAS,EAAE;IACVU,IAAI,EAAE;EACP,CAAC;EACDT,QAAQ,EAAE;IACTQ,MAAM,EAAE;EACT;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_snapTo","_navigationHost","_animation","_slot","_blankStack","_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","useOptionalScreenAnimationStore","route","key","driverAnimationStore","previousOverlayAnimationStore","driverSlots","useOptionalScreenSlotStore","overlayComponentRef","useRef","descriptor","options","overlay","OverlayComponent","current","readyResourcesRef","retainReadyOverlayResources","readyResources","jsx","ReadyOverlayHost","undefined","scenes","focusedIndex","routeKeys","routes","useBlankStackStore","focusedScene","length","focusedDescriptor","animatedProps","animatedStyle","useOverlaySlot","overlayInterpolator","screenStyleInterpolator","driverInterpolator","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","NavigationScreenProvider","create","flex"],"sourceRoot":"../../../../../src","sources":["components/overlay/variations/overlay-host.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/screen-container/hooks/use-backdrop-pointer-events.js

@@ -9,20 +9,16 @@ var _reactNativeReanimated = require("react-native-reanimated");
 var _reactNativeWorklets = require("react-native-worklets");
 var _descriptors = require("../../../providers/screen/descriptors");
 var _options = require("../../../providers/screen/options");
-var _core = require("../../../providers/stack/core.provider");
-var _stack = require("../../../types/stack.types");
 /**
  * Returns pointer events and backdrop behavior based on screen options.
  *
  * - Runtime interpolator `backdropBehavior` takes precedence
  * - Explicit descriptor `backdropBehavior` option is next
- * - Component stacks default to 'passthrough' (box-none)
- * - Other stacks default to 'block' (undefined = normal touch handling)
+ * - Otherwise defaults to 'block' (undefined = normal touch handling)
  */
 function useBackdropPointerEvents() {
   const screenOptions = (0, _options.useScreenOptionsStore)();
   const descriptorBackdropBehavior = (0, _descriptors.useDescriptorsStore)(store => store.options.backdropBehavior);
-  const stackType = (0, _core.useStackCoreStore)(store => store.flags.STACK_TYPE);
   const [runtimeBackdropBehavior, setRuntimeBackdropBehavior] = (0, _react.useState)(undefined);
   (0, _reactNativeReanimated.useAnimatedReaction)(() => screenOptions.get().backdropBehavior, (next, previous) => {
     "worklet";
@@ -31,8 +27,7 @@ function useBackdropPointerEvents() {
       (0, _reactNativeWorklets.scheduleOnRN)(setRuntimeBackdropBehavior, next);
     }
   }, [screenOptions]);
-  const isComponentStack = stackType === _stack.StackType.COMPONENT;
-  const backdropBehavior = runtimeBackdropBehavior ?? descriptorBackdropBehavior ?? (isComponentStack ? "passthrough" : "block");
+  const backdropBehavior = runtimeBackdropBehavior ?? descriptorBackdropBehavior ?? "block";
   const pointerEvents = backdropBehavior === "passthrough" ? "box-none" : undefined;
   const isBackdropActive = backdropBehavior === "dismiss" || backdropBehavior === "collapse";
   return {

package/lib/commonjs/components/screen-container/hooks/use-backdrop-pointer-events.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_descriptors","_options","_core","_stack","useBackdropPointerEvents","screenOptions","useScreenOptionsStore","descriptorBackdropBehavior","useDescriptorsStore","store","options","backdropBehavior","stackType","useStackCoreStore","flags","STACK_TYPE","runtimeBackdropBehavior","setRuntimeBackdropBehavior","useState","undefined","useAnimatedReaction","get","next","previous","scheduleOnRN","isComponentStack","StackType","COMPONENT","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AAEA,IAAAM,MAAA,GAAAN,OAAA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASO,wBAAwBA,CAAA,EAAgC;EACvE,MAAMC,aAAa,GAAG,IAAAC,8BAAqB,EAAC,CAAC;EAC7C,MAAMC,0BAA0B,GAAG,IAAAC,gCAAmB,EACpDC,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAMC,SAAS,GAAG,IAAAC,uBAAiB,EAAEJ,KAAK,IAAKA,KAAK,CAACK,KAAK,CAACC,UAAU,CAAC;EACtE,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAG,IAAAC,eAAQ,EAEpEC,SAAS,CAAC;EAEZ,IAAAC,0CAAmB,EAClB,MAAMf,aAAa,CAACgB,GAAG,CAAC,CAAC,CAACV,gBAAgB,EAC1C,CAACW,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtB,IAAAC,iCAAY,EAACP,0BAA0B,EAAEK,IAAI,CAAC;IAC/C;EACD,CAAC,EACD,CAACjB,aAAa,CACf,CAAC;EAED,MAAMoB,gBAAgB,GAAGb,SAAS,KAAKc,gBAAS,CAACC,SAAS;EAC1D,MAAMhB,gBAAkC,GACvCK,uBAAuB,IACvBT,0BAA0B,KACzBkB,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAMG,aAAa,GAClBjB,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGQ,SAAS;EAE5D,MAAMU,gBAAgB,GACrBlB,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEiB,aAAa;IAAEjB,gBAAgB;IAAEkB;EAAiB,CAAC;AAC7D","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_reactNativeWorklets","_descriptors","_options","useBackdropPointerEvents","screenOptions","useScreenOptionsStore","descriptorBackdropBehavior","useDescriptorsStore","store","options","backdropBehavior","runtimeBackdropBehavior","setRuntimeBackdropBehavior","useState","undefined","useAnimatedReaction","get","next","previous","scheduleOnRN","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,oBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASK,wBAAwBA,CAAA,EAAgC;EACvE,MAAMC,aAAa,GAAG,IAAAC,8BAAqB,EAAC,CAAC;EAC7C,MAAMC,0BAA0B,GAAG,IAAAC,gCAAmB,EACpDC,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAG,IAAAC,eAAQ,EAEpEC,SAAS,CAAC;EAEZ,IAAAC,0CAAmB,EAClB,MAAMX,aAAa,CAACY,GAAG,CAAC,CAAC,CAACN,gBAAgB,EAC1C,CAACO,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtB,IAAAC,iCAAY,EAACP,0BAA0B,EAAEK,IAAI,CAAC;IAC/C;EACD,CAAC,EACD,CAACb,aAAa,CACf,CAAC;EAED,MAAMM,gBAAkC,GACvCC,uBAAuB,IAAIL,0BAA0B,IAAI,OAAO;EAEjE,MAAMc,aAAa,GAClBV,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGI,SAAS;EAE5D,MAAMO,gBAAgB,GACrBX,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEU,aAAa;IAAEV,gBAAgB;IAAEW;EAAiB,CAAC;AAC7D","ignoreList":[]}

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

@@ -25,12 +25,13 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
   isBackdropActive
 }) {
   const {
-    dismissScreen
+    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;
   const transitionSpec = (0, _descriptors.useDescriptorsStore)(store => store.options.transitionSpec);
   const animations = _animation.AnimationStore.getBag(routeKey);
   const {
@@ -41,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);
@@ -80,12 +81,14 @@ const BackdropLayer = exports.BackdropLayer = /*#__PURE__*/(0, _react.memo)(func
           spec,
           animations,
           targetProgress,
-          animationProgress,
-          onAnimationFinish: shouldDismiss ? dismissScreen : undefined
+          animationProgress
         });
+        if (shouldDismiss) {
+          (0, _reactNativeWorklets.scheduleOnRN)(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/components/screen-container/layers/backdrop.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_reactNativeWorklets","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","__esModule","default","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","scheduleOnUI","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","set","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":["components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireDefault","_reactNativeWorklets","_specs","_useNavigationHelpers","_descriptors","_styles","_animation","_gesture","_system","_animateToProgress","_findCollapseTarget","_renderComponent","_jsxRuntime","e","__esModule","default","BackdropLayer","exports","memo","backdropBehavior","isBackdropActive","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","scheduleOnUI","resolvedSnaps","i","point","resolvedPoint","get","push","target","shouldDismiss","findCollapseTarget","transitionProgress","dismissing","set","spec","open","expand","DefaultSnapSpec","close","collapse","animateToProgress","markEntering","scheduleOnRN","animatedBackdropStyle","useSlotStyles","animatedBackdropProps","useSlotProps","backdropPointerEvents","backdropStyles","StyleSheet","absoluteFill","backdropProps","jsx","Pressable","style","pointerEvents","onPress","undefined","children","animatedProps","styles","props","View"],"sourceRoot":"../../../../../src","sources":["components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/screen-container/layers/content.js

@@ -15,17 +15,14 @@ var _host = require("../../boundary/portal/components/boundary-portal/components
 var _useContentLayout = require("../hooks/use-content-layout");
 var _maybeMaskedNavigationContainer = require("./maybe-masked-navigation-container");
 var _renderComponent = require("./render-component");
-var _surfaceContainer = require("./surface-container");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/** biome-ignore-all lint/style/noNonNullAssertion: <Screen gesture is under the gesture context, so this will always exist.> */
-
 const ContentLayer = exports.ContentLayer = /*#__PURE__*/(0, _react.memo)(({
   children,
   pointerEvents,
   isBackdropActive
 }) => {
-  const gestureContext = (0, _gestures.useGestureStore)();
+  const gestureContext = (0, _gestures.useScreenGestureStore)();
   const ContentComponent = (0, _descriptors.useDescriptorsStore)(store => store.options.contentComponent);
   const isNavigationMaskEnabled = (0, _descriptors.useDescriptorsStore)(store => !!store.options.navigationMaskEnabled);
   const hasAutoSnapPoint = (0, _descriptors.useDescriptorsStore)(store => store.options.snapPoints?.includes("auto") ?? false);
@@ -38,17 +35,14 @@ const ContentLayer = exports.ContentLayer = /*#__PURE__*/(0, _react.memo)(({
   const animatedContentProps = (0, _styles.useSlotProps)("content");
   const contentStyles = [styles.content, animatedContentStyle];
   const contentProps = animatedContentProps;
-  const contentChildren = /*#__PURE__*/(0, _jsxRuntime.jsx)(_maybeMaskedNavigationContainer.MaybeMaskedNavigationContainer, {
+  const contentChildren = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_maybeMaskedNavigationContainer.MaybeMaskedNavigationContainer, {
     pointerEvents: contentPointerEvents,
     enabled: isNavigationMaskEnabled,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_surfaceContainer.SurfaceContainer, {
-      pointerEvents: contentPointerEvents,
-      children: [hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-        collapsable: false,
-        onLayout: handleContentLayout,
-        children: children
-      }) : children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_host.ScreenFallbackHost, {})]
-    })
+    children: [hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      collapsable: false,
+      onLayout: handleContentLayout,
+      children: children
+    }) : children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_host.ScreenFallbackHost, {})]
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeGestureHandler.GestureDetector, {
     gesture: gestureContext.detectorGesture,

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireDefault","_descriptors","_gestures","_styles","_host","_useContentLayout","_maybeMaskedNavigationContainer","_renderComponent","_surfaceContainer","_jsxRuntime","e","__esModule","default","ContentLayer","exports","memo","children","pointerEvents","isBackdropActive","gestureContext","useGestureStore","ContentComponent","useDescriptorsStore","store","options","contentComponent","isNavigationMaskEnabled","navigationMaskEnabled","hasAutoSnapPoint","snapPoints","includes","contentPointerEvents","AnimatedContentComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleContentLayout","useContentLayout","animatedContentStyle","useSlotStyles","animatedContentProps","useSlotProps","contentStyles","styles","content","contentProps","contentChildren","jsx","MaybeMaskedNavigationContainer","enabled","jsxs","SurfaceContainer","View","collapsable","onLayout","ScreenFallbackHost","GestureDetector","gesture","detectorGesture","style","animatedProps","props","StyleSheet","create","flex"],"sourceRoot":"../../../../../src","sources":["components/screen-container/layers/content.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireDefault","_descriptors","_gestures","_styles","_host","_useContentLayout","_maybeMaskedNavigationContainer","_renderComponent","_jsxRuntime","e","__esModule","default","ContentLayer","exports","memo","children","pointerEvents","isBackdropActive","gestureContext","useScreenGestureStore","ContentComponent","useDescriptorsStore","store","options","contentComponent","isNavigationMaskEnabled","navigationMaskEnabled","hasAutoSnapPoint","snapPoints","includes","contentPointerEvents","AnimatedContentComponent","useMemo","usesLayerRenderProps","Animated","createAnimatedComponent","handleContentLayout","useContentLayout","animatedContentStyle","useSlotStyles","animatedContentProps","useSlotProps","contentStyles","styles","content","contentProps","contentChildren","jsxs","MaybeMaskedNavigationContainer","enabled","jsx","View","collapsable","onLayout","ScreenFallbackHost","GestureDetector","gesture","detectorGesture","style","animatedProps","props","StyleSheet","create","flex"],"sourceRoot":"../../../../../src","sources":["components/screen-container/layers/content.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/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/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":["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/components/screen-lifecycle/hooks/use-close-completion.js

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

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

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNativeReanimated","require","_reactNativeWorklets","useCloseCompletion","closing","animationProgress","onComplete","useAnimatedReaction","get","complete","previouslyComplete","scheduleOnRN","exports"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-close-completion.ts"],"mappings":";;;;;;AAAA,IAAAA,sBAAA,GAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AAEO,MAAME,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,iCAAY,EAACL,UAAU,CAAC;IACzB;EACD,CACD,CAAC;AACF,CAAC;AAACM,OAAA,CAAAT,kBAAA,GAAAA,kBAAA","ignoreList":[]}

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

@@ -5,119 +5,91 @@ 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 _descriptors = require("../../../providers/screen/descriptors");
+var _hasTransitionsEnabled = require("../../../providers/screen/animation/helpers/has-transitions-enabled");
+var _useCurrentScreenRelationships = require("../../../providers/screen/use-current-screen-relationships");
 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
-}) => {
-  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);
+function useCloseTransitionIntent(current) {
+  const routeKey = current.route.key;
+  const transitionsAlwaysOn = (0, _core.useStackCoreStore)(store => store.flags.TRANSITIONS_ALWAYS_ON);
+  const handleCloseRoute = (0, _blankStack.useBlankStackStore)(store => store.handleCloseRoute);
+  const isBlankStackClosing = (0, _blankStack.useBlankStackStore)(store => store.scenesByKey[routeKey]?.activity === "closing");
+  const {
+    parentScreenKey
+  } = (0, _useCurrentScreenRelationships.useCurrentScreenRelationships)();
+  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 (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 (handleCloseRoute) {
+      return;
+    }
     return current.navigation.addListener?.("beforeRemove", handleBeforeRemove);
-  }, [current.navigation]);
+  }, [current.navigation, handleBeforeRemove, handleCloseRoute]);
   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