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

package/lib/module/components/overlay/helpers/run-overlay-slot-interpolator.js

@@ -0,0 +1,36 @@
+"use strict";
+
+import { createInterpolatorScope } from "../../../providers/screen/styles/helpers/create-interpolator-scope";
+import { normalizeSlots } from "../../../providers/screen/styles/helpers/normalize-slots";
+import { selectInterpolatorFrame } from "../../../providers/screen/styles/helpers/select-interpolator-frame";
+import { logger } from "../../../utils/logger";
+export const runOverlaySlotInterpolator = ({
+  frame,
+  interpolator,
+  transition
+}) => {
+  "worklet";
+
+  if (!interpolator) {
+    return undefined;
+  }
+  try {
+    const raw = interpolator(createInterpolatorScope({
+      frame,
+      selectedFrame: selectInterpolatorFrame(frame, false),
+      transition
+    }));
+    if (!raw?.overlay) {
+      return undefined;
+    }
+    return normalizeSlots({
+      overlay: raw.overlay
+    }).overlay;
+  } catch (_) {
+    if (__DEV__) {
+      logger.warn("screenStyleInterpolator must be a worklet");
+    }
+    return undefined;
+  }
+};
+//# sourceMappingURL=run-overlay-slot-interpolator.js.map

package/lib/module/components/overlay/helpers/run-overlay-slot-interpolator.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createInterpolatorScope","normalizeSlots","selectInterpolatorFrame","logger","runOverlaySlotInterpolator","frame","interpolator","transition","undefined","raw","selectedFrame","overlay","_","__DEV__","warn"],"sourceRoot":"../../../../../src","sources":["components/overlay/helpers/run-overlay-slot-interpolator.ts"],"mappings":";;AACA,SAASA,uBAAuB,QAAQ,oEAAoE;AAC5G,SAASC,cAAc,QAAQ,0DAA0D;AACzF,SAASC,uBAAuB,QAAQ,oEAAoE;AAM5G,SAASC,MAAM,QAAQ,uBAAuB;AAE9C,OAAO,MAAMC,0BAA0B,GAAGA,CAAC;EAC1CC,KAAK;EACLC,YAAY;EACZC;AAKD,CAAC,KAAgD;EAChD,SAAS;;EAET,IAAI,CAACD,YAAY,EAAE;IAClB,OAAOE,SAAS;EACjB;EAEA,IAAI;IACH,MAAMC,GAAG,GAAGH,YAAY,CACvBN,uBAAuB,CAAC;MACvBK,KAAK;MACLK,aAAa,EAAER,uBAAuB,CAACG,KAAK,EAAE,KAAK,CAAC;MACpDE;IACD,CAAC,CACF,CAAC;IAED,IAAI,CAACE,GAAG,EAAEE,OAAO,EAAE;MAClB,OAAOH,SAAS;IACjB;IAEA,OAAOP,cAAc,CAAC;MAAEU,OAAO,EAAEF,GAAG,CAACE;IAAQ,CAAC,CAAC,CAACA,OAAO;EACxD,CAAC,CAAC,OAAOC,CAAC,EAAE;IACX,IAAIC,OAAO,EAAE;MACZV,MAAM,CAACW,IAAI,CAAC,2CAA2C,CAAC;IACzD;IAEA,OAAON,SAAS;EACjB;AACD,CAAC","ignoreList":[]}

package/lib/module/components/overlay/hooks/use-overlay-slot.js

@@ -0,0 +1,85 @@
+"use strict";
+
+import { useMemo } from "react";
+import { useWindowDimensions } from "react-native";
+import { useAnimatedProps, useAnimatedStyle, useDerivedValue } from "react-native-reanimated";
+import { NO_PROPS, NO_STYLES } from "../../../constants";
+import { useBuildTransitionAccessor } from "../../../providers/screen/animation/helpers/accessors/use-build-transition-accessor";
+import { collectInterpolatorSharedValues } from "../../../providers/screen/styles/helpers/collect-interpolator-shared-values";
+import { getVisibilityBlockOffset } from "../../../utils/visibility-block-offset";
+import { createOverlayInterpolatorFrame, shouldUseOverlayGestureDriver } from "../helpers/create-overlay-interpolator-frame";
+import { runOverlaySlotInterpolator } from "../helpers/run-overlay-slot-interpolator";
+export const useOverlaySlot = ({
+  overlayAnimationStore,
+  overlayInterpolator,
+  driverAnimationStore,
+  previousOverlayAnimationStore,
+  driverInterpolator,
+  interpolatorReady,
+  isIncoming
+}) => {
+  const {
+    height
+  } = useWindowDimensions();
+  const overlayTransition = useBuildTransitionAccessor(overlayAnimationStore);
+  const driverTransition = useBuildTransitionAccessor(driverAnimationStore);
+  const interpolatorSharedValues = useMemo(() => collectInterpolatorSharedValues([overlayInterpolator, driverInterpolator]), [overlayInterpolator, driverInterpolator]);
+  const overlaySlot = useDerivedValue(() => {
+    "worklet";
+
+    overlayAnimationStore.screenInterpolatorPropsRevision.get();
+    driverAnimationStore.screenInterpolatorPropsRevision.get();
+    previousOverlayAnimationStore?.screenInterpolatorPropsRevision.get();
+    for (let index = 0; index < interpolatorSharedValues.length; index++) {
+      interpolatorSharedValues[index]?.get();
+    }
+    const overlayFrame = overlayAnimationStore.screenInterpolatorProps.get();
+    const driverFrame = driverAnimationStore.screenInterpolatorProps.get();
+    const overlayOwnsGesture = shouldUseOverlayGestureDriver(overlayFrame, driverFrame);
+    const frame = createOverlayInterpolatorFrame({
+      overlayFrame,
+      driverFrame: overlayOwnsGesture ? overlayFrame : driverFrame,
+      previousOverlayFrame: previousOverlayAnimationStore?.screenInterpolatorProps.get()
+    });
+    return runOverlaySlotInterpolator({
+      frame,
+      interpolator: overlayOwnsGesture ? overlayInterpolator : driverInterpolator,
+      transition: overlayOwnsGesture ? overlayTransition : driverTransition
+    });
+  });
+  const animatedStyle = useAnimatedStyle(() => {
+    "worklet";
+
+    const slot = overlaySlot.get();
+    if (!slot) {
+      return NO_STYLES;
+    }
+    if (isIncoming && !interpolatorReady.get()) {
+      return {
+        transform: [{
+          translateY: getVisibilityBlockOffset(height)
+        }]
+      };
+    }
+    return slot.style ?? NO_STYLES;
+  });
+  const animatedProps = useAnimatedProps(() => {
+    "worklet";
+
+    const slotProps = overlaySlot.get()?.props;
+    if (!slotProps) {
+      return NO_PROPS;
+    }
+    const {
+      pointerEvents: _pointerEvents,
+      teleport: _teleport,
+      ...props
+    } = slotProps;
+    return props;
+  });
+  return {
+    animatedProps,
+    animatedStyle
+  };
+};
+//# sourceMappingURL=use-overlay-slot.js.map

package/lib/module/components/overlay/hooks/use-overlay-slot.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useMemo","useWindowDimensions","useAnimatedProps","useAnimatedStyle","useDerivedValue","NO_PROPS","NO_STYLES","useBuildTransitionAccessor","collectInterpolatorSharedValues","getVisibilityBlockOffset","createOverlayInterpolatorFrame","shouldUseOverlayGestureDriver","runOverlaySlotInterpolator","useOverlaySlot","overlayAnimationStore","overlayInterpolator","driverAnimationStore","previousOverlayAnimationStore","driverInterpolator","interpolatorReady","isIncoming","height","overlayTransition","driverTransition","interpolatorSharedValues","overlaySlot","screenInterpolatorPropsRevision","get","index","length","overlayFrame","screenInterpolatorProps","driverFrame","overlayOwnsGesture","frame","previousOverlayFrame","interpolator","transition","animatedStyle","slot","transform","translateY","style","animatedProps","slotProps","props","pointerEvents","_pointerEvents","teleport","_teleport"],"sourceRoot":"../../../../../src","sources":["components/overlay/hooks/use-overlay-slot.ts"],"mappings":"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","ignoreList":[]}

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

@@ -1,13 +1,8 @@
 "use strict";
 
-import { useMemo } from "react";
-import { snapDescriptorToIndex } from "../../../animation/snap-to";
-import { useStack } from "../../../hooks/navigation/use-stack";
-import { ScreenAnimationProvider } from "../../../providers/screen/animation";
-import { DescriptorsProvider } from "../../../providers/screen/descriptors";
-import { ScreenOptionsProvider } from "../../../providers/screen/options";
-import { ScreenSlotProvider } from "../../../providers/screen/styles";
-import { getActiveFloatOverlay } from "../helpers/get-active-overlay";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { useStackCoreStore } from "../../../providers/stack/core.provider";
+import { getFloatOverlayStack, getFloatOverlayTransitions } from "../helpers/get-active-overlay";
 import { OverlayHost } from "./overlay-host";
 
 /**
@@ -16,70 +11,23 @@ import { OverlayHost } from "./overlay-host";
  */
 import { jsx as _jsx } from "react/jsx-runtime";
 export function FloatOverlay() {
-  const {
-    scenes,
-    focusedIndex,
-    flags,
-    routes,
-    routeKeys
-  } = useStack();
-  const activeOverlay = useMemo(() => getActiveFloatOverlay(scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON), [scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON]);
-  const overlayData = useMemo(() => {
-    if (!activeOverlay) return null;
-    const {
-      scene,
-      overlayIndex
-    } = activeOverlay;
-    const previous = scenes[overlayIndex - 1]?.descriptor;
-    const current = scene.descriptor;
-    const next = scenes[overlayIndex + 1]?.descriptor;
-    const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
-    const focusedDescriptor = focusedScene?.descriptor;
-    const overlayScreenState = {
-      index: routeKeys.indexOf(current.route.key),
-      options: focusedDescriptor?.options ?? {},
-      routes,
-      focusedRoute: focusedScene?.route ?? current.route,
-      focusedIndex,
-      meta: focusedDescriptor?.options?.meta,
-      navigation: current.navigation,
-      snapTo: index => {
-        snapDescriptorToIndex(current, index);
-      }
-    };
-    return {
-      scene,
-      previous,
-      current,
-      next,
-      overlayScreenState
-    };
-  }, [activeOverlay, scenes, focusedIndex, routeKeys, routes]);
-  if (!overlayData) {
+  const scenes = useBlankStackStore(store => store.scenes);
+  const transitionsAlwaysOn = useStackCoreStore(store => store.flags.TRANSITIONS_ALWAYS_ON);
+  const overlayStack = getFloatOverlayStack(scenes, transitionsAlwaysOn);
+  if (overlayStack.length === 0) {
     return null;
   }
-  const {
+  const overlayTransitions = getFloatOverlayTransitions(overlayStack, scenes);
+  return overlayTransitions.map(({
     scene,
-    previous,
-    current,
-    next,
-    overlayScreenState
-  } = overlayData;
-  return /*#__PURE__*/_jsx(DescriptorsProvider, {
-    current: current,
-    previous: previous,
-    next: next,
-    children: /*#__PURE__*/_jsx(ScreenOptionsProvider, {
-      children: /*#__PURE__*/_jsx(ScreenAnimationProvider, {
-        children: /*#__PURE__*/_jsx(ScreenSlotProvider, {
-          isFloatingOverlay: true,
-          children: /*#__PURE__*/_jsx(OverlayHost, {
-            scene: scene,
-            overlayScreenState: overlayScreenState
-          })
-        })
-      })
-    })
-  });
+    activity,
+    driverScene
+  }, layerIndex) => /*#__PURE__*/_jsx(OverlayHost, {
+    scene: scene,
+    driverScene: driverScene,
+    previousOverlayScene: overlayTransitions[layerIndex - 1]?.scene,
+    activity: activity,
+    layerIndex: layerIndex
+  }, scene.route.key));
 }
 //# sourceMappingURL=float-overlay.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useMemo","snapDescriptorToIndex","useStack","ScreenAnimationProvider","DescriptorsProvider","ScreenOptionsProvider","ScreenSlotProvider","getActiveFloatOverlay","OverlayHost","jsx","_jsx","FloatOverlay","scenes","focusedIndex","flags","routes","routeKeys","activeOverlay","TRANSITIONS_ALWAYS_ON","overlayData","scene","overlayIndex","previous","descriptor","current","next","focusedScene","length","focusedDescriptor","overlayScreenState","index","indexOf","route","key","options","focusedRoute","meta","navigation","snapTo","children","isFloatingOverlay"],"sourceRoot":"../../../../../src","sources":["components/overlay/variations/float-overlay.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useBlankStackStore","useStackCoreStore","getFloatOverlayStack","getFloatOverlayTransitions","OverlayHost","jsx","_jsx","FloatOverlay","scenes","store","transitionsAlwaysOn","flags","TRANSITIONS_ALWAYS_ON","overlayStack","length","overlayTransitions","map","scene","activity","driverScene","layerIndex","previousOverlayScene","route","key"],"sourceRoot":"../../../../../src","sources":["components/overlay/variations/float-overlay.tsx"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,+CAA+C;AAClF,SAASC,iBAAiB,QAAQ,wCAAwC;AAE1E,SACCC,oBAAoB,EACpBC,0BAA0B,QACpB,+BAA+B;AACtC,SAASC,WAAW,QAAQ,gBAAgB;;AAE5C;AACA;AACA;AACA;AAHA,SAAAC,GAAA,IAAAC,IAAA;AAIA,OAAO,SAASC,YAAYA,CAAA,EAAG;EAC9B,MAAMC,MAAM,GAAGR,kBAAkB,CAAES,KAAK,IAAKA,KAAK,CAACD,MAAM,CAAC;EAC1D,MAAME,mBAAmB,GAAGT,iBAAiB,CAC3CQ,KAAK,IAAKA,KAAK,CAACE,KAAK,CAACC,qBACxB,CAAC;EAED,MAAMC,YAAY,GAAGX,oBAAoB,CAACM,MAAM,EAAEE,mBAAmB,CAAC;EACtE,IAAIG,YAAY,CAACC,MAAM,KAAK,CAAC,EAAE;IAC9B,OAAO,IAAI;EACZ;EAEA,MAAMC,kBAAkB,GAAGZ,0BAA0B,CAACU,YAAY,EAAEL,MAAM,CAAC;EAE3E,OAAOO,kBAAkB,CAACC,GAAG,CAC5B,CAAC;IAAEC,KAAK;IAAEC,QAAQ;IAAEC;EAAY,CAAC,EAAEC,UAAU,kBAC5Cd,IAAA,CAACF,WAAW;IAEXa,KAAK,EAAEA,KAAM;IACbE,WAAW,EAAEA,WAAY;IACzBE,oBAAoB,EAAEN,kBAAkB,CAACK,UAAU,GAAG,CAAC,CAAC,EAAEH,KAAM;IAChEC,QAAQ,EAAEA,QAAS;IACnBE,UAAU,EAAEA;EAAW,GALlBH,KAAK,CAACK,KAAK,CAACC,GAMjB,CAEH,CAAC;AACF","ignoreList":[]}

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

@@ -3,7 +3,7 @@
 import { memo, useCallback, useMemo } from "react";
 import { Pressable, StyleSheet } from "react-native";
 import Animated from "react-native-reanimated";
-import { scheduleOnUI } from "react-native-worklets";
+import { scheduleOnRN, scheduleOnUI } from "react-native-worklets";
 import { DefaultSnapSpec } from "../../../configs/specs";
 import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
 import { useDescriptorsStore } from "../../../providers/screen/descriptors";
@@ -20,12 +20,13 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
   isBackdropActive
 }) {
   const {
-    dismissScreen
+    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;
   const transitionSpec = useDescriptorsStore(store => store.options.transitionSpec);
   const animations = AnimationStore.getBag(routeKey);
   const {
@@ -36,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);
@@ -75,12 +76,14 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer({
           spec,
           animations,
           targetProgress,
-          animationProgress,
-          onAnimationFinish: shouldDismiss ? dismissScreen : undefined
+          animationProgress
         });
+        if (shouldDismiss) {
+          scheduleOnRN(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/components/screen-container/layers/backdrop.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","scheduleOnUI","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":["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":[]}