react-native-screen-transitions 3.4.0-alpha.3 → 3.4.0-alpha.5

package/lib/module/shared/components/create-boundary-component/hooks/use-group-active-measurement.js

@@ -1,7 +1,10 @@
 "use strict";
 
-import { useAnimatedReaction } from "react-native-reanimated";
+import { useAnimatedReaction, useDerivedValue, useSharedValue } from "react-native-reanimated";
+import { EPSILON } from "../../../constants";
+import { AnimationStore } from "../../../stores/animation.store";
 import { BoundStore } from "../../../stores/bounds";
+import { GestureStore } from "../../../stores/gesture.store";
 import { canFlushGroupActiveMeasurement, resolveGroupActiveMeasurementAction } from "./helpers/measurement-rules";
 import { useDeferredMeasurementTrigger } from "./use-deferred-measurement-trigger";
 
@@ -17,18 +20,55 @@ export const useGroupActiveMeasurement = params => {
     enabled,
     group,
     id,
+    currentScreenKey,
     shouldUpdateDestination,
-    isAnimating,
     maybeMeasureAndStore
   } = params;
   const idStr = String(id);
   const allGroups = BoundStore.getGroups();
+  const progress = AnimationStore.getValue(currentScreenKey, "progress");
+  const animating = AnimationStore.getValue(currentScreenKey, "animating");
+  const entering = AnimationStore.getValue(currentScreenKey, "entering");
+  const closing = AnimationStore.getValue(currentScreenKey, "closing");
+  const dragging = GestureStore.getValue(currentScreenKey, "dragging");
+  const dismissing = GestureStore.getValue(currentScreenKey, "dismissing");
+  const hasSettledOpenOnce = useSharedValue(false);
+  useAnimatedReaction(() => {
+    "worklet";
+
+    if (!enabled || !shouldUpdateDestination) return false;
+    return progress.value >= 1 - EPSILON && animating.value === 0 && entering.value === 0 && closing.value === 0 && dragging.value === 0 && dismissing.value === 0;
+  }, isSettledOpen => {
+    "worklet";
+
+    if (isSettledOpen) {
+      hasSettledOpenOnce.value = true;
+    }
+  }, [enabled, shouldUpdateDestination, progress, animating, entering, closing, dragging, dismissing, hasSettledOpenOnce]);
+  const isRefreshBlocked = useDerivedValue(() => {
+    "worklet";
+
+    if (!enabled || !shouldUpdateDestination) return 0;
+    if (!hasSettledOpenOnce.value) return 1;
+    if (progress.value < 1 - EPSILON) return 1;
+    if (animating.value !== 0) return 1;
+    if (entering.value !== 0) return 1;
+    if (closing.value !== 0) return 1;
+    if (dragging.value !== 0) return 1;
+    if (dismissing.value !== 0) return 1;
+    return 0;
+  });
   const {
     clearPendingMeasurement,
     queueOrFlushMeasurement
   } = useDeferredMeasurementTrigger({
     enabled,
-    isAnimating,
+    /**
+     * The reason to do extra guard checks for isAnimating is because a user may mid animation drag, causing
+     * the src component to be wrongly measured. This in turns leads to faulty src measurements being used, giving us a weird teleport
+     * animation rather than a smooth 'SET' transition when dst is actually dismissing.
+     */
+    isAnimating: isRefreshBlocked,
     canFlush: () => {
       "worklet";
 
@@ -37,7 +77,7 @@ export const useGroupActiveMeasurement = params => {
         isEligible: !!group && shouldUpdateDestination,
         memberId: idStr,
         activeId: group ? allGroups.value[group]?.activeId ?? null : null
-      });
+      }) && hasSettledOpenOnce.value;
     },
     onFlush: () => {
       "worklet";
@@ -68,8 +108,11 @@ export const useGroupActiveMeasurement = params => {
       return;
     }
     if (action === "queue-or-flush") {
+      if (!hasSettledOpenOnce.value) {
+        return;
+      }
       queueOrFlushMeasurement();
     }
-  }, [enabled, group, idStr, shouldUpdateDestination, clearPendingMeasurement, queueOrFlushMeasurement]);
+  }, [enabled, group, idStr, currentScreenKey, shouldUpdateDestination, hasSettledOpenOnce, clearPendingMeasurement, queueOrFlushMeasurement]);
 };
 //# sourceMappingURL=use-group-active-measurement.js.map

package/lib/module/shared/components/create-boundary-component/hooks/use-group-active-measurement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAnimatedReaction","BoundStore","canFlushGroupActiveMeasurement","resolveGroupActiveMeasurementAction","useDeferredMeasurementTrigger","useGroupActiveMeasurement","params","enabled","group","id","shouldUpdateDestination","isAnimating","maybeMeasureAndStore","idStr","String","allGroups","getGroups","clearPendingMeasurement","queueOrFlushMeasurement","canFlush","isEligible","memberId","activeId","value","onFlush","intent","previousActiveId","action"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-group-active-measurement.ts"],"mappings":";;AAAA,SAA2BA,mBAAmB,QAAQ,yBAAyB;AAC/E,SAASC,UAAU,QAAQ,wBAAwB;AAEnD,SACCC,8BAA8B,EAC9BC,mCAAmC,QAC7B,6BAA6B;AACpC,SAASC,6BAA6B,QAAQ,oCAAoC;;AAElF;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,yBAAyB,GAAIC,MAOzC,IAAK;EACL,MAAM;IACLC,OAAO;IACPC,KAAK;IACLC,EAAE;IACFC,uBAAuB;IACvBC,WAAW;IACXC;EACD,CAAC,GAAGN,MAAM;EACV,MAAMO,KAAK,GAAGC,MAAM,CAACL,EAAE,CAAC;EAExB,MAAMM,SAAS,GAAGd,UAAU,CAACe,SAAS,CAAC,CAAC;EACxC,MAAM;IAAEC,uBAAuB;IAAEC;EAAwB,CAAC,GACzDd,6BAA6B,CAAC;IAC7BG,OAAO;IACPI,WAAW;IACXQ,QAAQ,EAAEA,CAAA,KAAM;MACf,SAAS;;MACT,OAAOjB,8BAA8B,CAAC;QACrCK,OAAO;QACPa,UAAU,EAAE,CAAC,CAACZ,KAAK,IAAIE,uBAAuB;QAC9CW,QAAQ,EAAER,KAAK;QACfS,QAAQ,EAAEd,KAAK,GAAIO,SAAS,CAACQ,KAAK,CAACf,KAAK,CAAC,EAAEc,QAAQ,IAAI,IAAI,GAAI;MAChE,CAAC,CAAC;IACH,CAAC;IACDE,OAAO,EAAEA,CAAA,KAAM;MACd,SAAS;;MACTZ,oBAAoB,CAAC;QAAEa,MAAM,EAAE;MAAsB,CAAC,CAAC;IACxD;EACD,CAAC,CAAC;EAEHzB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,IAAI,CAACO,OAAO,EAAE,OAAO,IAAI;IACzB,IAAI,CAACC,KAAK,EAAE,OAAO,IAAI;IACvB,OAAOO,SAAS,CAACQ,KAAK,CAACf,KAAK,CAAC,EAAEc,QAAQ,IAAI,IAAI;EAChD,CAAC,EACD,CAACA,QAAQ,EAAEI,gBAAgB,KAAK;IAC/B,SAAS;;IACT,MAAMC,MAAM,GAAGxB,mCAAmC,CAAC;MAClDI,OAAO;MACPa,UAAU,EAAE,CAAC,CAACZ,KAAK,IAAIE,uBAAuB;MAC9CW,QAAQ,EAAER,KAAK;MACfS,QAAQ;MACRI;IACD,CAAC,CAAC;IAEF,IAAIC,MAAM,KAAK,eAAe,EAAE;MAC/BV,uBAAuB,CAAC,CAAC;MACzB;IACD;IAEA,IAAIU,MAAM,KAAK,gBAAgB,EAAE;MAChCT,uBAAuB,CAAC,CAAC;IAC1B;EACD,CAAC,EACD,CACCX,OAAO,EACPC,KAAK,EACLK,KAAK,EACLH,uBAAuB,EACvBO,uBAAuB,EACvBC,uBAAuB,CAEzB,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["useAnimatedReaction","useDerivedValue","useSharedValue","EPSILON","AnimationStore","BoundStore","GestureStore","canFlushGroupActiveMeasurement","resolveGroupActiveMeasurementAction","useDeferredMeasurementTrigger","useGroupActiveMeasurement","params","enabled","group","id","currentScreenKey","shouldUpdateDestination","maybeMeasureAndStore","idStr","String","allGroups","getGroups","progress","getValue","animating","entering","closing","dragging","dismissing","hasSettledOpenOnce","value","isSettledOpen","isRefreshBlocked","clearPendingMeasurement","queueOrFlushMeasurement","isAnimating","canFlush","isEligible","memberId","activeId","onFlush","intent","previousActiveId","action"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-group-active-measurement.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/hooks/use-initial-layout-handler.js

@@ -15,8 +15,8 @@ export const useInitialLayoutHandler = params => {
     expectedSourceScreenKey,
     maybeMeasureAndStore
   } = params;
-  const isAnimating = AnimationStore.getRouteAnimation(currentScreenKey, "animating");
-  const ancestorAnimations = ancestorKeys.map(key => AnimationStore.getRouteAnimation(key, "animating"));
+  const isAnimating = AnimationStore.getValue(currentScreenKey, "animating");
+  const ancestorAnimations = ancestorKeys.map(key => AnimationStore.getValue(key, "animating"));
   const hasMeasuredOnLayout = useSharedValue(false);
   const handleInitialLayout = useCallback(() => {
     "worklet";

package/lib/module/shared/components/create-boundary-component/hooks/use-initial-layout-handler.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useLayoutEffect","runOnUI","useSharedValue","AnimationStore","BoundStore","resolvePendingSourceKey","resolveInitialLayoutMeasurementIntent","useInitialLayoutHandler","params","enabled","sharedBoundTag","currentScreenKey","ancestorKeys","expectedSourceScreenKey","maybeMeasureAndStore","isAnimating","getRouteAnimation","ancestorAnimations","map","key","hasMeasuredOnLayout","handleInitialLayout","get","isAnyAnimating","i","length","hasPendingLinkFromSource","resolvedSourceKey","intent","hasSharedBoundTag","set"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-initial-layout-handler.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,QAAQ,OAAO;AACpD,SAASC,OAAO,EAAEC,cAAc,QAAQ,yBAAyB;AACjE,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,uBAAuB,QAAQ,uCAAuC;AAE/E,SAASC,qCAAqC,QAAQ,6BAA6B;AAEnF,OAAO,MAAMC,uBAAuB,GAAIC,MAOvC,IAAK;EACL,MAAM;IACLC,OAAO;IACPC,cAAc;IACdC,gBAAgB;IAChBC,YAAY;IACZC,uBAAuB;IACvBC;EACD,CAAC,GAAGN,MAAM;EAEV,MAAMO,WAAW,GAAGZ,cAAc,CAACa,iBAAiB,CACnDL,gBAAgB,EAChB,WACD,CAAC;EAED,MAAMM,kBAAkB,GAAGL,YAAY,CAACM,GAAG,CAAEC,GAAG,IAC/ChB,cAAc,CAACa,iBAAiB,CAACG,GAAG,EAAE,WAAW,CAClD,CAAC;EAED,MAAMC,mBAAmB,GAAGlB,cAAc,CAAC,KAAK,CAAC;EAEjD,MAAMmB,mBAAmB,GAAGtB,WAAW,CAAC,MAAM;IAC7C,SAAS;;IACT,IAAI,CAACU,OAAO,EAAE;IACd,IAAI,CAACC,cAAc,IAAIU,mBAAmB,CAACE,GAAG,CAAC,CAAC,EAAE;IAElD,IAAIC,cAAc,GAAGR,WAAW,CAACO,GAAG,CAAC,CAAC;IACtC,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGP,kBAAkB,CAACQ,MAAM,EAAED,CAAC,EAAE,EAAE;MACnD,IAAIP,kBAAkB,CAACO,CAAC,CAAC,CAACF,GAAG,CAAC,CAAC,EAAE;QAChCC,cAAc,GAAG,CAAC;QAClB;MACD;IACD;IAEA,IAAIG,wBAAwB,GAAG,KAAK;IAEpC,IAAIH,cAAc,EAAE;MACnB,MAAMI,iBAAiB,GAAGtB,uBAAuB,CAChDK,cAAc,EACdG,uBACD,CAAC;MACD,IACCc,iBAAiB,IACjBvB,UAAU,CAACsB,wBAAwB,CAAChB,cAAc,EAAEiB,iBAAiB,CAAC,EACrE;QACDD,wBAAwB,GAAG,IAAI;MAChC;IACD;IAEA,MAAME,MAAM,GAAGtB,qCAAqC,CAAC;MACpDG,OAAO;MACPoB,iBAAiB,EAAE,CAAC,CAACnB,cAAc;MACnCU,mBAAmB,EAAEA,mBAAmB,CAACE,GAAG,CAAC,CAAC;MAC9CC,cAAc,EAAE,CAAC,CAACA,cAAc;MAChCG;IACD,CAAC,CAAC;IACF,IAAI,CAACE,MAAM,EAAE;IAEbd,oBAAoB,CAAC;MACpBc;IACD,CAAC,CAAC;IAEFR,mBAAmB,CAACU,GAAG,CAAC,IAAI,CAAC;EAC9B,CAAC,EAAE,CACFrB,OAAO,EACPC,cAAc,EACdU,mBAAmB,EACnBL,WAAW,EACXE,kBAAkB,EAClBH,oBAAoB,EACpBD,uBAAuB,CACvB,CAAC;;EAEF;EACA;EACAb,eAAe,CAAC,MAAM;IACrB,IAAI,CAACS,OAAO,EAAE;IACdR,OAAO,CAACoB,mBAAmB,CAAC,CAAC,CAAC;EAC/B,CAAC,EAAE,CAACZ,OAAO,EAAEY,mBAAmB,CAAC,CAAC;AACnC,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useLayoutEffect","runOnUI","useSharedValue","AnimationStore","BoundStore","resolvePendingSourceKey","resolveInitialLayoutMeasurementIntent","useInitialLayoutHandler","params","enabled","sharedBoundTag","currentScreenKey","ancestorKeys","expectedSourceScreenKey","maybeMeasureAndStore","isAnimating","getValue","ancestorAnimations","map","key","hasMeasuredOnLayout","handleInitialLayout","get","isAnyAnimating","i","length","hasPendingLinkFromSource","resolvedSourceKey","intent","hasSharedBoundTag","set"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/hooks/use-initial-layout-handler.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,QAAQ,OAAO;AACpD,SAASC,OAAO,EAAEC,cAAc,QAAQ,yBAAyB;AACjE,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,UAAU,QAAQ,wBAAwB;AACnD,SAASC,uBAAuB,QAAQ,uCAAuC;AAE/E,SAASC,qCAAqC,QAAQ,6BAA6B;AAEnF,OAAO,MAAMC,uBAAuB,GAAIC,MAOvC,IAAK;EACL,MAAM;IACLC,OAAO;IACPC,cAAc;IACdC,gBAAgB;IAChBC,YAAY;IACZC,uBAAuB;IACvBC;EACD,CAAC,GAAGN,MAAM;EAEV,MAAMO,WAAW,GAAGZ,cAAc,CAACa,QAAQ,CAACL,gBAAgB,EAAE,WAAW,CAAC;EAE1E,MAAMM,kBAAkB,GAAGL,YAAY,CAACM,GAAG,CAAEC,GAAG,IAC/ChB,cAAc,CAACa,QAAQ,CAACG,GAAG,EAAE,WAAW,CACzC,CAAC;EAED,MAAMC,mBAAmB,GAAGlB,cAAc,CAAC,KAAK,CAAC;EAEjD,MAAMmB,mBAAmB,GAAGtB,WAAW,CAAC,MAAM;IAC7C,SAAS;;IACT,IAAI,CAACU,OAAO,EAAE;IACd,IAAI,CAACC,cAAc,IAAIU,mBAAmB,CAACE,GAAG,CAAC,CAAC,EAAE;IAElD,IAAIC,cAAc,GAAGR,WAAW,CAACO,GAAG,CAAC,CAAC;IACtC,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGP,kBAAkB,CAACQ,MAAM,EAAED,CAAC,EAAE,EAAE;MACnD,IAAIP,kBAAkB,CAACO,CAAC,CAAC,CAACF,GAAG,CAAC,CAAC,EAAE;QAChCC,cAAc,GAAG,CAAC;QAClB;MACD;IACD;IAEA,IAAIG,wBAAwB,GAAG,KAAK;IAEpC,IAAIH,cAAc,EAAE;MACnB,MAAMI,iBAAiB,GAAGtB,uBAAuB,CAChDK,cAAc,EACdG,uBACD,CAAC;MACD,IACCc,iBAAiB,IACjBvB,UAAU,CAACsB,wBAAwB,CAAChB,cAAc,EAAEiB,iBAAiB,CAAC,EACrE;QACDD,wBAAwB,GAAG,IAAI;MAChC;IACD;IAEA,MAAME,MAAM,GAAGtB,qCAAqC,CAAC;MACpDG,OAAO;MACPoB,iBAAiB,EAAE,CAAC,CAACnB,cAAc;MACnCU,mBAAmB,EAAEA,mBAAmB,CAACE,GAAG,CAAC,CAAC;MAC9CC,cAAc,EAAE,CAAC,CAACA,cAAc;MAChCG;IACD,CAAC,CAAC;IACF,IAAI,CAACE,MAAM,EAAE;IAEbd,oBAAoB,CAAC;MACpBc;IACD,CAAC,CAAC;IAEFR,mBAAmB,CAACU,GAAG,CAAC,IAAI,CAAC;EAC9B,CAAC,EAAE,CACFrB,OAAO,EACPC,cAAc,EACdU,mBAAmB,EACnBL,WAAW,EACXE,kBAAkB,EAClBH,oBAAoB,EACpBD,uBAAuB,CACvB,CAAC;;EAEF;EACA;EACAb,eAAe,CAAC,MAAM;IACrB,IAAI,CAACS,OAAO,EAAE;IACdR,OAAO,CAACoB,mBAAmB,CAAC,CAAC,CAAC;EAC/B,CAAC,EAAE,CAACZ,OAAO,EAAEY,mBAAmB,CAAC,CAAC;AACnC,CAAC","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/index.js

@@ -72,8 +72,8 @@ export function createBoundaryComponent(Wrapped, options = {}) {
         method
       };
     }, [anchor, scaleMode, target, method]);
-    const isAnimating = AnimationStore.getRouteAnimation(currentScreenKey, "animating");
-    const progress = AnimationStore.getRouteAnimation(currentScreenKey, "progress");
+    const isAnimating = AnimationStore.getValue(currentScreenKey, "animating");
+    const progress = AnimationStore.getValue(currentScreenKey, "progress");
     const preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
     const {
       associatedStyles
@@ -144,14 +144,14 @@ export function createBoundaryComponent(Wrapped, options = {}) {
       enabled: runtimeEnabled,
       group,
       id,
+      currentScreenKey,
       shouldUpdateDestination,
-      isAnimating,
       maybeMeasureAndStore
     });
 
-    // Source-side analog for grouped retargeting: when an unfocused/source
-    // boundary becomes the active member, refresh its snapshot (and source
-    // link when one exists) so close transitions don't use stale geometry.
+    // Source-side grouped retargeting: when an unfocused/source boundary
+    // becomes the active member, refresh its snapshot and source link so
+    // close transitions do not use stale pre-scroll geometry.
     useGroupActiveSourceMeasurement({
       enabled: runtimeEnabled,
       group,

package/lib/module/shared/components/create-boundary-component/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","useCallback","useMemo","Pressable","View","RNView","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useLayoutAnchorContext","useDescriptorDerivations","AnimationStore","BoundStore","prepareStyleForBounds","useAutoSourceMeasurement","useBoundaryMeasureAndStore","useBoundaryPresence","useGroupActiveMeasurement","useGroupActiveSourceMeasurement","useInitialLayoutHandler","usePendingDestinationMeasurement","usePendingDestinationRetryMeasurement","useScrollSettledMeasurement","buildBoundaryMatchKey","jsx","_jsx","setGroupSelectionOnUI","group","id","setGroupActiveId","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","_ref","enabled","anchor","scaleMode","target","method","style","onPress","rest","sharedBoundTag","animatedRef","previousScreenKey","preferredSourceScreenKey","currentScreenKey","nextScreenKey","ancestorKeys","navigatorKey","ancestorNavigatorKeys","hasConfiguredInterpolator","runtimeEnabled","hasNextScreen","shouldUpdateDestination","layoutAnchor","boundaryConfig","undefined","isAnimating","getRouteAnimation","progress","preparedStyles","associatedStyles","resetTransformOnUnset","maybeMeasureAndStore","shouldRunDestinationEffects","expectedSourceScreenKey","animating","handlePress","args","String","intent","resolvedOnPress","ref","collapsable","BoundaryView","displayName","BoundaryPressable","Boundary"],"sourceRoot":"../../../../../src","sources":["shared/components/create-boundary-component/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","useCallback","useMemo","Pressable","View","RNView","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useLayoutAnchorContext","useDescriptorDerivations","AnimationStore","BoundStore","prepareStyleForBounds","useAutoSourceMeasurement","useBoundaryMeasureAndStore","useBoundaryPresence","useGroupActiveMeasurement","useGroupActiveSourceMeasurement","useInitialLayoutHandler","usePendingDestinationMeasurement","usePendingDestinationRetryMeasurement","useScrollSettledMeasurement","buildBoundaryMatchKey","jsx","_jsx","setGroupSelectionOnUI","group","id","setGroupActiveId","createBoundaryComponent","Wrapped","options","alreadyAnimated","AnimatedComponent","createAnimatedComponent","Inner","props","_ref","enabled","anchor","scaleMode","target","method","style","onPress","rest","sharedBoundTag","animatedRef","previousScreenKey","preferredSourceScreenKey","currentScreenKey","nextScreenKey","ancestorKeys","navigatorKey","ancestorNavigatorKeys","hasConfiguredInterpolator","runtimeEnabled","hasNextScreen","shouldUpdateDestination","layoutAnchor","boundaryConfig","undefined","isAnimating","getValue","progress","preparedStyles","associatedStyles","resetTransformOnUnset","maybeMeasureAndStore","shouldRunDestinationEffects","expectedSourceScreenKey","animating","handlePress","args","String","intent","resolvedOnPress","ref","collapsable","BoundaryView","displayName","BoundaryPressable","Boundary"],"sourceRoot":"../../../../../src","sources":["shared/components/create-boundary-component/index.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/native-screen.js

@@ -42,9 +42,9 @@ export const NativeScreen = ({
   const topIndex = routesLength - 1;
   const topRouteKey = routes[topIndex]?.key ?? routeKey;
   const screenRef = useAnimatedRef();
-  const sceneClosing = AnimationStore.getRouteAnimation(routeKey, "closing");
-  const topSceneProgress = AnimationStore.getRouteAnimation(topRouteKey, "progress");
-  const topSceneClosing = AnimationStore.getRouteAnimation(topRouteKey, "closing");
+  const sceneClosing = AnimationStore.getValue(routeKey, "closing");
+  const topSceneProgress = AnimationStore.getValue(topRouteKey, "progress");
+  const topSceneClosing = AnimationStore.getValue(topRouteKey, "closing");
   const screenActivity = useSharedValue(ScreenActivity.TRANSITIONING_OR_BELOW_TOP);
   useDerivedValue(() => {
     if (!topSceneProgress) {

package/lib/module/shared/components/native-screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","Animated","Extrapolation","interpolate","useAnimatedProps","useAnimatedRef","useDerivedValue","useSharedValue","Screen","RNSScreen","EPSILON","useStack","LayoutAnchorProvider","useManagedStackContext","AnimationStore","jsx","_jsx","PASSTHROUGH","ScreenActivity","POINT_NONE","POINT_BOX_NONE","AnimatedNativeScreen","createAnimatedComponent","NativeScreen","routeKey","index","isPreloaded","children","freezeOnBlur","shouldFreeze","flags","DISABLE_NATIVE_SCREENS","routes","optimisticFocusedIndex","activeScreensLimit","backdropBehaviors","routesLength","length","topIndex","topRouteKey","key","screenRef","sceneClosing","getRouteAnimation","topSceneProgress","topSceneClosing","screenActivity","TRANSITIONING_OR_BELOW_TOP","set","INACTIVE","focusedIndex","value","topIsClosing","get","postCloseActiveStart","Math","max","next","ON_TOP","outputValue","v","CLAMP","trunc","animatedProps","activity","isClosing","activeIndex","isActive","activeBackdrop","activeAllowsPassthrough","isAllowedPassthroughBelow","pointerEvents","activityState","View","ref","collapsable","style","absoluteFill","anchorRef","enabled"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["StyleSheet","Animated","Extrapolation","interpolate","useAnimatedProps","useAnimatedRef","useDerivedValue","useSharedValue","Screen","RNSScreen","EPSILON","useStack","LayoutAnchorProvider","useManagedStackContext","AnimationStore","jsx","_jsx","PASSTHROUGH","ScreenActivity","POINT_NONE","POINT_BOX_NONE","AnimatedNativeScreen","createAnimatedComponent","NativeScreen","routeKey","index","isPreloaded","children","freezeOnBlur","shouldFreeze","flags","DISABLE_NATIVE_SCREENS","routes","optimisticFocusedIndex","activeScreensLimit","backdropBehaviors","routesLength","length","topIndex","topRouteKey","key","screenRef","sceneClosing","getValue","topSceneProgress","topSceneClosing","screenActivity","TRANSITIONING_OR_BELOW_TOP","set","INACTIVE","focusedIndex","value","topIsClosing","get","postCloseActiveStart","Math","max","next","ON_TOP","outputValue","v","CLAMP","trunc","animatedProps","activity","isClosing","activeIndex","isActive","activeBackdrop","activeAllowsPassthrough","isAllowedPassthroughBelow","pointerEvents","activityState","View","ref","collapsable","style","absoluteFill","anchorRef","enabled"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/screen-container/deferred-visibility-host.js

@@ -3,7 +3,7 @@
 import { memo } from "react";
 import { StyleSheet } from "react-native";
 import Animated, { useAnimatedStyle } from "react-native-reanimated";
-import { HIDDEN_STYLE, NO_STYLES } from "../../constants";
+import { HIDDEN_STYLE, VISIBLE_STYLE } from "../../constants";
 import { useScreenStyles } from "../../providers/screen/styles.provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
@@ -22,7 +22,7 @@ export const DeferredVisibilityHost = /*#__PURE__*/memo(({
   const animatedStyle = useAnimatedStyle(() => {
     "worklet";
 
-    return resolutionMode.value === "deferred" ? HIDDEN_STYLE : NO_STYLES;
+    return resolutionMode.value === "deferred" ? HIDDEN_STYLE : VISIBLE_STYLE;
   });
   return /*#__PURE__*/_jsx(Animated.View, {
     collapsable: false,

package/lib/module/shared/components/screen-container/deferred-visibility-host.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","StyleSheet","Animated","useAnimatedStyle","HIDDEN_STYLE","NO_STYLES","useScreenStyles","jsx","_jsx","DeferredVisibilityHost","children","resolutionMode","animatedStyle","value","View","collapsable","style","styles","host","create","flex"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-container/deferred-visibility-host.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,UAAU,QAAQ,cAAc;AACzC,OAAOC,QAAQ,IAAIC,gBAAgB,QAAQ,yBAAyB;AACpE,SAASC,YAAY,EAAEC,SAAS,QAAQ,iBAAiB;AACzD,SAASC,eAAe,QAAQ,wCAAwC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzE;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,gBAAGT,IAAI,CAAC,CAAC;EAAEU;AAAgB,CAAC,KAAK;EACnE,MAAM;IAAEC;EAAe,CAAC,GAAGL,eAAe,CAAC,CAAC;EAE5C,MAAMM,aAAa,GAAGT,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IACT,OAAOQ,cAAc,CAACE,KAAK,KAAK,UAAU,GAAGT,YAAY,GAAGC,SAAS;EACtE,CAAC,CAAC;EAEF,oBACCG,IAAA,CAACN,QAAQ,CAACY,IAAI;IAACC,WAAW,EAAE,KAAM;IAACC,KAAK,EAAE,CAACC,MAAM,CAACC,IAAI,EAAEN,aAAa,CAAE;IAAAF,QAAA,EACrEA;EAAQ,CACK,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMO,MAAM,GAAGhB,UAAU,CAACkB,MAAM,CAAC;EAChCD,IAAI,EAAE;IACLE,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","StyleSheet","Animated","useAnimatedStyle","HIDDEN_STYLE","VISIBLE_STYLE","useScreenStyles","jsx","_jsx","DeferredVisibilityHost","children","resolutionMode","animatedStyle","value","View","collapsable","style","styles","host","create","flex"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-container/deferred-visibility-host.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,UAAU,QAAQ,cAAc;AACzC,OAAOC,QAAQ,IAAIC,gBAAgB,QAAQ,yBAAyB;AACpE,SAASC,YAAY,EAAEC,aAAa,QAAQ,iBAAiB;AAC7D,SAASC,eAAe,QAAQ,wCAAwC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzE;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,gBAAGT,IAAI,CAAC,CAAC;EAAEU;AAAgB,CAAC,KAAK;EACnE,MAAM;IAAEC;EAAe,CAAC,GAAGL,eAAe,CAAC,CAAC;EAE5C,MAAMM,aAAa,GAAGT,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IACT,OAAOQ,cAAc,CAACE,KAAK,KAAK,UAAU,GAAGT,YAAY,GAAGC,aAAa;EAC1E,CAAC,CAAC;EAEF,oBACCG,IAAA,CAACN,QAAQ,CAACY,IAAI;IAACC,WAAW,EAAE,KAAM;IAACC,KAAK,EAAE,CAACC,MAAM,CAACC,IAAI,EAAEN,aAAa,CAAE;IAAAF,QAAA,EACrEA;EAAQ,CACK,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMO,MAAM,GAAGhB,UAAU,CAACkB,MAAM,CAAC;EAChCD,IAAI,EAAE;IACLE,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/components/screen-container/hooks/use-content-layout.js

@@ -5,6 +5,7 @@ import { useWindowDimensions } from "react-native";
 import { runOnUI } from "react-native-reanimated";
 import { useDescriptorDerivations, useDescriptors } from "../../../providers/screen/descriptors";
 import { AnimationStore } from "../../../stores/animation.store";
+import { SystemStore } from "../../../stores/system.store";
 import { animateToProgress } from "../../../utils/animation/animate-to-progress";
 export function useContentLayout() {
   const {
@@ -17,9 +18,12 @@ export function useContentLayout() {
     height: screenHeight
   } = useWindowDimensions();
   const routeKey = current.route.key;
-  const animations = AnimationStore.getRouteAnimations(routeKey);
-  const autoSnapPointValue = AnimationStore.getAnimation(routeKey, "autoSnapPoint");
-  const contentLayoutValue = AnimationStore.getAnimation(routeKey, "contentLayout");
+  const animations = AnimationStore.getBag(routeKey);
+  const targetProgressValue = SystemStore.getValue(routeKey, "targetProgress");
+  const resolvedAutoSnapPointValue = SystemStore.getValue(routeKey, "resolvedAutoSnapPoint");
+  const measuredContentLayoutValue = SystemStore.getValue(routeKey, "measuredContentLayout");
+  const experimental_animateOnInitialMount = current.options.experimental_animateOnInitialMount;
+  const transitionSpec = current.options.transitionSpec;
   return useCallback(event => {
     const {
       width,
@@ -27,30 +31,30 @@ export function useContentLayout() {
     } = event.nativeEvent.layout;
     if (width <= 0 || height <= 0) return;
     const fraction = Math.min(height / screenHeight, 1);
-    const transitionSpec = current.options.transitionSpec;
-    runOnUI((nextWidth, nextHeight, nextFraction, isInitialScreen, spec) => {
+    runOnUI((nextWidth, nextHeight, nextFraction) => {
       "worklet";
 
-      contentLayoutValue.value = {
+      measuredContentLayoutValue.value = {
         width: nextWidth,
         height: nextHeight
       };
-      const isFirstMeasurement = autoSnapPointValue.value <= 0;
-      autoSnapPointValue.value = nextFraction;
+      const isFirstMeasurement = resolvedAutoSnapPointValue.value <= 0;
+      resolvedAutoSnapPointValue.value = nextFraction;
       if (!isFirstMeasurement || animations.progress.value !== 0 || animations.animating.value !== 0) {
         return;
       }
-      if (isInitialScreen) {
-        animations.targetProgress.value = nextFraction;
+      if (isFirstKey && !experimental_animateOnInitialMount) {
+        targetProgressValue.value = nextFraction;
         animations.progress.value = nextFraction;
         return;
       }
       animateToProgress({
         target: nextFraction,
-        spec,
-        animations
+        spec: transitionSpec,
+        animations,
+        targetProgress: targetProgressValue
       });
-    })(width, height, fraction, isFirstKey, transitionSpec);
-  }, [animations, autoSnapPointValue, contentLayoutValue, current.options.transitionSpec, isFirstKey, screenHeight]);
+    })(width, height, fraction);
+  }, [animations, targetProgressValue, resolvedAutoSnapPointValue, measuredContentLayoutValue, isFirstKey, screenHeight, experimental_animateOnInitialMount, transitionSpec]);
 }
 //# sourceMappingURL=use-content-layout.js.map

package/lib/module/shared/components/screen-container/hooks/use-content-layout.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useWindowDimensions","runOnUI","useDescriptorDerivations","useDescriptors","AnimationStore","animateToProgress","useContentLayout","current","isFirstKey","height","screenHeight","routeKey","route","key","animations","getRouteAnimations","autoSnapPointValue","getAnimation","contentLayoutValue","event","width","nativeEvent","layout","fraction","Math","min","transitionSpec","options","nextWidth","nextHeight","nextFraction","isInitialScreen","spec","value","isFirstMeasurement","progress","animating","targetProgress","target"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-content-layout.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAAiCC,mBAAmB,QAAQ,cAAc;AAC1E,SAASC,OAAO,QAAQ,yBAAyB;AACjD,SACCC,wBAAwB,EACxBC,cAAc,QACR,uCAAuC;AAC9C,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,iBAAiB,QAAQ,8CAA8C;AAEhF,OAAO,SAASC,gBAAgBA,CAAA,EAAG;EAClC,MAAM;IAAEC;EAAQ,CAAC,GAAGJ,cAAc,CAAC,CAAC;EACpC,MAAM;IAAEK;EAAW,CAAC,GAAGN,wBAAwB,CAAC,CAAC;EACjD,MAAM;IAAEO,MAAM,EAAEC;EAAa,CAAC,GAAGV,mBAAmB,CAAC,CAAC;EACtD,MAAMW,QAAQ,GAAGJ,OAAO,CAACK,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGV,cAAc,CAACW,kBAAkB,CAACJ,QAAQ,CAAC;EAC9D,MAAMK,kBAAkB,GAAGZ,cAAc,CAACa,YAAY,CACrDN,QAAQ,EACR,eACD,CAAC;EACD,MAAMO,kBAAkB,GAAGd,cAAc,CAACa,YAAY,CACrDN,QAAQ,EACR,eACD,CAAC;EAED,OAAOZ,WAAW,CAChBoB,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEX;IAAO,CAAC,GAAGU,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIX,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMc,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAAChB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IACnD,MAAMgB,cAAc,GAAGnB,OAAO,CAACoB,OAAO,CAACD,cAAc;IAErDzB,OAAO,CACN,CACC2B,SAAiB,EACjBC,UAAkB,EAClBC,YAAoB,EACpBC,eAAwB,EACxBC,IAA2B,KACvB;MACJ,SAAS;;MACTd,kBAAkB,CAACe,KAAK,GAAG;QAC1Bb,KAAK,EAAEQ,SAAS;QAChBnB,MAAM,EAAEoB;MACT,CAAC;MAED,MAAMK,kBAAkB,GAAGlB,kBAAkB,CAACiB,KAAK,IAAI,CAAC;MACxDjB,kBAAkB,CAACiB,KAAK,GAAGH,YAAY;MAEvC,IACC,CAACI,kBAAkB,IACnBpB,UAAU,CAACqB,QAAQ,CAACF,KAAK,KAAK,CAAC,IAC/BnB,UAAU,CAACsB,SAAS,CAACH,KAAK,KAAK,CAAC,EAC/B;QACD;MACD;MAEA,IAAIF,eAAe,EAAE;QACpBjB,UAAU,CAACuB,cAAc,CAACJ,KAAK,GAAGH,YAAY;QAC9ChB,UAAU,CAACqB,QAAQ,CAACF,KAAK,GAAGH,YAAY;QACxC;MACD;MAEAzB,iBAAiB,CAAC;QACjBiC,MAAM,EAAER,YAAY;QACpBE,IAAI;QACJlB;MACD,CAAC,CAAC;IACH,CACD,CAAC,CAACM,KAAK,EAAEX,MAAM,EAAEc,QAAQ,EAAEf,UAAU,EAAEkB,cAAc,CAAC;EACvD,CAAC,EACD,CACCZ,UAAU,EACVE,kBAAkB,EAClBE,kBAAkB,EAClBX,OAAO,CAACoB,OAAO,CAACD,cAAc,EAC9BlB,UAAU,EACVE,YAAY,CAEd,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["useCallback","useWindowDimensions","runOnUI","useDescriptorDerivations","useDescriptors","AnimationStore","SystemStore","animateToProgress","useContentLayout","current","isFirstKey","height","screenHeight","routeKey","route","key","animations","getBag","targetProgressValue","getValue","resolvedAutoSnapPointValue","measuredContentLayoutValue","experimental_animateOnInitialMount","options","transitionSpec","event","width","nativeEvent","layout","fraction","Math","min","nextWidth","nextHeight","nextFraction","value","isFirstMeasurement","progress","animating","target","spec","targetProgress"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-content-layout.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAAiCC,mBAAmB,QAAQ,cAAc;AAC1E,SAASC,OAAO,QAAQ,yBAAyB;AACjD,SACCC,wBAAwB,EACxBC,cAAc,QACR,uCAAuC;AAC9C,SAASC,cAAc,QAAQ,iCAAiC;AAChE,SAASC,WAAW,QAAQ,8BAA8B;AAC1D,SAASC,iBAAiB,QAAQ,8CAA8C;AAEhF,OAAO,SAASC,gBAAgBA,CAAA,EAAG;EAClC,MAAM;IAAEC;EAAQ,CAAC,GAAGL,cAAc,CAAC,CAAC;EACpC,MAAM;IAAEM;EAAW,CAAC,GAAGP,wBAAwB,CAAC,CAAC;EACjD,MAAM;IAAEQ,MAAM,EAAEC;EAAa,CAAC,GAAGX,mBAAmB,CAAC,CAAC;EACtD,MAAMY,QAAQ,GAAGJ,OAAO,CAACK,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGX,cAAc,CAACY,MAAM,CAACJ,QAAQ,CAAC;EAClD,MAAMK,mBAAmB,GAAGZ,WAAW,CAACa,QAAQ,CAACN,QAAQ,EAAE,gBAAgB,CAAC;EAC5E,MAAMO,0BAA0B,GAAGd,WAAW,CAACa,QAAQ,CACtDN,QAAQ,EACR,uBACD,CAAC;EACD,MAAMQ,0BAA0B,GAAGf,WAAW,CAACa,QAAQ,CACtDN,QAAQ,EACR,uBACD,CAAC;EACD,MAAMS,kCAAkC,GACvCb,OAAO,CAACc,OAAO,CAACD,kCAAkC;EACnD,MAAME,cAAc,GAAGf,OAAO,CAACc,OAAO,CAACC,cAAc;EAErD,OAAOxB,WAAW,CAChByB,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEf;IAAO,CAAC,GAAGc,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAIf,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMkB,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAACpB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IAEnDV,OAAO,CAAC,CAAC8B,SAAiB,EAAEC,UAAkB,EAAEC,YAAoB,KAAK;MACxE,SAAS;;MACTb,0BAA0B,CAACc,KAAK,GAAG;QAClCT,KAAK,EAAEM,SAAS;QAChBrB,MAAM,EAAEsB;MACT,CAAC;MAED,MAAMG,kBAAkB,GAAGhB,0BAA0B,CAACe,KAAK,IAAI,CAAC;MAChEf,0BAA0B,CAACe,KAAK,GAAGD,YAAY;MAE/C,IACC,CAACE,kBAAkB,IACnBpB,UAAU,CAACqB,QAAQ,CAACF,KAAK,KAAK,CAAC,IAC/BnB,UAAU,CAACsB,SAAS,CAACH,KAAK,KAAK,CAAC,EAC/B;QACD;MACD;MAEA,IAAIzB,UAAU,IAAI,CAACY,kCAAkC,EAAE;QACtDJ,mBAAmB,CAACiB,KAAK,GAAGD,YAAY;QACxClB,UAAU,CAACqB,QAAQ,CAACF,KAAK,GAAGD,YAAY;QACxC;MACD;MAEA3B,iBAAiB,CAAC;QACjBgC,MAAM,EAAEL,YAAY;QACpBM,IAAI,EAAEhB,cAAc;QACpBR,UAAU;QACVyB,cAAc,EAAEvB;MACjB,CAAC,CAAC;IACH,CAAC,CAAC,CAACQ,KAAK,EAAEf,MAAM,EAAEkB,QAAQ,CAAC;EAC5B,CAAC,EACD,CACCb,UAAU,EACVE,mBAAmB,EACnBE,0BAA0B,EAC1BC,0BAA0B,EAC1BX,UAAU,EACVE,YAAY,EACZU,kCAAkC,EAClCE,cAAc,CAEhB,CAAC;AACF","ignoreList":[]}

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

@@ -10,6 +10,7 @@ import { useDescriptors } from "../../../providers/screen/descriptors";
 import { useScreenStyles } from "../../../providers/screen/styles.provider";
 import { AnimationStore } from "../../../stores/animation.store";
 import { GestureStore } from "../../../stores/gesture.store";
+import { SystemStore } from "../../../stores/system.store";
 import { animateToProgress } from "../../../utils/animation/animate-to-progress";
 import { findCollapseTarget } from "../../../utils/gesture/find-collapse-target";
 import { useBackdropPointerEvents } from "../hooks/use-backdrop-pointer-events";
@@ -30,8 +31,9 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer() {
   } = useBackdropPointerEvents();
   const BackdropComponent = current.options.backdropComponent;
   const routeKey = current.route.key;
-  const animations = AnimationStore.getRouteAnimations(routeKey);
-  const autoSnapPointValue = AnimationStore.getAnimation(routeKey, "autoSnapPoint");
+  const animations = AnimationStore.getBag(routeKey);
+  const targetProgressValue = SystemStore.getValue(routeKey, "targetProgress");
+  const resolvedAutoSnapPointValue = SystemStore.getValue(routeKey, "resolvedAutoSnapPoint");
   const AnimatedBackdropComponent = useMemo(() => BackdropComponent ? Animated.createAnimatedComponent(BackdropComponent) : null, [BackdropComponent]);
   const handleBackdropPress = useCallback(() => {
     if (backdropBehavior === "dismiss") {
@@ -47,12 +49,12 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer() {
         dismissScreen();
         return;
       }
-      const gestures = GestureStore.getRouteGestures(routeKey);
+      const gestures = GestureStore.getBag(routeKey);
       const transitionSpec = current.options.transitionSpec;
       runOnUI(() => {
         "worklet";
 
-        const resolvedSnaps = rawSnapPoints.map(point => point === "auto" ? autoSnapPointValue.value : point).filter(point => typeof point === "number");
+        const resolvedSnaps = rawSnapPoints.map(point => point === "auto" ? resolvedAutoSnapPointValue.value : point).filter(point => typeof point === "number");
         const {
           target,
           shouldDismiss
@@ -69,11 +71,12 @@ export const BackdropLayer = /*#__PURE__*/memo(function BackdropLayer() {
           target,
           spec,
           animations,
+          targetProgress: targetProgressValue,
           onAnimationFinish: shouldDismiss ? dismissScreen : undefined
         });
       })();
     }
-  }, [animations, autoSnapPointValue, backdropBehavior, current, dismissScreen, routeKey]);
+  }, [animations, targetProgressValue, resolvedAutoSnapPointValue, backdropBehavior, current, dismissScreen, routeKey]);
   const animatedBackdropStyle = useAnimatedStyle(() => {
     "worklet";
 

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

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","runOnUI","useAnimatedProps","useAnimatedStyle","DefaultSnapSpec","NO_PROPS","NO_STYLES","useNavigationHelpers","useDescriptors","useScreenStyles","AnimationStore","GestureStore","animateToProgress","findCollapseTarget","useBackdropPointerEvents","jsx","_jsx","jsxs","_jsxs","BackdropLayer","stylesMap","current","dismissScreen","isBackdropActive","backdropBehavior","BackdropComponent","options","backdropComponent","routeKey","route","key","animations","getRouteAnimations","autoSnapPointValue","getAnimation","AnimatedBackdropComponent","createAnimatedComponent","handleBackdropPress","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","length","gestures","getRouteGestures","transitionSpec","resolvedSnaps","map","point","value","filter","target","shouldDismiss","progress","dismissing","spec","open","expand","close","collapse","onAnimationFinish","undefined","animatedBackdropStyle","backdrop","style","animatedBackdropProps","props","absoluteFillObject","pointerEvents","onPress","children","animatedProps","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","useMemo","Pressable","StyleSheet","Animated","runOnUI","useAnimatedProps","useAnimatedStyle","DefaultSnapSpec","NO_PROPS","NO_STYLES","useNavigationHelpers","useDescriptors","useScreenStyles","AnimationStore","GestureStore","SystemStore","animateToProgress","findCollapseTarget","useBackdropPointerEvents","jsx","_jsx","jsxs","_jsxs","BackdropLayer","stylesMap","current","dismissScreen","isBackdropActive","backdropBehavior","BackdropComponent","options","backdropComponent","routeKey","route","key","animations","getBag","targetProgressValue","getValue","resolvedAutoSnapPointValue","AnimatedBackdropComponent","createAnimatedComponent","handleBackdropPress","rawSnapPoints","snapPoints","canDismiss","gestureEnabled","length","gestures","transitionSpec","resolvedSnaps","map","point","value","filter","target","shouldDismiss","progress","dismissing","spec","open","expand","close","collapse","targetProgress","onAnimationFinish","undefined","animatedBackdropStyle","backdrop","style","animatedBackdropProps","props","absoluteFillObject","pointerEvents","onPress","children","animatedProps","View"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/backdrop.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -5,7 +5,7 @@ import { memo } from "react";
 import { StyleSheet, View } from "react-native";
 import { GestureDetector } from "react-native-gesture-handler";
 import Animated, { useAnimatedProps, useAnimatedStyle } from "react-native-reanimated";
-import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NO_PROPS, NO_STYLES } from "../../../constants";
+import { NO_PROPS, NO_STYLES } from "../../../constants";
 import { useGestureContext } from "../../../providers/gestures";
 import { useDescriptors } from "../../../providers/screen/descriptors";
 import { useScreenStyles } from "../../../providers/screen/styles.provider";
@@ -38,51 +38,35 @@ export const ContentLayer = /*#__PURE__*/memo(({
 
     return stylesMap.value.content?.style || NO_STYLES;
   });
-  const animatedNavigationContainerStyle = useAnimatedStyle(() => {
-    "worklet";
-
-    return stylesMap.value[NAVIGATION_MASK_CONTAINER_STYLE_ID]?.style || NO_STYLES;
-  });
   const animatedContentProps = useAnimatedProps(() => {
     "worklet";
 
     return stylesMap.value.content?.props ?? NO_PROPS;
   });
-  const surfaceChildren = /*#__PURE__*/_jsx(SurfaceContainer, {
-    pointerEvents: contentPointerEvents,
-    children: hasAutoSnapPoint ? /*#__PURE__*/_jsx(View, {
-      collapsable: false,
-      onLayout: handleContentLayout,
-      children: children
-    }) : children
-  });
-  const navigationContainer = /*#__PURE__*/_jsx(Animated.View, {
-    style: [styles.navigationContainer, animatedNavigationContainerStyle],
-    pointerEvents: contentPointerEvents,
-    collapsable: false,
-    children: surfaceChildren
-  });
-  const navigationScopedChildren = isNavigationMaskEnabled ? /*#__PURE__*/_jsx(MaybeMaskedNavigationContainer, {
-    pointerEvents: contentPointerEvents,
-    enabled: isNavigationMaskEnabled,
-    children: navigationContainer
-  }) : navigationContainer;
   return /*#__PURE__*/_jsx(GestureDetector, {
     gesture: gestureContext.panGesture,
     children: /*#__PURE__*/_jsx(Animated.View, {
       style: [styles.content, animatedContentStyle],
       animatedProps: animatedContentProps,
       pointerEvents: contentPointerEvents,
-      children: navigationScopedChildren
+      children: /*#__PURE__*/_jsx(MaybeMaskedNavigationContainer, {
+        pointerEvents: contentPointerEvents,
+        enabled: isNavigationMaskEnabled,
+        children: /*#__PURE__*/_jsx(SurfaceContainer, {
+          pointerEvents: contentPointerEvents,
+          children: hasAutoSnapPoint ? /*#__PURE__*/_jsx(View, {
+            collapsable: false,
+            onLayout: handleContentLayout,
+            children: children
+          }) : children
+        })
+      })
     })
   });
 });
 const styles = StyleSheet.create({
   content: {
     flex: 1
-  },
-  navigationContainer: {
-    flex: 1
   }
 });
 //# sourceMappingURL=content.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["memo","StyleSheet","View","GestureDetector","Animated","useAnimatedProps","useAnimatedStyle","NAVIGATION_MASK_CONTAINER_STYLE_ID","NO_PROPS","NO_STYLES","useGestureContext","useDescriptors","useScreenStyles","resolveNavigationMaskEnabled","useBackdropPointerEvents","useContentLayout","MaybeMaskedNavigationContainer","SurfaceContainer","jsx","_jsx","ContentLayer","children","stylesMap","current","pointerEvents","isBackdropActive","gestureContext","isNavigationMaskEnabled","options","contentPointerEvents","hasAutoSnapPoint","snapPoints","includes","handleContentLayout","animatedContentStyle","value","content","style","animatedNavigationContainerStyle","animatedContentProps","props","surfaceChildren","collapsable","onLayout","navigationContainer","styles","navigationScopedChildren","enabled","gesture","panGesture","animatedProps","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","StyleSheet","View","GestureDetector","Animated","useAnimatedProps","useAnimatedStyle","NO_PROPS","NO_STYLES","useGestureContext","useDescriptors","useScreenStyles","resolveNavigationMaskEnabled","useBackdropPointerEvents","useContentLayout","MaybeMaskedNavigationContainer","SurfaceContainer","jsx","_jsx","ContentLayer","children","stylesMap","current","pointerEvents","isBackdropActive","gestureContext","isNavigationMaskEnabled","options","contentPointerEvents","hasAutoSnapPoint","snapPoints","includes","handleContentLayout","animatedContentStyle","value","content","style","animatedContentProps","props","gesture","panGesture","styles","animatedProps","enabled","collapsable","onLayout","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":";;AAAA;AACA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,IACdC,gBAAgB,EAChBC,gBAAgB,QACV,yBAAyB;AAChC,SAASC,QAAQ,EAAEC,SAAS,QAAQ,oBAAoB;AACxD,SAASC,iBAAiB,QAAQ,6BAA6B;AAC/D,SAASC,cAAc,QAAQ,uCAAuC;AACtE,SAASC,eAAe,QAAQ,2CAA2C;AAC3E,SAASC,4BAA4B,QAAQ,kDAAkD;AAC/F,SAASC,wBAAwB,QAAQ,sCAAsC;AAC/E,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,8BAA8B,QAAQ,qCAAqC;AACpF,SAASC,gBAAgB,QAAQ,qBAAqB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMvD,OAAO,MAAMC,YAAY,gBAAGnB,IAAI,CAAC,CAAC;EAAEoB;AAAgB,CAAC,KAAK;EACzD,MAAM;IAAEC;EAAU,CAAC,GAAGV,eAAe,CAAC,CAAC;EACvC,MAAM;IAAEW;EAAQ,CAAC,GAAGZ,cAAc,CAAC,CAAC;EACpC,MAAM;IAAEa,aAAa;IAAEC;EAAiB,CAAC,GAAGX,wBAAwB,CAAC,CAAC;EAEtE,MAAMY,cAAc,GAAGhB,iBAAiB,CAAC,CAAC;EAC1C,MAAMiB,uBAAuB,GAAGd,4BAA4B,CAACU,OAAO,CAACK,OAAO,CAAC;EAC7E,MAAMC,oBAAoB,GAAGJ,gBAAgB,GAAG,UAAU,GAAGD,aAAa;EAE1E,MAAMM,gBAAgB,GACrBP,OAAO,CAACK,OAAO,CAACG,UAAU,EAAEC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK;EAEtD,MAAMC,mBAAmB,GAAGlB,gBAAgB,CAAC,CAAC;EAE9C,MAAMmB,oBAAoB,GAAG3B,gBAAgB,CAAC,MAAM;IACnD,SAAS;;IACT,OAAOe,SAAS,CAACa,KAAK,CAACC,OAAO,EAAEC,KAAK,IAAI5B,SAAS;EACnD,CAAC,CAAC;EAEF,MAAM6B,oBAAoB,GAAGhC,gBAAgB,CAAC,MAAM;IACnD,SAAS;;IACT,OAAOgB,SAAS,CAACa,KAAK,CAACC,OAAO,EAAEG,KAAK,IAAI/B,QAAQ;EAClD,CAAC,CAAC;EAEF,oBACCW,IAAA,CAACf,eAAe;IAACoC,OAAO,EAAEd,cAAc,CAAEe,UAAW;IAAApB,QAAA,eACpDF,IAAA,CAACd,QAAQ,CAACF,IAAI;MACbkC,KAAK,EAAE,CAACK,MAAM,CAACN,OAAO,EAAEF,oBAAoB,CAAE;MAC9CS,aAAa,EAAEL,oBAAqB;MACpCd,aAAa,EAAEK,oBAAqB;MAAAR,QAAA,eAEpCF,IAAA,CAACH,8BAA8B;QAC9BQ,aAAa,EAAEK,oBAAqB;QACpCe,OAAO,EAAEjB,uBAAwB;QAAAN,QAAA,eAEjCF,IAAA,CAACF,gBAAgB;UAACO,aAAa,EAAEK,oBAAqB;UAAAR,QAAA,EACpDS,gBAAgB,gBAChBX,IAAA,CAAChB,IAAI;YAAC0C,WAAW,EAAE,KAAM;YAACC,QAAQ,EAAEb,mBAAoB;YAAAZ,QAAA,EACtDA;UAAQ,CACJ,CAAC,GAEPA;QACA,CACgB;MAAC,CACY;IAAC,CACnB;EAAC,CACA,CAAC;AAEpB,CAAC,CAAC;AAEF,MAAMqB,MAAM,GAAGxC,UAAU,CAAC6C,MAAM,CAAC;EAChCX,OAAO,EAAE;IACRY,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

package/lib/module/shared/components/screen-container/layers/maybe-masked-navigation-container.js

@@ -1,9 +1,9 @@
 "use strict";
 
-import { memo, useEffect } from "react";
+import { memo, useCallback } from "react";
 import { StyleSheet, View } from "react-native";
 import Animated, { useAnimatedStyle } from "react-native-reanimated";
-import { NAVIGATION_MASK_ELEMENT_STYLE_ID, NO_STYLES } from "../../../constants";
+import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NAVIGATION_MASK_ELEMENT_STYLE_ID, NO_STYLES } from "../../../constants";
 import { useScreenStyles } from "../../../providers/screen/styles.provider";
 import { logger } from "../../../utils/logger";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -27,15 +27,19 @@ export const MaybeMaskedNavigationContainer = /*#__PURE__*/memo(({
 
     return stylesMap.value[NAVIGATION_MASK_ELEMENT_STYLE_ID]?.style || NO_STYLES;
   });
-  useEffect(() => {
+  const animatedNavigationMaskContainerStyle = useAnimatedStyle(() => {
+    "worklet";
+
+    return stylesMap.value[NAVIGATION_MASK_CONTAINER_STYLE_ID]?.style || NO_STYLES;
+  });
+  const maybeLogWarning = useCallback(() => {
     if (!enabled) return;
     if (LazyMaskedView !== View) return;
     if (hasWarnedMissingMaskedView) return;
     hasWarnedMissingMaskedView = true;
     logger.warn("navigationMaskEnabled requires @react-native-masked-view/masked-view. Install it to enable navigation bounds masking.");
   }, [enabled]);
-  if (!enabled) return children;
-  if (LazyMaskedView === View) {
+  if (!enabled || LazyMaskedView === View) {
     return children;
   }
   return /*#__PURE__*/_jsx(LazyMaskedView, {
@@ -47,13 +51,22 @@ export const MaybeMaskedNavigationContainer = /*#__PURE__*/memo(({
       pointerEvents: "none"
     }),
     pointerEvents: pointerEvents,
-    children: children
+    onLayout: maybeLogWarning,
+    children: /*#__PURE__*/_jsx(Animated.View, {
+      style: [styles.navigationContainer, animatedNavigationMaskContainerStyle],
+      pointerEvents: pointerEvents,
+      collapsable: false,
+      children: children
+    })
   });
 });
 const styles = StyleSheet.create({
   navigationMaskedRoot: {
     flex: 1
   },
+  navigationContainer: {
+    flex: 1
+  },
   navigationMaskElement: {
     backgroundColor: "white"
   }