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

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

@@ -1,35 +1,108 @@
 "use strict";
 
-import { memo, useMemo } from "react";
-import { Animated, StyleSheet, View } from "react-native";
-import { useDerivedValue } from "react-native-reanimated";
+import { memo, useMemo, useRef } from "react";
+import { StyleSheet, View } from "react-native";
+import Animated, { useDerivedValue } from "react-native-reanimated";
+import { snapDescriptorToIndex } from "../../../animation/snap-to";
 import { NavigationScreenProvider } from "../../../providers/navigation/navigation-host.provider";
-import { useScreenAnimation } from "../../../providers/screen/animation";
+import { useOptionalScreenAnimationStore } from "../../../providers/screen/animation";
+import { useOptionalScreenSlotStore } from "../../../providers/screen/styles/slot.provider";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { retainReadyOverlayResources } from "../helpers/retain-ready-overlay-resources";
+import { useOverlaySlot } from "../hooks/use-overlay-slot";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const OverlayHost = /*#__PURE__*/memo(function OverlayHost({
   scene,
-  overlayScreenState
+  driverScene,
+  previousOverlayScene,
+  activity,
+  layerIndex
 }) {
-  const OverlayComponent = scene.descriptor.options.overlay;
-  const screenAnimation = useScreenAnimation();
+  const overlayAnimationStore = useOptionalScreenAnimationStore(scene.route.key);
+  const driverAnimationStore = useOptionalScreenAnimationStore(driverScene.route.key);
+  const previousOverlayAnimationStore = useOptionalScreenAnimationStore(previousOverlayScene?.route.key ?? scene.route.key);
+  const driverSlots = useOptionalScreenSlotStore(driverScene.route.key);
+  const overlayComponentRef = useRef(scene.descriptor.options.overlay);
+  const OverlayComponent = overlayComponentRef.current;
+  const readyResourcesRef = useRef(null);
+  readyResourcesRef.current = retainReadyOverlayResources(readyResourcesRef.current, overlayAnimationStore, driverScene, driverAnimationStore, driverSlots);
+  const readyResources = readyResourcesRef.current;
+  if (!OverlayComponent || !readyResources) {
+    return null;
+  }
+  return /*#__PURE__*/_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
+  } = useBlankStackStore();
+  const descriptor = scene.descriptor;
+  const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
+  const focusedDescriptor = focusedScene?.descriptor;
+  const {
+    animatedProps,
+    animatedStyle
+  } = 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 = useDerivedValue(() => {
     "worklet";
 
-    return screenAnimation.get().stackProgress;
+    overlayAnimationStore.screenInterpolatorPropsRevision.get();
+    return overlayAnimationStore.screenInterpolatorProps.get().stackProgress;
   });
   const overlayProps = 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 => {
+      snapDescriptorToIndex(scene.descriptor, index);
+    },
     progress: relativeProgress
-  }), [relativeProgress, overlayScreenState]);
-  if (!OverlayComponent) {
-    return null;
-  }
+  }), [scene, focusedDescriptor?.options, focusedIndex, focusedScene?.route, relativeProgress, routeKeys, routes]);
   return /*#__PURE__*/_jsx(Animated.View, {
-    pointerEvents: "box-none",
-    style: [styles.container, styles.floating, StyleSheet.absoluteFill],
+    animatedProps: animatedProps,
+    pointerEvents: activity === "active" ? "box-none" : "none",
+    style: [styles.container, styles.floating, StyleSheet.absoluteFill, {
+      zIndex: 1000 + layerIndex
+    }, animatedStyle],
     children: /*#__PURE__*/_jsx(NavigationScreenProvider, {
-      navigation: scene.descriptor.navigation,
-      route: scene.route,
+      navigation: descriptor.navigation,
+      route: descriptor.route,
       children: /*#__PURE__*/_jsx(View, {
         pointerEvents: "box-none",
         style: [StyleSheet.absoluteFill, styles.overlay],
@@ -39,7 +112,7 @@ export const OverlayHost = /*#__PURE__*/memo(function OverlayHost({
       })
     })
   });
-});
+}
 const styles = StyleSheet.create({
   overlay: {
     zIndex: 1

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

@@ -1 +1 @@
-{"version":3,"names":["memo","useMemo","Animated","StyleSheet","View","useDerivedValue","NavigationScreenProvider","useScreenAnimation","jsx","_jsx","OverlayHost","scene","overlayScreenState","OverlayComponent","descriptor","options","overlay","screenAnimation","relativeProgress","get","stackProgress","overlayProps","progress","pointerEvents","style","styles","container","floating","absoluteFill","children","navigation","route","create","zIndex","flex"],"sourceRoot":"../../../../../src","sources":["components/overlay/variations/overlay-host.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACrC,SAASC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACzD,SAASC,eAAe,QAAQ,yBAAyB;AAEzD,SAASC,wBAAwB,QAAQ,wDAAwD;AACjG,SAASC,kBAAkB,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAYzE,OAAO,MAAMC,WAAW,gBAAGV,IAAI,CAAC,SAASU,WAAWA,CAAC;EACpDC,KAAK;EACLC;AACiB,CAAC,EAAE;EACpB,MAAMC,gBAAgB,GAAGF,KAAK,CAACG,UAAU,CAACC,OAAO,CAACC,OAAO;EAEzD,MAAMC,eAAe,GAAGV,kBAAkB,CAAC,CAAC;EAC5C,MAAMW,gBAAgB,GAAGb,eAAe,CAAC,MAAM;IAC9C,SAAS;;IACT,OAAOY,eAAe,CAACE,GAAG,CAAC,CAAC,CAACC,aAAa;EAC3C,CAAC,CAAC;EAEF,MAAMC,YAAwD,GAAGpB,OAAO,CACvE,OAAO;IACN,GAAGW,kBAAkB;IACrBU,QAAQ,EAAEJ;EACX,CAAC,CAAC,EACF,CAACA,gBAAgB,EAAEN,kBAAkB,CACtC,CAAC;EAED,IAAI,CAACC,gBAAgB,EAAE;IACtB,OAAO,IAAI;EACZ;EAEA,oBACCJ,IAAA,CAACP,QAAQ,CAACE,IAAI;IACbmB,aAAa,EAAC,UAAU;IACxBC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAED,MAAM,CAACE,QAAQ,EAAExB,UAAU,CAACyB,YAAY,CAAE;IAAAC,QAAA,eAEpEpB,IAAA,CAACH,wBAAwB;MACxBwB,UAAU,EAAEnB,KAAK,CAACG,UAAU,CAACgB,UAAW;MACxCC,KAAK,EAAEpB,KAAK,CAACoB,KAAM;MAAAF,QAAA,eAEnBpB,IAAA,CAACL,IAAI;QACJmB,aAAa,EAAC,UAAU;QACxBC,KAAK,EAAE,CAACrB,UAAU,CAACyB,YAAY,EAAEH,MAAM,CAACT,OAAO,CAAE;QAAAa,QAAA,eAEjDpB,IAAA,CAACI,gBAAgB;UAAA,GAAKQ;QAAY,CAAG;MAAC,CACjC;IAAC,CACkB;EAAC,CACb,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMI,MAAM,GAAGtB,UAAU,CAAC6B,MAAM,CAAC;EAChChB,OAAO,EAAE;IACRiB,MAAM,EAAE;EACT,CAAC;EACDP,SAAS,EAAE;IACVQ,IAAI,EAAE;EACP,CAAC;EACDP,QAAQ,EAAE;IACTM,MAAM,EAAE;EACT;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","useMemo","useRef","StyleSheet","View","Animated","useDerivedValue","snapDescriptorToIndex","NavigationScreenProvider","useOptionalScreenAnimationStore","useOptionalScreenSlotStore","useBlankStackStore","retainReadyOverlayResources","useOverlaySlot","jsx","_jsx","OverlayHost","scene","driverScene","previousOverlayScene","activity","layerIndex","overlayAnimationStore","route","key","driverAnimationStore","previousOverlayAnimationStore","driverSlots","overlayComponentRef","descriptor","options","overlay","OverlayComponent","current","readyResourcesRef","readyResources","ReadyOverlayHost","undefined","scenes","focusedIndex","routeKeys","routes","focusedScene","length","focusedDescriptor","animatedProps","animatedStyle","overlayInterpolator","screenStyleInterpolator","driverInterpolator","interpolatorReady","isIncoming","relativeProgress","screenInterpolatorPropsRevision","get","screenInterpolatorProps","stackProgress","overlayProps","index","indexOf","focusedRoute","meta","navigation","snapTo","progress","pointerEvents","style","styles","container","floating","absoluteFill","zIndex","children","create","flex"],"sourceRoot":"../../../../../src","sources":["components/overlay/variations/overlay-host.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -5,20 +5,16 @@ import { useAnimatedReaction } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { useScreenOptionsStore } from "../../../providers/screen/options";
-import { useStackCoreStore } from "../../../providers/stack/core.provider";
-import { StackType } from "../../../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)
  */
 export function useBackdropPointerEvents() {
   const screenOptions = useScreenOptionsStore();
   const descriptorBackdropBehavior = useDescriptorsStore(store => store.options.backdropBehavior);
-  const stackType = useStackCoreStore(store => store.flags.STACK_TYPE);
   const [runtimeBackdropBehavior, setRuntimeBackdropBehavior] = useState(undefined);
   useAnimatedReaction(() => screenOptions.get().backdropBehavior, (next, previous) => {
     "worklet";
@@ -27,8 +23,7 @@ export function useBackdropPointerEvents() {
       scheduleOnRN(setRuntimeBackdropBehavior, next);
     }
   }, [screenOptions]);
-  const isComponentStack = stackType === 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/module/components/screen-container/hooks/use-backdrop-pointer-events.js.map

@@ -1 +1 @@
-{"version":3,"names":["useState","useAnimatedReaction","scheduleOnRN","useDescriptorsStore","useScreenOptionsStore","useStackCoreStore","StackType","useBackdropPointerEvents","screenOptions","descriptorBackdropBehavior","store","options","backdropBehavior","stackType","flags","STACK_TYPE","runtimeBackdropBehavior","setRuntimeBackdropBehavior","undefined","get","next","previous","isComponentStack","COMPONENT","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,OAAO;AAChC,SAASC,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SAASC,qBAAqB,QAAQ,mCAAmC;AACzE,SAASC,iBAAiB,QAAQ,wCAAwC;AAE1E,SAASC,SAAS,QAAQ,4BAA4B;AAQtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,wBAAwBA,CAAA,EAAgC;EACvE,MAAMC,aAAa,GAAGJ,qBAAqB,CAAC,CAAC;EAC7C,MAAMK,0BAA0B,GAAGN,mBAAmB,CACpDO,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAMC,SAAS,GAAGR,iBAAiB,CAAEK,KAAK,IAAKA,KAAK,CAACI,KAAK,CAACC,UAAU,CAAC;EACtE,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAGjB,QAAQ,CAEpEkB,SAAS,CAAC;EAEZjB,mBAAmB,CAClB,MAAMO,aAAa,CAACW,GAAG,CAAC,CAAC,CAACP,gBAAgB,EAC1C,CAACQ,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtBnB,YAAY,CAACe,0BAA0B,EAAEG,IAAI,CAAC;IAC/C;EACD,CAAC,EACD,CAACZ,aAAa,CACf,CAAC;EAED,MAAMc,gBAAgB,GAAGT,SAAS,KAAKP,SAAS,CAACiB,SAAS;EAC1D,MAAMX,gBAAkC,GACvCI,uBAAuB,IACvBP,0BAA0B,KACzBa,gBAAgB,GAAG,aAAa,GAAG,OAAO,CAAC;EAE7C,MAAME,aAAa,GAClBZ,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGM,SAAS;EAE5D,MAAMO,gBAAgB,GACrBb,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEY,aAAa;IAAEZ,gBAAgB;IAAEa;EAAiB,CAAC;AAC7D","ignoreList":[]}
+{"version":3,"names":["useState","useAnimatedReaction","scheduleOnRN","useDescriptorsStore","useScreenOptionsStore","useBackdropPointerEvents","screenOptions","descriptorBackdropBehavior","store","options","backdropBehavior","runtimeBackdropBehavior","setRuntimeBackdropBehavior","undefined","get","next","previous","pointerEvents","isBackdropActive"],"sourceRoot":"../../../../../src","sources":["components/screen-container/hooks/use-backdrop-pointer-events.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,OAAO;AAChC,SAASC,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SAASC,qBAAqB,QAAQ,mCAAmC;AASzE;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,wBAAwBA,CAAA,EAAgC;EACvE,MAAMC,aAAa,GAAGF,qBAAqB,CAAC,CAAC;EAC7C,MAAMG,0BAA0B,GAAGJ,mBAAmB,CACpDK,KAAK,IAAKA,KAAK,CAACC,OAAO,CAACC,gBAC1B,CAAC;EACD,MAAM,CAACC,uBAAuB,EAAEC,0BAA0B,CAAC,GAAGZ,QAAQ,CAEpEa,SAAS,CAAC;EAEZZ,mBAAmB,CAClB,MAAMK,aAAa,CAACQ,GAAG,CAAC,CAAC,CAACJ,gBAAgB,EAC1C,CAACK,IAAI,EAAEC,QAAQ,KAAK;IACnB,SAAS;;IACT,IAAID,IAAI,KAAKC,QAAQ,EAAE;MACtBd,YAAY,CAACU,0BAA0B,EAAEG,IAAI,CAAC;IAC/C;EACD,CAAC,EACD,CAACT,aAAa,CACf,CAAC;EAED,MAAMI,gBAAkC,GACvCC,uBAAuB,IAAIJ,0BAA0B,IAAI,OAAO;EAEjE,MAAMU,aAAa,GAClBP,gBAAgB,KAAK,aAAa,GAAG,UAAU,GAAGG,SAAS;EAE5D,MAAMK,gBAAgB,GACrBR,gBAAgB,KAAK,SAAS,IAAIA,gBAAgB,KAAK,UAAU;EAElE,OAAO;IAAEO,aAAa;IAAEP,gBAAgB;IAAEQ;EAAiB,CAAC;AAC7D","ignoreList":[]}

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

@@ -20,14 +20,13 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
   isBackdropActive
 }) {
   const {
-    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 isGestureDismissEnabled = useDescriptorsStore(store => store.options.gestureEnabled !== false);
-  const canDismiss = isGestureDismissEnabled && !isRemovePrevented;
+  const canDismiss = isGestureDismissEnabled;
   const transitionSpec = useDescriptorsStore(store => store.options.transitionSpec);
   const animations = AnimationStore.getBag(routeKey);
   const {

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

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","scheduleOnRN","scheduleOnUI","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":["components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","scheduleOnRN","scheduleOnUI","DefaultSnapSpec","useNavigationHelpers","useDescriptorsStore","useSlotProps","useSlotStyles","AnimationStore","GestureStore","SystemStore","animateToProgress","findCollapseTarget","usesLayerRenderProps","jsx","_jsx","BackdropLayer","backdropBehavior","isBackdropActive","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":["components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,25 +1,23 @@
 "use strict";
 
-/** biome-ignore-all lint/style/noNonNullAssertion: <Screen gesture is under the gesture context, so this will always exist.> */
 import { memo, useMemo } from "react";
 import { StyleSheet, View } from "react-native";
 import { GestureDetector } from "react-native-gesture-handler";
 import Animated from "react-native-reanimated";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
-import { useGestureStore } from "../../../providers/screen/gestures";
+import { useScreenGestureStore } from "../../../providers/screen/gestures";
 import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import { ScreenFallbackHost } from "../../boundary/portal/components/boundary-portal/components/host";
 import { useContentLayout } from "../hooks/use-content-layout";
 import { MaybeMaskedNavigationContainer } from "./maybe-masked-navigation-container";
 import { usesLayerRenderProps } from "./render-component";
-import { SurfaceContainer } from "./surface-container";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const ContentLayer = /*#__PURE__*/memo(({
   children,
   pointerEvents,
   isBackdropActive
 }) => {
-  const gestureContext = useGestureStore();
+  const gestureContext = useScreenGestureStore();
   const ContentComponent = useDescriptorsStore(store => store.options.contentComponent);
   const isNavigationMaskEnabled = useDescriptorsStore(store => !!store.options.navigationMaskEnabled);
   const hasAutoSnapPoint = useDescriptorsStore(store => store.options.snapPoints?.includes("auto") ?? false);
@@ -32,17 +30,14 @@ export const ContentLayer = /*#__PURE__*/memo(({
   const animatedContentProps = useSlotProps("content");
   const contentStyles = [styles.content, animatedContentStyle];
   const contentProps = animatedContentProps;
-  const contentChildren = /*#__PURE__*/_jsx(MaybeMaskedNavigationContainer, {
+  const contentChildren = /*#__PURE__*/_jsxs(MaybeMaskedNavigationContainer, {
     pointerEvents: contentPointerEvents,
     enabled: isNavigationMaskEnabled,
-    children: /*#__PURE__*/_jsxs(SurfaceContainer, {
-      pointerEvents: contentPointerEvents,
-      children: [hasAutoSnapPoint ? /*#__PURE__*/_jsx(View, {
-        collapsable: false,
-        onLayout: handleContentLayout,
-        children: children
-      }) : children, /*#__PURE__*/_jsx(ScreenFallbackHost, {})]
-    })
+    children: [hasAutoSnapPoint ? /*#__PURE__*/_jsx(View, {
+      collapsable: false,
+      onLayout: handleContentLayout,
+      children: children
+    }) : children, /*#__PURE__*/_jsx(ScreenFallbackHost, {})]
   });
   return /*#__PURE__*/_jsx(GestureDetector, {
     gesture: gestureContext.detectorGesture,

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

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

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

@@ -3,8 +3,7 @@
 const containsRouteKey = (routes, routeKey) => routes.some(route => route.key === routeKey || (route.state ? containsRouteKey(route.state.routes, routeKey) : false));
 export const doesNavigatorOwnCloseAction = ({
   state,
-  action,
-  isNested
+  action
 }) => {
   if (typeof action.target === "string") {
     return action.target === state.key;
@@ -12,7 +11,7 @@ export const doesNavigatorOwnCloseAction = ({
   if (typeof action.source === "string") {
     return containsRouteKey(state.routes, action.source);
   }
-  return !isNested;
+  return true;
 };
 
 /** Only the focused removable route owns a stack close transition. */

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

@@ -1 +1 @@
-{"version":3,"names":["containsRouteKey","routes","routeKey","some","route","key","state","doesNavigatorOwnCloseAction","action","isNested","target","source","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;AAEF,OAAO,MAAMK,2BAA2B,GAAGA,CAAC;EAC3CD,KAAK;EACLE,MAAM;EACNC;AAKD,CAAC,KAAc;EACd,IAAI,OAAOD,MAAM,CAACE,MAAM,KAAK,QAAQ,EAAE;IACtC,OAAOF,MAAM,CAACE,MAAM,KAAKJ,KAAK,CAACD,GAAG;EACnC;EAEA,IAAI,OAAOG,MAAM,CAACG,MAAM,KAAK,QAAQ,EAAE;IACtC,OAAOX,gBAAgB,CAACM,KAAK,CAACL,MAAM,EAAEO,MAAM,CAACG,MAAM,CAAC;EACrD;EAEA,OAAO,CAACF,QAAQ;AACjB,CAAC;;AAED;AACA,OAAO,MAAMG,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":[]}
+{"version":3,"names":["containsRouteKey","routes","routeKey","some","route","key","state","doesNavigatorOwnCloseAction","action","target","source","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;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/components/screen-lifecycle/hooks/use-close-transition-intent.js

@@ -4,24 +4,21 @@ 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 { useCurrentScreenRelationships } from "../../../providers/screen/use-current-screen-relationships";
 import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
 import { useStackCoreStore } from "../../../providers/stack/core.provider";
 import { GestureStore } from "../../../stores/gesture.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";
 export function useCloseTransitionIntent(current) {
   const routeKey = current.route.key;
+  const transitionsAlwaysOn = useStackCoreStore(store => store.flags.TRANSITIONS_ALWAYS_ON);
+  const handleCloseRoute = useBlankStackStore(store => store.handleCloseRoute);
+  const isBlankStackClosing = useBlankStackStore(store => store.scenesByKey[routeKey]?.activity === "closing");
   const {
-    STACK_TYPE: stackType,
-    TRANSITIONS_ALWAYS_ON: transitionsAlwaysOn
-  } = useStackCoreStore(store => store.flags);
-  const handleCloseRoute = useBlankStackStore(store => store?.handleCloseRoute);
-  const isBlankStackClosing = useBlankStackStore(store => store?.scenesByKey[routeKey]?.activity === "closing");
-  const ancestorKeys = useDescriptorsStore(store => store.derivations.ancestorKeys);
-  const parentScreenKey = ancestorKeys[0];
+    parentScreenKey
+  } = useCurrentScreenRelationships();
   const {
     dismissScreen,
     requestDismiss
@@ -43,7 +40,7 @@ export function useCloseTransitionIntent(current) {
       dispatchCloseAction(pendingAction, action => {
         current.navigation.dispatch(action);
       });
-    } else if (stackType !== StackType.NATIVE && handleCloseRoute) {
+    } else if (handleCloseRoute) {
       handleCloseRoute({
         route: current.route
       });
@@ -61,8 +58,7 @@ export function useCloseTransitionIntent(current) {
     const action = event.data.action;
     const ownsAction = doesNavigatorOwnCloseAction({
       state,
-      action,
-      isNested: ancestorKeys.length > 0
+      action
     });
     const shouldIntercept = shouldInterceptClose({
       enabled: hasTransitionsEnabled(current.options, transitionsAlwaysOn),
@@ -81,11 +77,12 @@ export function useCloseTransitionIntent(current) {
     }
     event.preventDefault();
   });
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: navigation listener should only rebind when the navigator instance changes
   useLayoutEffect(() => {
+    if (handleCloseRoute) {
+      return;
+    }
     return current.navigation.addListener?.("beforeRemove", handleBeforeRemove);
-  }, [current.navigation]);
+  }, [current.navigation, handleBeforeRemove, handleCloseRoute]);
   return {
     completeClose
   };

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

@@ -1 +1 @@
-{"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","isNested","length","shouldIntercept","enabled","options","ancestorDismissing","get","focusedIndex","index","preventDefault","addListener"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-close-transition-intent.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useLayoutEffect","useMemo","useRef","useNavigationHelpers","useStableCallback","hasTransitionsEnabled","useCurrentScreenRelationships","useBlankStackStore","useStackCoreStore","GestureStore","dispatchCloseAction","isCloseActionReplay","doesNavigatorOwnCloseAction","shouldInterceptClose","resetStoresForScreen","useCloseTransitionIntent","current","routeKey","route","key","transitionsAlwaysOn","store","flags","TRANSITIONS_ALWAYS_ON","handleCloseRoute","isBlankStackClosing","scenesByKey","activity","parentScreenKey","dismissScreen","requestDismiss","pendingActionRef","nearestAncestorDismissing","peekBag","dismissing","completeClose","pendingAction","action","navigation","dispatch","handleBeforeRemove","event","data","state","getState","routeIndex","routes","findIndex","ownsAction","shouldIntercept","enabled","options","ancestorDismissing","get","focusedIndex","index","preventDefault","addListener"],"sourceRoot":"../../../../../src","sources":["components/screen-lifecycle/hooks/use-close-transition-intent.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/components/stack-view.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import { NavigationContext, NavigationRouteContext } from "@react-navigation/native";
 import { memo } from "react";
+import { NavigationScreenProvider } from "../providers/navigation/navigation-host.provider";
 import { ScreenComposer } from "../providers/screen/screen-composer";
 import { BlankStackProvider, useBlankStackStore } from "../providers/stack/blank-stack.provider";
 import { StackCoreProvider } from "../providers/stack/core.provider";
@@ -13,17 +13,15 @@ const BlankNavigationProvider = /*#__PURE__*/memo(function BlankNavigationProvid
   children,
   routeKey
 }) {
-  const navigation = useBlankStackStore(store => store?.scenesByKey[routeKey]?.descriptor.navigation);
-  const route = useBlankStackStore(store => store?.scenesByKey[routeKey]?.route);
+  const navigation = useBlankStackStore(store => store.scenesByKey[routeKey]?.descriptor.navigation);
+  const route = useBlankStackStore(store => store.scenesByKey[routeKey]?.route);
   if (!navigation || !route) {
     throw new Error(`Blank stack scene "${routeKey}" was not found.`);
   }
-  return /*#__PURE__*/_jsx(NavigationContext.Provider, {
-    value: navigation,
-    children: /*#__PURE__*/_jsx(NavigationRouteContext.Provider, {
-      value: route,
-      children: children
-    })
+  return /*#__PURE__*/_jsx(NavigationScreenProvider, {
+    navigation: navigation,
+    route: route,
+    children: children
   });
 });
 const BlankSceneContent = /*#__PURE__*/memo(function BlankSceneContent({
@@ -51,9 +49,8 @@ const BlankSceneRow = /*#__PURE__*/memo(function BlankSceneRow({
 const EMPTY_ROUTE_KEYS = [];
 const StackViewContent = /*#__PURE__*/memo(function StackViewContent() {
   const routeKeys = useBlankStackStore(store => store?.routeKeys ?? EMPTY_ROUTE_KEYS);
-  const shouldShowFloatOverlay = useBlankStackStore(store => store?.shouldShowFloatOverlay ?? false);
   return /*#__PURE__*/_jsxs(PortalProvider, {
-    children: [shouldShowFloatOverlay ? /*#__PURE__*/_jsx(Overlay.Float, {}) : null, /*#__PURE__*/_jsx(ActivityContainer, {
+    children: [/*#__PURE__*/_jsx(Overlay.Float, {}), /*#__PURE__*/_jsx(ActivityContainer, {
       children: routeKeys.map(routeKey => /*#__PURE__*/_jsx(BlankSceneRow, {
         routeKey: routeKey
       }, routeKey))
@@ -61,10 +58,7 @@ const StackViewContent = /*#__PURE__*/memo(function StackViewContent() {
   });
 });
 export const StackView = /*#__PURE__*/memo(function StackView({
-  DISABLE_NATIVE_SCREENS,
-  DISABLE_NATIVE_SCREEN_CONTAINER,
   TRANSITIONS_ALWAYS_ON,
-  STACK_TYPE,
   state,
   navigation,
   descriptors,
@@ -72,10 +66,7 @@ export const StackView = /*#__PURE__*/memo(function StackView({
 }) {
   return /*#__PURE__*/_jsx(StackCoreProvider, {
     config: {
-      TRANSITIONS_ALWAYS_ON: TRANSITIONS_ALWAYS_ON ?? true,
-      STACK_TYPE,
-      DISABLE_NATIVE_SCREENS: DISABLE_NATIVE_SCREENS ?? false,
-      DISABLE_NATIVE_SCREEN_CONTAINER
+      TRANSITIONS_ALWAYS_ON: TRANSITIONS_ALWAYS_ON ?? true
     },
     children: /*#__PURE__*/_jsx(BlankStackProvider, {
       state: state,

package/lib/module/components/stack-view.js.map

@@ -1 +1 @@
-{"version":3,"names":["NavigationContext","NavigationRouteContext","memo","ScreenComposer","BlankStackProvider","useBlankStackStore","StackCoreProvider","ActivityContainer","ActivityScreen","PortalProvider","Overlay","jsx","_jsx","jsxs","_jsxs","BlankNavigationProvider","children","routeKey","navigation","store","scenesByKey","descriptor","route","Error","Provider","value","BlankSceneContent","render","BlankSceneRow","EMPTY_ROUTE_KEYS","StackViewContent","routeKeys","shouldShowFloatOverlay","Float","map","StackView","DISABLE_NATIVE_SCREENS","DISABLE_NATIVE_SCREEN_CONTAINER","TRANSITIONS_ALWAYS_ON","STACK_TYPE","state","descriptors","describe","config"],"sourceRoot":"../../../src","sources":["components/stack-view.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","NavigationScreenProvider","ScreenComposer","BlankStackProvider","useBlankStackStore","StackCoreProvider","ActivityContainer","ActivityScreen","PortalProvider","Overlay","jsx","_jsx","jsxs","_jsxs","BlankNavigationProvider","children","routeKey","navigation","store","scenesByKey","descriptor","route","Error","BlankSceneContent","render","BlankSceneRow","EMPTY_ROUTE_KEYS","StackViewContent","routeKeys","Float","map","StackView","TRANSITIONS_ALWAYS_ON","state","descriptors","describe","config"],"sourceRoot":"../../../src","sources":["components/stack-view.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/configs/presets.js

@@ -250,13 +250,11 @@ export const SharedIGImage = ({
         id
       }).navigation.zoom() ?? {};
 
-      // Extract raw style values from bounds result (legacy format)
+      // Read the bound-specific slots before normalizing the full result.
       const sourceStyle = navigationStyles[id];
       const containerStyle = navigationStyles[NAVIGATION_MASK_CONTAINER_STYLE_ID];
       const maskStyle = navigationStyles[NAVIGATION_MASK_ELEMENT_STYLE_ID];
-
-      // Normalize bounds result to new slot format for spreading
-      const normalizedNav = normalizeInterpolatedStyle(navigationStyles).result;
+      const normalizedNav = normalizeInterpolatedStyle(navigationStyles);
       if (focused) {
         return {
           ...normalizedNav,
@@ -364,7 +362,7 @@ export const SharedAppleMusic = ({
 
       const normX = active.gesture.handoff.normX;
       const normY = active.gesture.handoff.normY;
-      const initialGesture = active.gesture.handoff.active ?? active.gesture.handoff.direction;
+      const initialGesture = active.gesture.handoff.active;
 
       /**
        * ===============================
@@ -558,9 +556,7 @@ export const SharedXImage = ({
         id
       }).navigation.zoom() ?? {};
       const maskStyle = navigationStyles[NAVIGATION_MASK_ELEMENT_STYLE_ID];
-
-      // Normalize bounds result to new slot format for spreading
-      const normalizedNav = normalizeInterpolatedStyle(navigationStyles).result;
+      const normalizedNav = normalizeInterpolatedStyle(navigationStyles);
       const dragY = interpolate(current.gesture.normY, [-1, 0, 1], [-screen.height, 0, screen.height]);
       const contentY = interpolate(progress, [0, 1], [dragY >= 0 ? screen.height : -screen.height, 0]);
       const overlayClr = interpolateColor(current.progress - Math.abs(current.gesture.normY), [0, 1], ["rgba(0,0,0,0)", "rgba(0,0,0,1)"]);