react-native-screen-transitions 2.3.3 → 2.3.4

package/README.md

@@ -146,16 +146,28 @@ Ready-made presets for common shared-element patterns. These leverage the bounds
 
 Other presets: `SharedAppleMusic()`, `SharedXImage()`.
 
-Note: Masked container required
+#### 🎭 Masked View Setup (Required for SharedIGImage & SharedAppleMusic)
 
-- For `SharedIGImage` and `SharedAppleMusic`, wrap the next screen with `Transition.MaskedView` as the first element so the preset can animate `_ROOT_CONTAINER` and `_ROOT_MASKED` correctly.
-- Install the mask package:
-  - Expo: `npx expo install @react-native-masked-view/masked-view`
-  - Bare RN: `npm i @react-native-masked-view/masked-view` (then iOS: `cd ios && pod install`)
-- `Transition.MaskedView` lazy-loads the native mask and falls back to a plain `View` if missing, but the mask is required for the full shared effect.
+> **⚠️ Important**: These presets require native code and **will not work in Expo Go**. You must use a development build.
 
-Minimal usage on the destination screen:
+**1. Install the dependency**
+```bash
+# Expo projects
+npx expo install @react-native-masked-view/masked-view
+
+# Bare React Native
+npm install @react-native-masked-view/masked-view
+cd ios && pod install  # iOS only
+```
 
+**2. Create a development build** (if using Expo)
+```bash
+npx expo run:ios
+# or
+npx expo run:android
+```
+
+**3. Wrap your destination screen**
 ```tsx
 export default function PostScreen() {
   return (
@@ -166,6 +178,10 @@ export default function PostScreen() {
 }
 ```
 
+> **💡 Fallback behavior**: `Transition.MaskedView` will fall back to a plain `View` if the masked view library is missing, but this breaks the shared element effect and may cause errors like "bounds is not a function".
+
+---
+
 ### Navigator-level custom animations
 
 Instead of presets, you can define a custom transition directly on the screen’s options.

package/lib/commonjs/components/controllers/screen-lifecycle.js

@@ -23,15 +23,12 @@ const ScreenLifecycleController = ({
   const handleBeforeRemove = (0, _useStableCallback.default)(e => {
     const key = current.navigation.getParent()?.getState().key;
     const requestedDismissOnNavigator = _navigatorDismissState.NavigatorDismissState.get(key);
+    const isEnabled = current.options.enableTransitions;
+    const isRequestedDismissOnNavigator = requestedDismissOnNavigator;
+    const isFirstScreen = current.navigation.getState().index === 0;
 
-    // Don't run e.preventDefault when the dismissal was on the local root
-    if (requestedDismissOnNavigator) {
-      (0, _resetStoresForScreen.resetStoresForScreen)(current);
-      return;
-    }
-
-    // Don't run e.preventDefault when this is the first screen of the stack
-    if (current.navigation.getState().index === 0) {
+    // If transitions are disabled, or the dismissal was on the local root, or this is the first screen of the stack, reset the stores
+    if (!isEnabled || isRequestedDismissOnNavigator || isFirstScreen) {
       (0, _resetStoresForScreen.resetStoresForScreen)(current);
       return;
     }

package/lib/commonjs/components/controllers/screen-lifecycle.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_useParentGestureRegistry","_useStableCallback","_interopRequireDefault","_keys","_animations","_navigatorDismissState","_resetStoresForScreen","_startScreenTransition","e","__esModule","default","ScreenLifecycleController","children","current","useKeys","animations","Animations","getAll","route","key","handleBeforeRemove","useStableCallback","navigation","getParent","getState","requestedDismissOnNavigator","NavigatorDismissState","get","resetStoresForScreen","index","preventDefault","onAnimationFinish","finished","dispatch","data","action","requestAnimationFrame","startScreenTransition","target","spec","options","transitionSpec","handleInitialize","useEffect","unsubscribe","addListener","useLayoutEffect","useParentGestureRegistry","exports"],"sourceRoot":"../../../../src","sources":["components/controllers/screen-lifecycle.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,yBAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AACA,IAAAK,WAAA,GAAAL,OAAA;AACA,IAAAM,sBAAA,GAAAN,OAAA;AACA,IAAAO,qBAAA,GAAAP,OAAA;AACA,IAAAQ,sBAAA,GAAAR,OAAA;AAAsF,SAAAG,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAM/E,MAAMG,yBAAyB,GAAGA,CAAC;EACzCC;AACqB,CAAC,KAAK;EAC3B,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,aAAO,EAAC,CAAC;EAE7B,MAAMC,UAAU,GAAGC,sBAAU,CAACC,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAEvD,MAAMC,kBAAkB,GAAG,IAAAC,0BAAiB,EAAEb,CAAM,IAAK;IACxD,MAAMW,GAAG,GAAGN,OAAO,CAACS,UAAU,CAACC,SAAS,CAAC,CAAC,EAAEC,QAAQ,CAAC,CAAC,CAACL,GAAG;IAC1D,MAAMM,2BAA2B,GAAGC,4CAAqB,CAACC,GAAG,CAACR,GAAG,CAAC;;IAElE;IACA,IAAIM,2BAA2B,EAAE;MAChC,IAAAG,0CAAoB,EAACf,OAAO,CAAC;MAC7B;IACD;;IAEA;IACA,IAAIA,OAAO,CAACS,UAAU,CAACE,QAAQ,CAAC,CAAC,CAACK,KAAK,KAAK,CAAC,EAAE;MAC9C,IAAAD,0CAAoB,EAACf,OAAO,CAAC;MAC7B;IACD;IAEAL,CAAC,CAACsB,cAAc,CAAC,CAAC;IAClB,MAAMC,iBAAiB,GAAIC,QAAiB,IAAK;MAChD,IAAIA,QAAQ,EAAE;QACbnB,OAAO,CAACS,UAAU,CAACW,QAAQ,CAACzB,CAAC,CAAC0B,IAAI,CAACC,MAAM,CAAC;;QAE1C;QACAC,qBAAqB,CAAC,MAAM;UAC3B,IAAAR,0CAAoB,EAACf,OAAO,CAAC;QAC9B,CAAC,CAAC;MACH;IACD,CAAC;IAED,IAAAwB,4CAAqB,EAAC;MACrBC,MAAM,EAAE,OAAO;MACfC,IAAI,EAAE1B,OAAO,CAAC2B,OAAO,CAACC,cAAc;MACpCV,iBAAiB;MACjBhB;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAM2B,gBAAgB,GAAG,IAAArB,0BAAiB,EAAC,MAAM;IAChD,IAAAgB,4CAAqB,EAAC;MACrBC,MAAM,EAAE,MAAM;MACdC,IAAI,EAAE1B,OAAO,CAAC2B,OAAO,CAACC,cAAc;MACpC1B;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,IAAA4B,gBAAS,EAAC,MAAM;IACf,MAAMC,WAAW,GAAG/B,OAAO,CAACS,UAAU,CAACuB,WAAW,CACjD,cAAc,EACdzB,kBACD,CAAC;IAED,OAAOwB,WAAW;EACnB,CAAC,EAAE,CAAC/B,OAAO,CAACS,UAAU,EAAEF,kBAAkB,CAAC,CAAC;EAE5C,IAAA0B,sBAAe,EAACJ,gBAAgB,EAAE,EAAE,CAAC;;EAErC;EACA,IAAAK,kDAAwB,EAAC,CAAC;EAE1B,OAAOnC,QAAQ;AAChB,CAAC;AAACoC,OAAA,CAAArC,yBAAA,GAAAA,yBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_useParentGestureRegistry","_useStableCallback","_interopRequireDefault","_keys","_animations","_navigatorDismissState","_resetStoresForScreen","_startScreenTransition","e","__esModule","default","ScreenLifecycleController","children","current","useKeys","animations","Animations","getAll","route","key","handleBeforeRemove","useStableCallback","navigation","getParent","getState","requestedDismissOnNavigator","NavigatorDismissState","get","isEnabled","options","enableTransitions","isRequestedDismissOnNavigator","isFirstScreen","index","resetStoresForScreen","preventDefault","onAnimationFinish","finished","dispatch","data","action","requestAnimationFrame","startScreenTransition","target","spec","transitionSpec","handleInitialize","useEffect","unsubscribe","addListener","useLayoutEffect","useParentGestureRegistry","exports"],"sourceRoot":"../../../../src","sources":["components/controllers/screen-lifecycle.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,yBAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AACA,IAAAK,WAAA,GAAAL,OAAA;AACA,IAAAM,sBAAA,GAAAN,OAAA;AACA,IAAAO,qBAAA,GAAAP,OAAA;AACA,IAAAQ,sBAAA,GAAAR,OAAA;AAAsF,SAAAG,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAM/E,MAAMG,yBAAyB,GAAGA,CAAC;EACzCC;AACqB,CAAC,KAAK;EAC3B,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,aAAO,EAAC,CAAC;EAE7B,MAAMC,UAAU,GAAGC,sBAAU,CAACC,MAAM,CAACJ,OAAO,CAACK,KAAK,CAACC,GAAG,CAAC;EAEvD,MAAMC,kBAAkB,GAAG,IAAAC,0BAAiB,EAAEb,CAAM,IAAK;IACxD,MAAMW,GAAG,GAAGN,OAAO,CAACS,UAAU,CAACC,SAAS,CAAC,CAAC,EAAEC,QAAQ,CAAC,CAAC,CAACL,GAAG;IAC1D,MAAMM,2BAA2B,GAAGC,4CAAqB,CAACC,GAAG,CAACR,GAAG,CAAC;IAElE,MAAMS,SAAS,GAAGf,OAAO,CAACgB,OAAO,CAACC,iBAAiB;IACnD,MAAMC,6BAA6B,GAAGN,2BAA2B;IACjE,MAAMO,aAAa,GAAGnB,OAAO,CAACS,UAAU,CAACE,QAAQ,CAAC,CAAC,CAACS,KAAK,KAAK,CAAC;;IAE/D;IACA,IAAI,CAACL,SAAS,IAAIG,6BAA6B,IAAIC,aAAa,EAAE;MACjE,IAAAE,0CAAoB,EAACrB,OAAO,CAAC;MAC7B;IACD;IAEAL,CAAC,CAAC2B,cAAc,CAAC,CAAC;IAClB,MAAMC,iBAAiB,GAAIC,QAAiB,IAAK;MAChD,IAAIA,QAAQ,EAAE;QACbxB,OAAO,CAACS,UAAU,CAACgB,QAAQ,CAAC9B,CAAC,CAAC+B,IAAI,CAACC,MAAM,CAAC;;QAE1C;QACAC,qBAAqB,CAAC,MAAM;UAC3B,IAAAP,0CAAoB,EAACrB,OAAO,CAAC;QAC9B,CAAC,CAAC;MACH;IACD,CAAC;IAED,IAAA6B,4CAAqB,EAAC;MACrBC,MAAM,EAAE,OAAO;MACfC,IAAI,EAAE/B,OAAO,CAACgB,OAAO,CAACgB,cAAc;MACpCT,iBAAiB;MACjBrB;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAM+B,gBAAgB,GAAG,IAAAzB,0BAAiB,EAAC,MAAM;IAChD,IAAAqB,4CAAqB,EAAC;MACrBC,MAAM,EAAE,MAAM;MACdC,IAAI,EAAE/B,OAAO,CAACgB,OAAO,CAACgB,cAAc;MACpC9B;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,IAAAgC,gBAAS,EAAC,MAAM;IACf,MAAMC,WAAW,GAAGnC,OAAO,CAACS,UAAU,CAAC2B,WAAW,CACjD,cAAc,EACd7B,kBACD,CAAC;IAED,OAAO4B,WAAW;EACnB,CAAC,EAAE,CAACnC,OAAO,CAACS,UAAU,EAAEF,kBAAkB,CAAC,CAAC;EAE5C,IAAA8B,sBAAe,EAACJ,gBAAgB,EAAE,EAAE,CAAC;;EAErC;EACA,IAAAK,kDAAwB,EAAC,CAAC;EAE1B,OAAOvC,QAAQ;AAChB,CAAC;AAACwC,OAAA,CAAAzC,yBAAA,GAAAA,yBAAA","ignoreList":[]}

package/lib/commonjs/components/create-transition-aware-component.js

@@ -60,7 +60,7 @@ function createTransitionAwareComponent(Wrapped, options = {}) {
       style
     });
     const {
-      handleTransitionLayout,
+      handleInitialLayout,
       captureActiveOnPress,
       MeasurementSyncProvider
     } = (0, _useBoundRegistry.useBoundsRegistry)({
@@ -75,7 +75,7 @@ function createTransitionAwareComponent(Wrapped, options = {}) {
         ref: animatedRef,
         style: [style, associatedStyles],
         onPress: captureActiveOnPress,
-        onLayout: (0, _reactNativeReanimated.runOnUI)(handleTransitionLayout),
+        onLayout: (0, _reactNativeReanimated.runOnUI)(handleInitialLayout),
         collapsable: !sharedBoundTag,
         children: children
       })

package/lib/commonjs/components/create-transition-aware-component.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_useAssociatedStyle","_useBoundRegistry","_useScrollRegistry","_gestures","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","Animated","createAnimatedComponent","ScrollableInner","forwardRef","props","ref","nativeGesture","useGestureContext","scrollHandler","onContentSizeChange","onLayout","useScrollRegistry","onScroll","jsx","GestureDetector","gesture","children","scrollEventThrottle","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","useAnimatedRef","associatedStyles","useAssociatedStyles","id","handleTransitionLayout","captureActiveOnPress","MeasurementSyncProvider","useBoundsRegistry","runOnUI","collapsable","memo"],"sourceRoot":"../../../src","sources":["components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_useAssociatedStyle","_useBoundRegistry","_useScrollRegistry","_gestures","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","Animated","createAnimatedComponent","ScrollableInner","forwardRef","props","ref","nativeGesture","useGestureContext","scrollHandler","onContentSizeChange","onLayout","useScrollRegistry","onScroll","jsx","GestureDetector","gesture","children","scrollEventThrottle","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","useAnimatedRef","associatedStyles","useAssociatedStyles","id","handleInitialLayout","captureActiveOnPress","MeasurementSyncProvider","useBoundsRegistry","runOnUI","collapsable","memo"],"sourceRoot":"../../../src","sources":["components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/hooks/bounds/use-bound-registry.js

@@ -22,12 +22,12 @@ const useBoundsRegistry = ({
 }) => {
   const {
     previous,
-    current
+    current,
+    next
   } = (0, _keys.useKeys)();
   const ROOT_MEASUREMENT_SIGNAL = (0, _react.useContext)(MeasurementUpdateContext);
   const ROOT_SIGNAL = (0, _reactNativeReanimated.useSharedValue)(0);
   const IS_ROOT = !ROOT_MEASUREMENT_SIGNAL;
-  const hasMeasured = (0, _reactNativeReanimated.useSharedValue)(false);
   const emitUpdate = (0, _react.useCallback)(() => {
     "worklet";
 
@@ -39,7 +39,8 @@ const useBoundsRegistry = ({
   }) => {
     "worklet";
 
-    if (!sharedBoundTag) return;
+    // Currently, there's no necessity to measure when the current route is blurred ( could potentially change in the future )
+    if (!sharedBoundTag || next) return;
     const measured = (0, _reactNativeReanimated.measure)(animatedRef);
     if (!measured) {
       console.warn(`[react-native-screen-transitions] measure() returned null for sharedBoundTag="${sharedBoundTag}"`);
@@ -64,12 +65,13 @@ const useBoundsRegistry = ({
       _bounds.Bounds.setRouteActive(key, sharedBoundTag);
     }
     if (onPress) (0, _reactNativeReanimated.runOnJS)(onPress)();
-  }, [sharedBoundTag, animatedRef, current.route.key, style, emitUpdate]);
-  const handleTransitionLayout = (0, _react.useCallback)(() => {
+  }, [sharedBoundTag, animatedRef, current.route.key, style, emitUpdate, next]);
+  const hasMeasuredOnLayout = (0, _reactNativeReanimated.useSharedValue)(false);
+  const handleInitialLayout = (0, _react.useCallback)(() => {
     "worklet";
 
     const prevKey = previous?.route.key;
-    if (!sharedBoundTag || hasMeasured.value || !prevKey) {
+    if (!sharedBoundTag || hasMeasuredOnLayout.value || !prevKey) {
       return;
     }
     const prevBounds = _bounds.Bounds.getBounds(prevKey)?.[sharedBoundTag];
@@ -79,9 +81,9 @@ const useBoundsRegistry = ({
         skipMarkingActive: true
       });
       // Should not measure again while in transition
-      hasMeasured.value = true;
+      hasMeasuredOnLayout.value = true;
     }
-  }, [maybeMeasureAndStore, sharedBoundTag, previous?.route.key, hasMeasured]);
+  }, [maybeMeasureAndStore, sharedBoundTag, previous?.route.key, hasMeasuredOnLayout]);
   const captureActiveOnPress = (0, _useStableCallback.default)(() => {
     if (!sharedBoundTag) {
       if (onPress) onPress();
@@ -118,7 +120,7 @@ const useBoundsRegistry = ({
     });
   });
   return {
-    handleTransitionLayout,
+    handleInitialLayout,
     captureActiveOnPress,
     MeasurementSyncProvider
   };

package/lib/commonjs/hooks/bounds/use-bound-registry.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_keys","_bounds","_flattenStyles","_isBoundsEqual","_useStableCallback","_interopRequireDefault","_jsxRuntime","e","__esModule","default","MeasurementUpdateContext","createContext","useBoundsRegistry","sharedBoundTag","animatedRef","style","onPress","previous","current","useKeys","ROOT_MEASUREMENT_SIGNAL","useContext","ROOT_SIGNAL","useSharedValue","IS_ROOT","hasMeasured","emitUpdate","useCallback","value","maybeMeasureAndStore","skipMarkingActive","measured","measure","console","warn","key","route","isBoundsEqual","Bounds","setRouteActive","runOnJS","setBounds","flattenStyle","handleTransitionLayout","prevKey","prevBounds","getBounds","captureActiveOnPress","useStableCallback","runOnUI","MeasurementSyncProvider","useMemo","Fragment","children","jsx","Provider","updateSignal","useAnimatedReaction","undefined","exports"],"sourceRoot":"../../../../src","sources":["hooks/bounds/use-bound-registry.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_keys","_bounds","_flattenStyles","_isBoundsEqual","_useStableCallback","_interopRequireDefault","_jsxRuntime","e","__esModule","default","MeasurementUpdateContext","createContext","useBoundsRegistry","sharedBoundTag","animatedRef","style","onPress","previous","current","next","useKeys","ROOT_MEASUREMENT_SIGNAL","useContext","ROOT_SIGNAL","useSharedValue","IS_ROOT","emitUpdate","useCallback","value","maybeMeasureAndStore","skipMarkingActive","measured","measure","console","warn","key","route","isBoundsEqual","Bounds","setRouteActive","runOnJS","setBounds","flattenStyle","hasMeasuredOnLayout","handleInitialLayout","prevKey","prevBounds","getBounds","captureActiveOnPress","useStableCallback","runOnUI","MeasurementSyncProvider","useMemo","Fragment","children","jsx","Provider","updateSignal","useAnimatedReaction","undefined","exports"],"sourceRoot":"../../../../src","sources":["hooks/bounds/use-bound-registry.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/controllers/screen-lifecycle.js

@@ -18,15 +18,12 @@ export const ScreenLifecycleController = ({
   const handleBeforeRemove = useStableCallback(e => {
     const key = current.navigation.getParent()?.getState().key;
     const requestedDismissOnNavigator = NavigatorDismissState.get(key);
+    const isEnabled = current.options.enableTransitions;
+    const isRequestedDismissOnNavigator = requestedDismissOnNavigator;
+    const isFirstScreen = current.navigation.getState().index === 0;
 
-    // Don't run e.preventDefault when the dismissal was on the local root
-    if (requestedDismissOnNavigator) {
-      resetStoresForScreen(current);
-      return;
-    }
-
-    // Don't run e.preventDefault when this is the first screen of the stack
-    if (current.navigation.getState().index === 0) {
+    // If transitions are disabled, or the dismissal was on the local root, or this is the first screen of the stack, reset the stores
+    if (!isEnabled || isRequestedDismissOnNavigator || isFirstScreen) {
       resetStoresForScreen(current);
       return;
     }

package/lib/module/components/controllers/screen-lifecycle.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useLayoutEffect","useParentGestureRegistry","useStableCallback","useKeys","Animations","NavigatorDismissState","resetStoresForScreen","startScreenTransition","ScreenLifecycleController","children","current","animations","getAll","route","key","handleBeforeRemove","e","navigation","getParent","getState","requestedDismissOnNavigator","get","index","preventDefault","onAnimationFinish","finished","dispatch","data","action","requestAnimationFrame","target","spec","options","transitionSpec","handleInitialize","unsubscribe","addListener"],"sourceRoot":"../../../../src","sources":["components/controllers/screen-lifecycle.tsx"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,eAAe,QAAQ,OAAO;AAClD,SAASC,wBAAwB,QAAQ,kDAAkD;AAC3F,OAAOC,iBAAiB,MAAM,iCAAiC;AAC/D,SAASC,OAAO,QAAQ,sBAAsB;AAC9C,SAASC,UAAU,QAAQ,yBAAyB;AACpD,SAASC,qBAAqB,QAAQ,sCAAsC;AAC5E,SAASC,oBAAoB,QAAQ,4CAA4C;AACjF,SAASC,qBAAqB,QAAQ,+CAA+C;AAMrF,OAAO,MAAMC,yBAAyB,GAAGA,CAAC;EACzCC;AACqB,CAAC,KAAK;EAC3B,MAAM;IAAEC;EAAQ,CAAC,GAAGP,OAAO,CAAC,CAAC;EAE7B,MAAMQ,UAAU,GAAGP,UAAU,CAACQ,MAAM,CAACF,OAAO,CAACG,KAAK,CAACC,GAAG,CAAC;EAEvD,MAAMC,kBAAkB,GAAGb,iBAAiB,CAAEc,CAAM,IAAK;IACxD,MAAMF,GAAG,GAAGJ,OAAO,CAACO,UAAU,CAACC,SAAS,CAAC,CAAC,EAAEC,QAAQ,CAAC,CAAC,CAACL,GAAG;IAC1D,MAAMM,2BAA2B,GAAGf,qBAAqB,CAACgB,GAAG,CAACP,GAAG,CAAC;;IAElE;IACA,IAAIM,2BAA2B,EAAE;MAChCd,oBAAoB,CAACI,OAAO,CAAC;MAC7B;IACD;;IAEA;IACA,IAAIA,OAAO,CAACO,UAAU,CAACE,QAAQ,CAAC,CAAC,CAACG,KAAK,KAAK,CAAC,EAAE;MAC9ChB,oBAAoB,CAACI,OAAO,CAAC;MAC7B;IACD;IAEAM,CAAC,CAACO,cAAc,CAAC,CAAC;IAClB,MAAMC,iBAAiB,GAAIC,QAAiB,IAAK;MAChD,IAAIA,QAAQ,EAAE;QACbf,OAAO,CAACO,UAAU,CAACS,QAAQ,CAACV,CAAC,CAACW,IAAI,CAACC,MAAM,CAAC;;QAE1C;QACAC,qBAAqB,CAAC,MAAM;UAC3BvB,oBAAoB,CAACI,OAAO,CAAC;QAC9B,CAAC,CAAC;MACH;IACD,CAAC;IAEDH,qBAAqB,CAAC;MACrBuB,MAAM,EAAE,OAAO;MACfC,IAAI,EAAErB,OAAO,CAACsB,OAAO,CAACC,cAAc;MACpCT,iBAAiB;MACjBb;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAMuB,gBAAgB,GAAGhC,iBAAiB,CAAC,MAAM;IAChDK,qBAAqB,CAAC;MACrBuB,MAAM,EAAE,MAAM;MACdC,IAAI,EAAErB,OAAO,CAACsB,OAAO,CAACC,cAAc;MACpCtB;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEFZ,SAAS,CAAC,MAAM;IACf,MAAMoC,WAAW,GAAGzB,OAAO,CAACO,UAAU,CAACmB,WAAW,CACjD,cAAc,EACdrB,kBACD,CAAC;IAED,OAAOoB,WAAW;EACnB,CAAC,EAAE,CAACzB,OAAO,CAACO,UAAU,EAAEF,kBAAkB,CAAC,CAAC;EAE5Cf,eAAe,CAACkC,gBAAgB,EAAE,EAAE,CAAC;;EAErC;EACAjC,wBAAwB,CAAC,CAAC;EAE1B,OAAOQ,QAAQ;AAChB,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useLayoutEffect","useParentGestureRegistry","useStableCallback","useKeys","Animations","NavigatorDismissState","resetStoresForScreen","startScreenTransition","ScreenLifecycleController","children","current","animations","getAll","route","key","handleBeforeRemove","e","navigation","getParent","getState","requestedDismissOnNavigator","get","isEnabled","options","enableTransitions","isRequestedDismissOnNavigator","isFirstScreen","index","preventDefault","onAnimationFinish","finished","dispatch","data","action","requestAnimationFrame","target","spec","transitionSpec","handleInitialize","unsubscribe","addListener"],"sourceRoot":"../../../../src","sources":["components/controllers/screen-lifecycle.tsx"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,eAAe,QAAQ,OAAO;AAClD,SAASC,wBAAwB,QAAQ,kDAAkD;AAC3F,OAAOC,iBAAiB,MAAM,iCAAiC;AAC/D,SAASC,OAAO,QAAQ,sBAAsB;AAC9C,SAASC,UAAU,QAAQ,yBAAyB;AACpD,SAASC,qBAAqB,QAAQ,sCAAsC;AAC5E,SAASC,oBAAoB,QAAQ,4CAA4C;AACjF,SAASC,qBAAqB,QAAQ,+CAA+C;AAMrF,OAAO,MAAMC,yBAAyB,GAAGA,CAAC;EACzCC;AACqB,CAAC,KAAK;EAC3B,MAAM;IAAEC;EAAQ,CAAC,GAAGP,OAAO,CAAC,CAAC;EAE7B,MAAMQ,UAAU,GAAGP,UAAU,CAACQ,MAAM,CAACF,OAAO,CAACG,KAAK,CAACC,GAAG,CAAC;EAEvD,MAAMC,kBAAkB,GAAGb,iBAAiB,CAAEc,CAAM,IAAK;IACxD,MAAMF,GAAG,GAAGJ,OAAO,CAACO,UAAU,CAACC,SAAS,CAAC,CAAC,EAAEC,QAAQ,CAAC,CAAC,CAACL,GAAG;IAC1D,MAAMM,2BAA2B,GAAGf,qBAAqB,CAACgB,GAAG,CAACP,GAAG,CAAC;IAElE,MAAMQ,SAAS,GAAGZ,OAAO,CAACa,OAAO,CAACC,iBAAiB;IACnD,MAAMC,6BAA6B,GAAGL,2BAA2B;IACjE,MAAMM,aAAa,GAAGhB,OAAO,CAACO,UAAU,CAACE,QAAQ,CAAC,CAAC,CAACQ,KAAK,KAAK,CAAC;;IAE/D;IACA,IAAI,CAACL,SAAS,IAAIG,6BAA6B,IAAIC,aAAa,EAAE;MACjEpB,oBAAoB,CAACI,OAAO,CAAC;MAC7B;IACD;IAEAM,CAAC,CAACY,cAAc,CAAC,CAAC;IAClB,MAAMC,iBAAiB,GAAIC,QAAiB,IAAK;MAChD,IAAIA,QAAQ,EAAE;QACbpB,OAAO,CAACO,UAAU,CAACc,QAAQ,CAACf,CAAC,CAACgB,IAAI,CAACC,MAAM,CAAC;;QAE1C;QACAC,qBAAqB,CAAC,MAAM;UAC3B5B,oBAAoB,CAACI,OAAO,CAAC;QAC9B,CAAC,CAAC;MACH;IACD,CAAC;IAEDH,qBAAqB,CAAC;MACrB4B,MAAM,EAAE,OAAO;MACfC,IAAI,EAAE1B,OAAO,CAACa,OAAO,CAACc,cAAc;MACpCR,iBAAiB;MACjBlB;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEF,MAAM2B,gBAAgB,GAAGpC,iBAAiB,CAAC,MAAM;IAChDK,qBAAqB,CAAC;MACrB4B,MAAM,EAAE,MAAM;MACdC,IAAI,EAAE1B,OAAO,CAACa,OAAO,CAACc,cAAc;MACpC1B;IACD,CAAC,CAAC;EACH,CAAC,CAAC;EAEFZ,SAAS,CAAC,MAAM;IACf,MAAMwC,WAAW,GAAG7B,OAAO,CAACO,UAAU,CAACuB,WAAW,CACjD,cAAc,EACdzB,kBACD,CAAC;IAED,OAAOwB,WAAW;EACnB,CAAC,EAAE,CAAC7B,OAAO,CAACO,UAAU,EAAEF,kBAAkB,CAAC,CAAC;EAE5Cf,eAAe,CAACsC,gBAAgB,EAAE,EAAE,CAAC;;EAErC;EACArC,wBAAwB,CAAC,CAAC;EAE1B,OAAOQ,QAAQ;AAChB,CAAC","ignoreList":[]}

package/lib/module/components/create-transition-aware-component.js

@@ -55,7 +55,7 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
       style
     });
     const {
-      handleTransitionLayout,
+      handleInitialLayout,
       captureActiveOnPress,
       MeasurementSyncProvider
     } = useBoundsRegistry({
@@ -70,7 +70,7 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
         ref: animatedRef,
         style: [style, associatedStyles],
         onPress: captureActiveOnPress,
-        onLayout: runOnUI(handleTransitionLayout),
+        onLayout: runOnUI(handleInitialLayout),
         collapsable: !sharedBoundTag,
         children: children
       })

package/lib/module/components/create-transition-aware-component.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","GestureDetector","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useBoundsRegistry","useScrollRegistry","useGestureContext","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","nativeGesture","scrollHandler","onContentSizeChange","onLayout","onScroll","gesture","children","scrollEventThrottle","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","id","handleTransitionLayout","captureActiveOnPress","MeasurementSyncProvider","collapsable"],"sourceRoot":"../../../src","sources":["components/create-transition-aware-component.tsx"],"mappings":";;AACA,SAA6BA,UAAU,EAAEC,IAAI,QAAQ,OAAO;AAE5D,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,IAAIC,OAAO,EAAEC,cAAc,QAAQ,yBAAyB;AAC3E,SAASC,mBAAmB,QAAQ,yCAAyC;AAC7E,SAASC,iBAAiB,QAAQ,oCAAoC;AACtE,SAASC,iBAAiB,QAAQ,uCAAuC;AACzE,SAASC,iBAAiB,QAAQ,uBAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ1D,OAAO,SAASC,8BAA8BA,CAC7CC,OAAyB,EACzBC,OAA8C,GAAG,CAAC,CAAC,EAClD;EACD,MAAM;IAAEC,YAAY,GAAG;EAAM,CAAC,GAAGD,OAAO;EAExC,MAAME,iBAAiB,GAAGb,QAAQ,CAACc,uBAAuB,CAACJ,OAAO,CAAC;EAEnE,MAAMK,eAAe,gBAAGlB,UAAU,CAGhC,CAACmB,KAAU,EAAEC,GAAG,KAAK;IACtB,MAAM;MAAEC;IAAc,CAAC,GAAGZ,iBAAiB,CAAC,CAAC;IAC7C,MAAM;MAAEa,aAAa;MAAEC,mBAAmB;MAAEC;IAAS,CAAC,GAAGhB,iBAAiB,CAAC;MAC1EiB,QAAQ,EAAEN,KAAK,CAACM,QAAQ;MACxBF,mBAAmB,EAAEJ,KAAK,CAACI,mBAAmB;MAC9CC,QAAQ,EAAEL,KAAK,CAACK;IACjB,CAAC,CAAC;IAEF,oBACCb,IAAA,CAACT,eAAe;MAACwB,OAAO,EAAEL,aAAc;MAAAM,QAAA,eACvChB,IAAA,CAACK,iBAAiB;QAAA,GACZG,KAAK;QACVC,GAAG,EAAEA,GAAI;QACTK,QAAQ,EAAEH,aAAc;QACxBC,mBAAmB,EAAEA,mBAAoB;QACzCC,QAAQ,EAAEA,QAAS;QACnBI,mBAAmB,EAAET,KAAK,CAACS,mBAAmB,IAAI;MAAG,CACrD;IAAC,CACc,CAAC;EAEpB,CAAC,CAAC;EAEF,MAAMC,KAAK,gBAAG7B,UAAU,CAGtB,CAACmB,KAAK,EAAEW,CAAC,KAAK;IACf,MAAM;MAAEH,QAAQ;MAAEI,KAAK;MAAEC,cAAc;MAAEC,OAAO;MAAEC,OAAO;MAAE,GAAGC;IAAK,CAAC,GACnEhB,KAAY;IAEb,MAAMiB,WAAW,GAAG/B,cAAc,CAAO,CAAC;IAE1C,MAAM;MAAEgC;IAAiB,CAAC,GAAG/B,mBAAmB,CAAC;MAChDgC,EAAE,EAAEN,cAAc,IAAIC,OAAO;MAC7BF;IACD,CAAC,CAAC;IAEF,MAAM;MACLQ,sBAAsB;MACtBC,oBAAoB;MACpBC;IACD,CAAC,GAAGlC,iBAAiB,CAAC;MACrByB,cAAc;MACdI,WAAW;MACXL,KAAK;MACLG;IACD,CAAC,CAAC;IAEF,oBACCvB,IAAA,CAAC8B,uBAAuB;MAAAd,QAAA,eACvBhB,IAAA,CAACK,iBAAiB;QAAA,GACZmB,IAAI;QACTf,GAAG,EAAEgB,WAAY;QACjBL,KAAK,EAAE,CAACA,KAAK,EAAEM,gBAAgB,CAAE;QACjCH,OAAO,EAAEM,oBAAqB;QAC9BhB,QAAQ,EAAEpB,OAAO,CAACmC,sBAAsB,CAAE;QAC1CG,WAAW,EAAE,CAACV,cAAe;QAAAL,QAAA,EAE5BA;MAAQ,CACS;IAAC,CACI,CAAC;EAE5B,CAAC,CAAC;EAEF,IAAIZ,YAAY,EAAE;IACjB,oBAAOd,IAAI,CAACiB,eAAe,CAAC;EAM7B;EAEA,oBAAOjB,IAAI,CAAC4B,KAAK,CAAC;AAMnB","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","GestureDetector","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useBoundsRegistry","useScrollRegistry","useGestureContext","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","nativeGesture","scrollHandler","onContentSizeChange","onLayout","onScroll","gesture","children","scrollEventThrottle","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","id","handleInitialLayout","captureActiveOnPress","MeasurementSyncProvider","collapsable"],"sourceRoot":"../../../src","sources":["components/create-transition-aware-component.tsx"],"mappings":";;AACA,SAA6BA,UAAU,EAAEC,IAAI,QAAQ,OAAO;AAE5D,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,IAAIC,OAAO,EAAEC,cAAc,QAAQ,yBAAyB;AAC3E,SAASC,mBAAmB,QAAQ,yCAAyC;AAC7E,SAASC,iBAAiB,QAAQ,oCAAoC;AACtE,SAASC,iBAAiB,QAAQ,uCAAuC;AACzE,SAASC,iBAAiB,QAAQ,uBAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ1D,OAAO,SAASC,8BAA8BA,CAC7CC,OAAyB,EACzBC,OAA8C,GAAG,CAAC,CAAC,EAClD;EACD,MAAM;IAAEC,YAAY,GAAG;EAAM,CAAC,GAAGD,OAAO;EAExC,MAAME,iBAAiB,GAAGb,QAAQ,CAACc,uBAAuB,CAACJ,OAAO,CAAC;EAEnE,MAAMK,eAAe,gBAAGlB,UAAU,CAGhC,CAACmB,KAAU,EAAEC,GAAG,KAAK;IACtB,MAAM;MAAEC;IAAc,CAAC,GAAGZ,iBAAiB,CAAC,CAAC;IAC7C,MAAM;MAAEa,aAAa;MAAEC,mBAAmB;MAAEC;IAAS,CAAC,GAAGhB,iBAAiB,CAAC;MAC1EiB,QAAQ,EAAEN,KAAK,CAACM,QAAQ;MACxBF,mBAAmB,EAAEJ,KAAK,CAACI,mBAAmB;MAC9CC,QAAQ,EAAEL,KAAK,CAACK;IACjB,CAAC,CAAC;IAEF,oBACCb,IAAA,CAACT,eAAe;MAACwB,OAAO,EAAEL,aAAc;MAAAM,QAAA,eACvChB,IAAA,CAACK,iBAAiB;QAAA,GACZG,KAAK;QACVC,GAAG,EAAEA,GAAI;QACTK,QAAQ,EAAEH,aAAc;QACxBC,mBAAmB,EAAEA,mBAAoB;QACzCC,QAAQ,EAAEA,QAAS;QACnBI,mBAAmB,EAAET,KAAK,CAACS,mBAAmB,IAAI;MAAG,CACrD;IAAC,CACc,CAAC;EAEpB,CAAC,CAAC;EAEF,MAAMC,KAAK,gBAAG7B,UAAU,CAGtB,CAACmB,KAAK,EAAEW,CAAC,KAAK;IACf,MAAM;MAAEH,QAAQ;MAAEI,KAAK;MAAEC,cAAc;MAAEC,OAAO;MAAEC,OAAO;MAAE,GAAGC;IAAK,CAAC,GACnEhB,KAAY;IAEb,MAAMiB,WAAW,GAAG/B,cAAc,CAAO,CAAC;IAE1C,MAAM;MAAEgC;IAAiB,CAAC,GAAG/B,mBAAmB,CAAC;MAChDgC,EAAE,EAAEN,cAAc,IAAIC,OAAO;MAC7BF;IACD,CAAC,CAAC;IAEF,MAAM;MACLQ,mBAAmB;MACnBC,oBAAoB;MACpBC;IACD,CAAC,GAAGlC,iBAAiB,CAAC;MACrByB,cAAc;MACdI,WAAW;MACXL,KAAK;MACLG;IACD,CAAC,CAAC;IAEF,oBACCvB,IAAA,CAAC8B,uBAAuB;MAAAd,QAAA,eACvBhB,IAAA,CAACK,iBAAiB;QAAA,GACZmB,IAAI;QACTf,GAAG,EAAEgB,WAAY;QACjBL,KAAK,EAAE,CAACA,KAAK,EAAEM,gBAAgB,CAAE;QACjCH,OAAO,EAAEM,oBAAqB;QAC9BhB,QAAQ,EAAEpB,OAAO,CAACmC,mBAAmB,CAAE;QACvCG,WAAW,EAAE,CAACV,cAAe;QAAAL,QAAA,EAE5BA;MAAQ,CACS;IAAC,CACI,CAAC;EAE5B,CAAC,CAAC;EAEF,IAAIZ,YAAY,EAAE;IACjB,oBAAOd,IAAI,CAACiB,eAAe,CAAC;EAM7B;EAEA,oBAAOjB,IAAI,CAAC4B,KAAK,CAAC;AAMnB","ignoreList":[]}

package/lib/module/hooks/bounds/use-bound-registry.js

@@ -17,12 +17,12 @@ export const useBoundsRegistry = ({
 }) => {
   const {
     previous,
-    current
+    current,
+    next
   } = useKeys();
   const ROOT_MEASUREMENT_SIGNAL = useContext(MeasurementUpdateContext);
   const ROOT_SIGNAL = useSharedValue(0);
   const IS_ROOT = !ROOT_MEASUREMENT_SIGNAL;
-  const hasMeasured = useSharedValue(false);
   const emitUpdate = useCallback(() => {
     "worklet";
 
@@ -34,7 +34,8 @@ export const useBoundsRegistry = ({
   }) => {
     "worklet";
 
-    if (!sharedBoundTag) return;
+    // Currently, there's no necessity to measure when the current route is blurred ( could potentially change in the future )
+    if (!sharedBoundTag || next) return;
     const measured = measure(animatedRef);
     if (!measured) {
       console.warn(`[react-native-screen-transitions] measure() returned null for sharedBoundTag="${sharedBoundTag}"`);
@@ -59,12 +60,13 @@ export const useBoundsRegistry = ({
       Bounds.setRouteActive(key, sharedBoundTag);
     }
     if (onPress) runOnJS(onPress)();
-  }, [sharedBoundTag, animatedRef, current.route.key, style, emitUpdate]);
-  const handleTransitionLayout = useCallback(() => {
+  }, [sharedBoundTag, animatedRef, current.route.key, style, emitUpdate, next]);
+  const hasMeasuredOnLayout = useSharedValue(false);
+  const handleInitialLayout = useCallback(() => {
     "worklet";
 
     const prevKey = previous?.route.key;
-    if (!sharedBoundTag || hasMeasured.value || !prevKey) {
+    if (!sharedBoundTag || hasMeasuredOnLayout.value || !prevKey) {
       return;
     }
     const prevBounds = Bounds.getBounds(prevKey)?.[sharedBoundTag];
@@ -74,9 +76,9 @@ export const useBoundsRegistry = ({
         skipMarkingActive: true
       });
       // Should not measure again while in transition
-      hasMeasured.value = true;
+      hasMeasuredOnLayout.value = true;
     }
-  }, [maybeMeasureAndStore, sharedBoundTag, previous?.route.key, hasMeasured]);
+  }, [maybeMeasureAndStore, sharedBoundTag, previous?.route.key, hasMeasuredOnLayout]);
   const captureActiveOnPress = useStableCallback(() => {
     if (!sharedBoundTag) {
       if (onPress) onPress();
@@ -113,7 +115,7 @@ export const useBoundsRegistry = ({
     });
   });
   return {
-    handleTransitionLayout,
+    handleInitialLayout,
     captureActiveOnPress,
     MeasurementSyncProvider
   };

package/lib/module/hooks/bounds/use-bound-registry.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","Fragment","useCallback","useContext","useMemo","measure","runOnJS","runOnUI","useAnimatedReaction","useSharedValue","useKeys","Bounds","flattenStyle","isBoundsEqual","useStableCallback","jsx","_jsx","MeasurementUpdateContext","useBoundsRegistry","sharedBoundTag","animatedRef","style","onPress","previous","current","ROOT_MEASUREMENT_SIGNAL","ROOT_SIGNAL","IS_ROOT","hasMeasured","emitUpdate","value","maybeMeasureAndStore","skipMarkingActive","measured","console","warn","key","route","setRouteActive","setBounds","handleTransitionLayout","prevKey","prevBounds","getBounds","captureActiveOnPress","MeasurementSyncProvider","children","Provider","updateSignal","undefined"],"sourceRoot":"../../../../src","sources":["hooks/bounds/use-bound-registry.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createContext","Fragment","useCallback","useContext","useMemo","measure","runOnJS","runOnUI","useAnimatedReaction","useSharedValue","useKeys","Bounds","flattenStyle","isBoundsEqual","useStableCallback","jsx","_jsx","MeasurementUpdateContext","useBoundsRegistry","sharedBoundTag","animatedRef","style","onPress","previous","current","next","ROOT_MEASUREMENT_SIGNAL","ROOT_SIGNAL","IS_ROOT","emitUpdate","value","maybeMeasureAndStore","skipMarkingActive","measured","console","warn","key","route","setRouteActive","setBounds","hasMeasuredOnLayout","handleInitialLayout","prevKey","prevBounds","getBounds","captureActiveOnPress","MeasurementSyncProvider","children","Provider","updateSignal","undefined"],"sourceRoot":"../../../../src","sources":["hooks/bounds/use-bound-registry.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/components/controllers/screen-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screen-lifecycle.d.ts","sourceRoot":"","sources":["../../../../src/components/controllers/screen-lifecycle.tsx"],"names":[],"mappings":"AASA,UAAU,oBAAoB;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC1B;AAED,eAAO,MAAM,yBAAyB,GAAI,eAEvC,oBAAoB,8BAgEtB,CAAC"}
+{"version":3,"file":"screen-lifecycle.d.ts","sourceRoot":"","sources":["../../../../src/components/controllers/screen-lifecycle.tsx"],"names":[],"mappings":"AASA,UAAU,oBAAoB;IAC7B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC1B;AAED,eAAO,MAAM,yBAAyB,GAAI,eAEvC,oBAAoB,8BA8DtB,CAAC"}

package/lib/typescript/hooks/bounds/use-bound-registry.d.ts

@@ -7,7 +7,7 @@ interface BoundMeasurerHookProps {
     onPress?: ((...args: unknown[]) => void) | undefined;
 }
 export declare const useBoundsRegistry: ({ sharedBoundTag, animatedRef, style, onPress, }: BoundMeasurerHookProps) => {
-    handleTransitionLayout: () => void;
+    handleInitialLayout: () => void;
     captureActiveOnPress: () => void;
     MeasurementSyncProvider: import("react").ExoticComponent<import("react").FragmentProps> | (({ children }: {
         children: React.ReactNode;

package/lib/typescript/hooks/bounds/use-bound-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-bound-registry.d.ts","sourceRoot":"","sources":["../../../../src/hooks/bounds/use-bound-registry.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACN,KAAK,WAAW,EAIhB,KAAK,UAAU,EAGf,MAAM,yBAAyB,CAAC;AAQjC,UAAU,sBAAsB;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAE/B,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACrD;AASD,eAAO,MAAM,iBAAiB,GAAI,kDAK/B,sBAAsB;;;8GAyFD;QAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;KAAE;CAyBpD,CAAC"}
+{"version":3,"file":"use-bound-registry.d.ts","sourceRoot":"","sources":["../../../../src/hooks/bounds/use-bound-registry.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACN,KAAK,WAAW,EAIhB,KAAK,UAAU,EAGf,MAAM,yBAAyB,CAAC;AAQjC,UAAU,sBAAsB;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACrD;AAcD,eAAO,MAAM,iBAAiB,GAAI,kDAK/B,sBAAsB;;;8GAyFD;QAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;KAAE;CAyBpD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-native-screen-transitions",
-	"version": "2.3.3",
+	"version": "2.3.4",
 	"description": "Easy screen transitions for React Native and Expo",
 	"author": "Ed",
 	"license": "MIT",

package/src/components/controllers/screen-lifecycle.tsx

@@ -22,14 +22,12 @@ export const ScreenLifecycleController = ({
 		const key = current.navigation.getParent()?.getState().key;
 		const requestedDismissOnNavigator = NavigatorDismissState.get(key);
 
-		// Don't run e.preventDefault when the dismissal was on the local root
-		if (requestedDismissOnNavigator) {
-			resetStoresForScreen(current);
-			return;
-		}
+		const isEnabled = current.options.enableTransitions;
+		const isRequestedDismissOnNavigator = requestedDismissOnNavigator;
+		const isFirstScreen = current.navigation.getState().index === 0;
 
-		// Don't run e.preventDefault when this is the first screen of the stack
-		if (current.navigation.getState().index === 0) {
+		// If transitions are disabled, or the dismissal was on the local root, or this is the first screen of the stack, reset the stores
+		if (!isEnabled || isRequestedDismissOnNavigator || isFirstScreen) {
 			resetStoresForScreen(current);
 			return;
 		}

package/src/components/create-transition-aware-component.tsx

@@ -62,7 +62,7 @@ export function createTransitionAwareComponent<P extends object>(
 		});
 
 		const {
-			handleTransitionLayout,
+			handleInitialLayout,
 			captureActiveOnPress,
 			MeasurementSyncProvider,
 		} = useBoundsRegistry({
@@ -79,7 +79,7 @@ export function createTransitionAwareComponent<P extends object>(
 					ref={animatedRef}
 					style={[style, associatedStyles]}
 					onPress={captureActiveOnPress}
-					onLayout={runOnUI(handleTransitionLayout)}
+					onLayout={runOnUI(handleInitialLayout)}
 					collapsable={!sharedBoundTag}
 				>
 					{children}

package/src/hooks/bounds/use-bound-registry.tsx

@@ -25,11 +25,15 @@ import useStableCallback from "../use-stable-callback";
 interface BoundMeasurerHookProps {
 	sharedBoundTag?: string;
 	animatedRef: AnimatedRef<View>;
-
 	style: StyleProps;
 	onPress?: ((...args: unknown[]) => void) | undefined;
 }
 
+interface MaybeMeasureAndStoreParams {
+	onPress?: ((...args: unknown[]) => void) | undefined;
+	skipMarkingActive?: boolean;
+}
+
 interface MeasurementUpdateContextType {
 	updateSignal: SharedValue<number>;
 }
@@ -43,12 +47,11 @@ export const useBoundsRegistry = ({
 	style,
 	onPress,
 }: BoundMeasurerHookProps) => {
-	const { previous, current } = useKeys();
+	const { previous, current, next } = useKeys();
 
 	const ROOT_MEASUREMENT_SIGNAL = useContext(MeasurementUpdateContext);
 	const ROOT_SIGNAL = useSharedValue(0);
 	const IS_ROOT = !ROOT_MEASUREMENT_SIGNAL;
-	const hasMeasured = useSharedValue(false);
 
 	const emitUpdate = useCallback(() => {
 		"worklet";
@@ -56,15 +59,10 @@ export const useBoundsRegistry = ({
 	}, [IS_ROOT, ROOT_SIGNAL]);
 
 	const maybeMeasureAndStore = useCallback(
-		({
-			onPress,
-			skipMarkingActive,
-		}: {
-			onPress?: () => void;
-			skipMarkingActive?: boolean;
-		}) => {
+		({ onPress, skipMarkingActive }: MaybeMeasureAndStoreParams) => {
 			"worklet";
-			if (!sharedBoundTag) return;
+			// Currently, there's no necessity to measure when the current route is blurred ( could potentially change in the future )
+			if (!sharedBoundTag || next) return;
 
 			const measured = measure(animatedRef);
 
@@ -95,14 +93,15 @@ export const useBoundsRegistry = ({
 
 			if (onPress) runOnJS(onPress)();
 		},
-		[sharedBoundTag, animatedRef, current.route.key, style, emitUpdate],
+		[sharedBoundTag, animatedRef, current.route.key, style, emitUpdate, next],
 	);
 
-	const handleTransitionLayout = useCallback(() => {
+	const hasMeasuredOnLayout = useSharedValue(false);
+	const handleInitialLayout = useCallback(() => {
 		"worklet";
 
 		const prevKey = previous?.route.key;
-		if (!sharedBoundTag || hasMeasured.value || !prevKey) {
+		if (!sharedBoundTag || hasMeasuredOnLayout.value || !prevKey) {
 			return;
 		}
 
@@ -112,9 +111,14 @@ export const useBoundsRegistry = ({
 			// Should skip mark active if we are in a transition
 			maybeMeasureAndStore({ skipMarkingActive: true });
 			// Should not measure again while in transition
-			hasMeasured.value = true;
+			hasMeasuredOnLayout.value = true;
 		}
-	}, [maybeMeasureAndStore, sharedBoundTag, previous?.route.key, hasMeasured]);
+	}, [
+		maybeMeasureAndStore,
+		sharedBoundTag,
+		previous?.route.key,
+		hasMeasuredOnLayout,
+	]);
 
 	const captureActiveOnPress = useStableCallback(() => {
 		if (!sharedBoundTag) {
@@ -152,7 +156,7 @@ export const useBoundsRegistry = ({
 	);
 
 	return {
-		handleTransitionLayout,
+		handleInitialLayout,
 		captureActiveOnPress,
 		MeasurementSyncProvider,
 	};