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

package/lib/commonjs/shared/components/native-screen-container.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_reactNativeScreens","_useStack","_jsxRuntime","NativeScreenContainer","children","flags","DISABLE_NATIVE_SCREENS","useStack","jsx","ScreenContainer","style","styles","container","View","exports","StyleSheet","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen-container.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAAyD,IAAAG,WAAA,GAAAH,OAAA;AAMlD,MAAMI,qBAAqB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7D,MAAM;IACLC,KAAK,EAAE;MAAEC,sBAAsB,GAAG;IAAM;EACzC,CAAC,GAAG,IAAAC,kBAAQ,EAAC,CAAC;EACd,IAAI,CAACD,sBAAsB,EAAE;IAC5B,oBACC,IAAAJ,WAAA,CAAAM,GAAA,EAACR,mBAAA,CAAAS,eAAe;MAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAR,QAAA,EAAEA;IAAQ,CAAkB,CAAC;EAExE;EACA,oBAAO,IAAAF,WAAA,CAAAM,GAAA,EAACV,YAAA,CAAAe,IAAI;IAACH,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAR,QAAA,EAAEA;EAAQ,CAAO,CAAC;AACxD,CAAC;AAACU,OAAA,CAAAX,qBAAA,GAAAA,qBAAA;AAEF,MAAMQ,MAAM,GAAGI,uBAAU,CAACC,MAAM,CAAC;EAChCJ,SAAS,EAAE;IACVK,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_reactNativeScreens","_useStack","_jsxRuntime","NativeScreenContainer","children","flags","DISABLE_NATIVE_SCREENS","DISABLE_NATIVE_SCREEN_CONTAINER","useStack","jsx","ScreenContainer","style","styles","container","View","collapsable","exports","StyleSheet","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen-container.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAAyD,IAAAG,WAAA,GAAAH,OAAA;AAMlD,MAAMI,qBAAqB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7D,MAAM;IACLC,KAAK,EAAE;MACNC,sBAAsB,GAAG,KAAK;MAC9BC,+BAA+B,GAAG;IACnC;EACD,CAAC,GAAG,IAAAC,kBAAQ,EAAC,CAAC;EACd,IAAI,CAACF,sBAAsB,IAAI,CAACC,+BAA+B,EAAE;IAChE,oBACC,IAAAL,WAAA,CAAAO,GAAA,EAACT,mBAAA,CAAAU,eAAe;MAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAT,QAAA,EAAEA;IAAQ,CAAkB,CAAC;EAExE;EACA;IAAA;IACC;IACA,IAAAF,WAAA,CAAAO,GAAA,EAACX,YAAA,CAAAgB,IAAI;MAACC,WAAW,EAAE,KAAM;MAACJ,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAT,QAAA,EAChDA;IAAQ,CACJ;EAAC;AAET,CAAC;AAACY,OAAA,CAAAb,qBAAA,GAAAA,qBAAA;AAEF,MAAMS,MAAM,GAAGK,uBAAU,CAACC,MAAM,CAAC;EAChCL,SAAS,EAAE;IACVM,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

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

@@ -44,24 +44,37 @@ const NativeScreen = ({
     backdropBehaviors
   } = (0, _managed.useManagedStackContext)();
   const routesLength = routes.length;
+  const topIndex = routesLength - 1;
+  const topRouteKey = routes[topIndex]?.key ?? routeKey;
   const screenRef = (0, _reactNativeReanimated.useAnimatedRef)();
-  const sceneProgress = _animation.AnimationStore.getRouteAnimation(routeKey, "progress");
   const sceneClosing = _animation.AnimationStore.getRouteAnimation(routeKey, "closing");
+  const topSceneProgress = _animation.AnimationStore.getRouteAnimation(topRouteKey, "progress");
+  const topSceneClosing = _animation.AnimationStore.getRouteAnimation(topRouteKey, "closing");
   const screenActivity = (0, _reactNativeReanimated.useSharedValue)(ScreenActivity.TRANSITIONING_OR_BELOW_TOP);
   (0, _reactNativeReanimated.useDerivedValue)(() => {
-    if (!sceneProgress) {
+    if (!topSceneProgress) {
       screenActivity.set(ScreenActivity.TRANSITIONING_OR_BELOW_TOP);
       return;
     }
     if (index < routesLength - activeScreensLimit - 1 || isPreloaded) {
       screenActivity.set(ScreenActivity.INACTIVE);
-    } else {
-      const outputValue = index === routesLength - 1 ? ScreenActivity.ON_TOP : index >= routesLength - activeScreensLimit ? ScreenActivity.TRANSITIONING_OR_BELOW_TOP : ScreenActivity.INACTIVE;
-      const v = (0, _reactNativeReanimated.interpolate)(sceneProgress.get(), [0, 1 - _constants.EPSILON, 1], [1, 1, outputValue], _reactNativeReanimated.Extrapolation.CLAMP);
-      const next = Math.trunc(v) ?? ScreenActivity.TRANSITIONING_OR_BELOW_TOP;
+      return;
+    }
+    const focusedIndex = optimisticFocusedIndex.value;
+    const topIsClosing = topSceneClosing.get() > 0 && focusedIndex >= 0 && focusedIndex < topIndex;
+    if (topIsClosing) {
+      const postCloseActiveStart = Math.max(0, focusedIndex - activeScreensLimit + 1);
+      const next = index === topIndex ? ScreenActivity.ON_TOP : index > focusedIndex || index >= postCloseActiveStart ? ScreenActivity.TRANSITIONING_OR_BELOW_TOP : ScreenActivity.INACTIVE;
       if (next !== screenActivity.get()) {
         screenActivity.set(next);
       }
+      return;
+    }
+    const outputValue = index === topIndex ? ScreenActivity.ON_TOP : index >= routesLength - activeScreensLimit ? ScreenActivity.TRANSITIONING_OR_BELOW_TOP : ScreenActivity.INACTIVE;
+    const v = (0, _reactNativeReanimated.interpolate)(topSceneProgress.get(), [0, 1 - _constants.EPSILON, 1], [1, 1, outputValue], _reactNativeReanimated.Extrapolation.CLAMP);
+    const next = Math.trunc(v) ?? ScreenActivity.TRANSITIONING_OR_BELOW_TOP;
+    if (next !== screenActivity.get()) {
+      screenActivity.set(next);
     }
   });
   const animatedProps = (0, _reactNativeReanimated.useAnimatedProps)(() => {
@@ -92,8 +105,22 @@ const NativeScreen = ({
       pointerEvents
     };
   });
-  const NativeScreenComponent = !DISABLE_NATIVE_SCREENS ? AnimatedNativeScreen : _reactNativeReanimated.default.View;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(NativeScreenComponent, {
+  if (DISABLE_NATIVE_SCREENS) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
+      ref: screenRef
+      // Keep a native boundary per screen when falling back to plain views.
+      // Android release builds can otherwise flatten sibling screens together.
+      ,
+      collapsable: false,
+      style: _reactNative.StyleSheet.absoluteFill,
+      animatedProps: animatedProps,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layoutAnchor.LayoutAnchorProvider, {
+        anchorRef: screenRef,
+        children: children
+      })
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AnimatedNativeScreen, {
     enabled: true,
     ref: screenRef,
     style: _reactNative.StyleSheet.absoluteFill,

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_reactNativeReanimated","_interopRequireWildcard","_reactNativeScreens","_constants","_useStack","_layoutAnchor","_managed","_animation","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","PASSTHROUGH","ScreenActivity","POINT_NONE","POINT_BOX_NONE","AnimatedNativeScreen","Animated","createAnimatedComponent","RNSScreen","NativeScreen","routeKey","index","isPreloaded","children","freezeOnBlur","shouldFreeze","flags","DISABLE_NATIVE_SCREENS","routes","optimisticFocusedIndex","useStack","activeScreensLimit","backdropBehaviors","useManagedStackContext","routesLength","length","screenRef","useAnimatedRef","sceneProgress","AnimationStore","getRouteAnimation","sceneClosing","screenActivity","useSharedValue","TRANSITIONING_OR_BELOW_TOP","useDerivedValue","INACTIVE","outputValue","ON_TOP","v","interpolate","EPSILON","Extrapolation","CLAMP","next","Math","trunc","animatedProps","useAnimatedProps","activity","isClosing","activeIndex","value","isActive","activeBackdrop","activeAllowsPassthrough","isAllowedPassthroughBelow","pointerEvents","activityState","NativeScreenComponent","View","jsx","enabled","ref","style","StyleSheet","absoluteFill","LayoutAnchorProvider","anchorRef","exports"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_reactNativeReanimated","_interopRequireWildcard","_reactNativeScreens","_constants","_useStack","_layoutAnchor","_managed","_animation","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","PASSTHROUGH","ScreenActivity","POINT_NONE","POINT_BOX_NONE","AnimatedNativeScreen","Animated","createAnimatedComponent","RNSScreen","NativeScreen","routeKey","index","isPreloaded","children","freezeOnBlur","shouldFreeze","flags","DISABLE_NATIVE_SCREENS","routes","optimisticFocusedIndex","useStack","activeScreensLimit","backdropBehaviors","useManagedStackContext","routesLength","length","topIndex","topRouteKey","key","screenRef","useAnimatedRef","sceneClosing","AnimationStore","getRouteAnimation","topSceneProgress","topSceneClosing","screenActivity","useSharedValue","TRANSITIONING_OR_BELOW_TOP","useDerivedValue","INACTIVE","focusedIndex","value","topIsClosing","postCloseActiveStart","Math","max","next","ON_TOP","outputValue","v","interpolate","EPSILON","Extrapolation","CLAMP","trunc","animatedProps","useAnimatedProps","activity","isClosing","activeIndex","isActive","activeBackdrop","activeAllowsPassthrough","isAllowedPassthroughBelow","pointerEvents","activityState","jsx","View","ref","collapsable","style","StyleSheet","absoluteFill","LayoutAnchorProvider","anchorRef","enabled","exports"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DeferredVisibilityHost = void 0;
+var _react = require("react");
+var _reactNative = require("react-native");
+var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
+var _constants = require("../../constants");
+var _styles = require("../../providers/screen/styles.provider");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/**
+ * Hides the full screen visual subtree while an interpolator explicitly reports
+ * that it is not safe to reveal yet.
+ *
+ * This sits above backdrop/content/mask/surface so a deferred transition does
+ * not leak raw first-paint UI from nested layers.
+ */
+const DeferredVisibilityHost = exports.DeferredVisibilityHost = /*#__PURE__*/(0, _react.memo)(({
+  children
+}) => {
+  const {
+    resolutionMode
+  } = (0, _styles.useScreenStyles)();
+  const animatedStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
+    "worklet";
+
+    return resolutionMode.value === "deferred" ? _constants.HIDDEN_STYLE : _constants.NO_STYLES;
+  });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
+    collapsable: false,
+    style: [styles.host, animatedStyle],
+    children: children
+  });
+});
+const styles = _reactNative.StyleSheet.create({
+  host: {
+    flex: 1
+  }
+});
+//# sourceMappingURL=deferred-visibility-host.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_styles","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","DeferredVisibilityHost","exports","memo","children","resolutionMode","useScreenStyles","animatedStyle","useAnimatedStyle","value","HIDDEN_STYLE","NO_STYLES","jsx","View","collapsable","style","styles","host","StyleSheet","create","flex"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-container/deferred-visibility-host.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAAyE,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAG,wBAAAI,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAN,uBAAA,YAAAA,CAAAI,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAMzE;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMkB,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,gBAAG,IAAAE,WAAI,EAAC,CAAC;EAAEC;AAAgB,CAAC,KAAK;EACnE,MAAM;IAAEC;EAAe,CAAC,GAAG,IAAAC,uBAAe,EAAC,CAAC;EAE5C,MAAMC,aAAa,GAAG,IAAAC,uCAAgB,EAAC,MAAM;IAC5C,SAAS;;IACT,OAAOH,cAAc,CAACI,KAAK,KAAK,UAAU,GAAGC,uBAAY,GAAGC,oBAAS;EACtE,CAAC,CAAC;EAEF,oBACC,IAAA9B,WAAA,CAAA+B,GAAA,EAACnC,sBAAA,CAAAe,OAAQ,CAACqB,IAAI;IAACC,WAAW,EAAE,KAAM;IAACC,KAAK,EAAE,CAACC,MAAM,CAACC,IAAI,EAAEV,aAAa,CAAE;IAAAH,QAAA,EACrEA;EAAQ,CACK,CAAC;AAElB,CAAC,CAAC;AAEF,MAAMY,MAAM,GAAGE,uBAAU,CAACC,MAAM,CAAC;EAChCF,IAAI,EAAE;IACLG,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

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

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useContentLayout = useContentLayout;
+var _react = require("react");
+var _reactNative = require("react-native");
+var _reactNativeReanimated = require("react-native-reanimated");
+var _descriptors = require("../../../providers/screen/descriptors");
+var _animation = require("../../../stores/animation.store");
+var _animateToProgress = require("../../../utils/animation/animate-to-progress");
+function useContentLayout() {
+  const {
+    current
+  } = (0, _descriptors.useDescriptors)();
+  const {
+    isFirstKey
+  } = (0, _descriptors.useDescriptorDerivations)();
+  const {
+    height: screenHeight
+  } = (0, _reactNative.useWindowDimensions)();
+  const routeKey = current.route.key;
+  const animations = _animation.AnimationStore.getRouteAnimations(routeKey);
+  const autoSnapPointValue = _animation.AnimationStore.getAnimation(routeKey, "autoSnapPoint");
+  const contentLayoutValue = _animation.AnimationStore.getAnimation(routeKey, "contentLayout");
+  return (0, _react.useCallback)(event => {
+    const {
+      width,
+      height
+    } = event.nativeEvent.layout;
+    if (width <= 0 || height <= 0) return;
+    const fraction = Math.min(height / screenHeight, 1);
+    const transitionSpec = current.options.transitionSpec;
+    (0, _reactNativeReanimated.runOnUI)((nextWidth, nextHeight, nextFraction, isInitialScreen, spec) => {
+      "worklet";
+
+      contentLayoutValue.value = {
+        width: nextWidth,
+        height: nextHeight
+      };
+      const isFirstMeasurement = autoSnapPointValue.value <= 0;
+      autoSnapPointValue.value = nextFraction;
+      if (!isFirstMeasurement || animations.progress.value !== 0 || animations.animating.value !== 0) {
+        return;
+      }
+      if (isInitialScreen) {
+        animations.targetProgress.value = nextFraction;
+        animations.progress.value = nextFraction;
+        return;
+      }
+      (0, _animateToProgress.animateToProgress)({
+        target: nextFraction,
+        spec,
+        animations
+      });
+    })(width, height, fraction, isFirstKey, transitionSpec);
+  }, [animations, autoSnapPointValue, contentLayoutValue, current.options.transitionSpec, isFirstKey, screenHeight]);
+}
+//# sourceMappingURL=use-content-layout.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_descriptors","_animation","_animateToProgress","useContentLayout","current","useDescriptors","isFirstKey","useDescriptorDerivations","height","screenHeight","useWindowDimensions","routeKey","route","key","animations","AnimationStore","getRouteAnimations","autoSnapPointValue","getAnimation","contentLayoutValue","useCallback","event","width","nativeEvent","layout","fraction","Math","min","transitionSpec","options","runOnUI","nextWidth","nextHeight","nextFraction","isInitialScreen","spec","value","isFirstMeasurement","progress","animating","targetProgress","animateToProgress","target"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/hooks/use-content-layout.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAIA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,kBAAA,GAAAL,OAAA;AAEO,SAASM,gBAAgBA,CAAA,EAAG;EAClC,MAAM;IAAEC;EAAQ,CAAC,GAAG,IAAAC,2BAAc,EAAC,CAAC;EACpC,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,qCAAwB,EAAC,CAAC;EACjD,MAAM;IAAEC,MAAM,EAAEC;EAAa,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EACtD,MAAMC,QAAQ,GAAGP,OAAO,CAACQ,KAAK,CAACC,GAAG;EAClC,MAAMC,UAAU,GAAGC,yBAAc,CAACC,kBAAkB,CAACL,QAAQ,CAAC;EAC9D,MAAMM,kBAAkB,GAAGF,yBAAc,CAACG,YAAY,CACrDP,QAAQ,EACR,eACD,CAAC;EACD,MAAMQ,kBAAkB,GAAGJ,yBAAc,CAACG,YAAY,CACrDP,QAAQ,EACR,eACD,CAAC;EAED,OAAO,IAAAS,kBAAW,EAChBC,KAAwB,IAAK;IAC7B,MAAM;MAAEC,KAAK;MAAEd;IAAO,CAAC,GAAGa,KAAK,CAACE,WAAW,CAACC,MAAM;IAClD,IAAIF,KAAK,IAAI,CAAC,IAAId,MAAM,IAAI,CAAC,EAAE;IAE/B,MAAMiB,QAAQ,GAAGC,IAAI,CAACC,GAAG,CAACnB,MAAM,GAAGC,YAAY,EAAE,CAAC,CAAC;IACnD,MAAMmB,cAAc,GAAGxB,OAAO,CAACyB,OAAO,CAACD,cAAc;IAErD,IAAAE,8BAAO,EACN,CACCC,SAAiB,EACjBC,UAAkB,EAClBC,YAAoB,EACpBC,eAAwB,EACxBC,IAA2B,KACvB;MACJ,SAAS;;MACThB,kBAAkB,CAACiB,KAAK,GAAG;QAC1Bd,KAAK,EAAES,SAAS;QAChBvB,MAAM,EAAEwB;MACT,CAAC;MAED,MAAMK,kBAAkB,GAAGpB,kBAAkB,CAACmB,KAAK,IAAI,CAAC;MACxDnB,kBAAkB,CAACmB,KAAK,GAAGH,YAAY;MAEvC,IACC,CAACI,kBAAkB,IACnBvB,UAAU,CAACwB,QAAQ,CAACF,KAAK,KAAK,CAAC,IAC/BtB,UAAU,CAACyB,SAAS,CAACH,KAAK,KAAK,CAAC,EAC/B;QACD;MACD;MAEA,IAAIF,eAAe,EAAE;QACpBpB,UAAU,CAAC0B,cAAc,CAACJ,KAAK,GAAGH,YAAY;QAC9CnB,UAAU,CAACwB,QAAQ,CAACF,KAAK,GAAGH,YAAY;QACxC;MACD;MAEA,IAAAQ,oCAAiB,EAAC;QACjBC,MAAM,EAAET,YAAY;QACpBE,IAAI;QACJrB;MACD,CAAC,CAAC;IACH,CACD,CAAC,CAACQ,KAAK,EAAEd,MAAM,EAAEiB,QAAQ,EAAEnB,UAAU,EAAEsB,cAAc,CAAC;EACvD,CAAC,EACD,CACCd,UAAU,EACVG,kBAAkB,EAClBE,kBAAkB,EAClBf,OAAO,CAACyB,OAAO,CAACD,cAAc,EAC9BtB,UAAU,EACVG,YAAY,CAEd,CAAC;AACF","ignoreList":[]}

package/lib/commonjs/shared/components/screen-container/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ScreenContainer = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
+var _deferredVisibilityHost = require("./deferred-visibility-host");
 var _useBackdropPointerEvents = require("./hooks/use-backdrop-pointer-events");
 var _backdrop = require("./layers/backdrop");
 var _content = require("./layers/content");
@@ -16,12 +17,14 @@ const ScreenContainer = exports.ScreenContainer = /*#__PURE__*/(0, _react.memo)(
   const {
     pointerEvents
   } = (0, _useBackdropPointerEvents.useBackdropPointerEvents)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
     style: styles.container,
     pointerEvents: pointerEvents,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_backdrop.BackdropLayer, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_content.ContentLayer, {
-      children: children
-    })]
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_deferredVisibilityHost.DeferredVisibilityHost, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_backdrop.BackdropLayer, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_content.ContentLayer, {
+        children: children
+      })]
+    })
   });
 });
 const styles = _reactNative.StyleSheet.create({

package/lib/commonjs/shared/components/screen-container/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_useBackdropPointerEvents","_backdrop","_content","_jsxRuntime","ScreenContainer","exports","memo","children","pointerEvents","useBackdropPointerEvents","jsxs","View","style","styles","container","jsx","BackdropLayer","ContentLayer","StyleSheet","create","flex"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-container/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,yBAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAAgD,IAAAK,WAAA,GAAAL,OAAA;AAMzC,MAAMM,eAAe,GAAAC,OAAA,CAAAD,eAAA,gBAAG,IAAAE,WAAI,EAAC,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC5D,MAAM;IAAEC;EAAc,CAAC,GAAG,IAAAC,kDAAwB,EAAC,CAAC;EAEpD,oBACC,IAAAN,WAAA,CAAAO,IAAA,EAACX,YAAA,CAAAY,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACN,aAAa,EAAEA,aAAc;IAAAD,QAAA,gBAC3D,IAAAJ,WAAA,CAAAY,GAAA,EAACd,SAAA,CAAAe,aAAa,IAAE,CAAC,eACjB,IAAAb,WAAA,CAAAY,GAAA,EAACb,QAAA,CAAAe,YAAY;MAAAV,QAAA,EAAEA;IAAQ,CAAe,CAAC;EAAA,CAClC,CAAC;AAET,CAAC,CAAC;AAEF,MAAMM,MAAM,GAAGK,uBAAU,CAACC,MAAM,CAAC;EAChCL,SAAS,EAAE;IACVM,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_deferredVisibilityHost","_useBackdropPointerEvents","_backdrop","_content","_jsxRuntime","ScreenContainer","exports","memo","children","pointerEvents","useBackdropPointerEvents","jsx","View","style","styles","container","jsxs","DeferredVisibilityHost","BackdropLayer","ContentLayer","StyleSheet","create","flex"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-container/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,uBAAA,GAAAF,OAAA;AACA,IAAAG,yBAAA,GAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAL,OAAA;AAAgD,IAAAM,WAAA,GAAAN,OAAA;AAMzC,MAAMO,eAAe,GAAAC,OAAA,CAAAD,eAAA,gBAAG,IAAAE,WAAI,EAAC,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC5D,MAAM;IAAEC;EAAc,CAAC,GAAG,IAAAC,kDAAwB,EAAC,CAAC;EAEpD,oBACC,IAAAN,WAAA,CAAAO,GAAA,EAACZ,YAAA,CAAAa,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACN,aAAa,EAAEA,aAAc;IAAAD,QAAA,eAC3D,IAAAJ,WAAA,CAAAY,IAAA,EAAChB,uBAAA,CAAAiB,sBAAsB;MAAAT,QAAA,gBACtB,IAAAJ,WAAA,CAAAO,GAAA,EAACT,SAAA,CAAAgB,aAAa,IAAE,CAAC,eACjB,IAAAd,WAAA,CAAAO,GAAA,EAACR,QAAA,CAAAgB,YAAY;QAAAX,QAAA,EAAEA;MAAQ,CAAe,CAAC;IAAA,CAChB;EAAC,CACpB,CAAC;AAET,CAAC,CAAC;AAEF,MAAMM,MAAM,GAAGM,uBAAU,CAACC,MAAM,CAAC;EAChCN,SAAS,EAAE;IACVO,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

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

@@ -12,9 +12,9 @@ var _constants = require("../../../constants");
 var _gestures = require("../../../providers/gestures");
 var _descriptors = require("../../../providers/screen/descriptors");
 var _styles = require("../../../providers/screen/styles.provider");
-var _animation = require("../../../stores/animation.store");
-var _animateToProgress = require("../../../utils/animation/animate-to-progress");
+var _resolveScreenTransitionOptions = require("../../../utils/resolve-screen-transition-options");
 var _useBackdropPointerEvents = require("../hooks/use-backdrop-pointer-events");
+var _useContentLayout = require("../hooks/use-content-layout");
 var _maybeMaskedNavigationContainer = require("./maybe-masked-navigation-container");
 var _surfaceContainer = require("./surface-container");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -30,81 +30,65 @@ const ContentLayer = exports.ContentLayer = /*#__PURE__*/(0, _react.memo)(({
   const {
     current
   } = (0, _descriptors.useDescriptors)();
-  const {
-    isFirstKey
-  } = (0, _descriptors.useDescriptorDerivations)();
   const {
     pointerEvents,
     isBackdropActive
   } = (0, _useBackdropPointerEvents.useBackdropPointerEvents)();
   const gestureContext = (0, _gestures.useGestureContext)();
-  const {
-    height: screenHeight
-  } = (0, _reactNative.useWindowDimensions)();
-  const isNavigationMaskEnabled = !!current.options.maskEnabled;
+  const isNavigationMaskEnabled = (0, _resolveScreenTransitionOptions.resolveNavigationMaskEnabled)(current.options);
   const contentPointerEvents = isBackdropActive ? "box-none" : pointerEvents;
-  const routeKey = current.route.key;
-  const animations = _animation.AnimationStore.getRouteAnimations(routeKey);
-  const autoSnapPointValue = _animation.AnimationStore.getAnimation(routeKey, "autoSnapPoint");
   const hasAutoSnapPoint = current.options.snapPoints?.includes("auto") ?? false;
+  const handleContentLayout = (0, _useContentLayout.useContentLayout)();
   const animatedContentStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
     "worklet";
 
     return stylesMap.value.content?.style || _constants.NO_STYLES;
   });
+  const animatedNavigationContainerStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
+    "worklet";
+
+    return stylesMap.value[_constants.NAVIGATION_MASK_CONTAINER_STYLE_ID]?.style || _constants.NO_STYLES;
+  });
   const animatedContentProps = (0, _reactNativeReanimated.useAnimatedProps)(() => {
     "worklet";
 
     return stylesMap.value.content?.props ?? _constants.NO_PROPS;
   });
-  const handleContentLayout = (0, _react.useCallback)(event => {
-    const contentHeight = event.nativeEvent.layout.height;
-    if (contentHeight <= 0) return;
-    const fraction = Math.min(contentHeight / screenHeight, 1);
-    const transitionSpec = current.options.transitionSpec;
-    (0, _reactNativeReanimated.runOnUI)((nextFraction, isInitialScreen, spec) => {
-      "worklet";
-
-      const isFirstMeasurement = autoSnapPointValue.value <= 0;
-      autoSnapPointValue.value = nextFraction;
-      if (!isFirstMeasurement || animations.progress.value !== 0 || animations.animating.value !== 0) {
-        return;
-      }
-      if (isInitialScreen) {
-        animations.targetProgress.value = nextFraction;
-        animations.progress.value = nextFraction;
-        return;
-      }
-      (0, _animateToProgress.animateToProgress)({
-        target: nextFraction,
-        spec,
-        animations
-      });
-    })(fraction, isFirstKey, transitionSpec);
-  }, [animations, autoSnapPointValue, current.options.transitionSpec, isFirstKey, screenHeight]);
+  const surfaceChildren = /*#__PURE__*/(0, _jsxRuntime.jsx)(_surfaceContainer.SurfaceContainer, {
+    pointerEvents: contentPointerEvents,
+    children: hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      collapsable: false,
+      onLayout: handleContentLayout,
+      children: children
+    }) : children
+  });
+  const navigationContainer = /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
+    style: [styles.navigationContainer, animatedNavigationContainerStyle],
+    pointerEvents: contentPointerEvents,
+    collapsable: false,
+    children: surfaceChildren
+  });
+  const navigationScopedChildren = isNavigationMaskEnabled ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_maybeMaskedNavigationContainer.MaybeMaskedNavigationContainer, {
+    pointerEvents: contentPointerEvents,
+    enabled: isNavigationMaskEnabled,
+    children: navigationContainer
+  }) : navigationContainer;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeGestureHandler.GestureDetector, {
     gesture: gestureContext.panGesture,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
       style: [styles.content, animatedContentStyle],
       animatedProps: animatedContentProps,
       pointerEvents: contentPointerEvents,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_maybeMaskedNavigationContainer.MaybeMaskedNavigationContainer, {
-        enabled: isNavigationMaskEnabled,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_surfaceContainer.SurfaceContainer, {
-          pointerEvents: contentPointerEvents,
-          children: hasAutoSnapPoint ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-            collapsable: false,
-            onLayout: handleContentLayout,
-            children: children
-          }) : children
-        })
-      })
+      children: navigationScopedChildren
     })
   });
 });
 const styles = _reactNative.StyleSheet.create({
   content: {
     flex: 1
+  },
+  navigationContainer: {
+    flex: 1
   }
 });
 //# sourceMappingURL=content.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_constants","_gestures","_descriptors","_styles","_animation","_animateToProgress","_useBackdropPointerEvents","_maybeMaskedNavigationContainer","_surfaceContainer","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ContentLayer","exports","memo","children","stylesMap","useScreenStyles","current","useDescriptors","isFirstKey","useDescriptorDerivations","pointerEvents","isBackdropActive","useBackdropPointerEvents","gestureContext","useGestureContext","height","screenHeight","useWindowDimensions","isNavigationMaskEnabled","options","maskEnabled","contentPointerEvents","routeKey","route","key","animations","AnimationStore","getRouteAnimations","autoSnapPointValue","getAnimation","hasAutoSnapPoint","snapPoints","includes","animatedContentStyle","useAnimatedStyle","value","content","style","NO_STYLES","animatedContentProps","useAnimatedProps","props","NO_PROPS","handleContentLayout","useCallback","event","contentHeight","nativeEvent","layout","fraction","Math","min","transitionSpec","runOnUI","nextFraction","isInitialScreen","spec","isFirstMeasurement","progress","animating","targetProgress","animateToProgress","target","jsx","GestureDetector","gesture","panGesture","View","styles","animatedProps","MaybeMaskedNavigationContainer","enabled","SurfaceContainer","collapsable","onLayout","StyleSheet","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeGestureHandler","_reactNativeReanimated","_interopRequireWildcard","_constants","_gestures","_descriptors","_styles","_resolveScreenTransitionOptions","_useBackdropPointerEvents","_useContentLayout","_maybeMaskedNavigationContainer","_surfaceContainer","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ContentLayer","exports","memo","children","stylesMap","useScreenStyles","current","useDescriptors","pointerEvents","isBackdropActive","useBackdropPointerEvents","gestureContext","useGestureContext","isNavigationMaskEnabled","resolveNavigationMaskEnabled","options","contentPointerEvents","hasAutoSnapPoint","snapPoints","includes","handleContentLayout","useContentLayout","animatedContentStyle","useAnimatedStyle","value","content","style","NO_STYLES","animatedNavigationContainerStyle","NAVIGATION_MASK_CONTAINER_STYLE_ID","animatedContentProps","useAnimatedProps","props","NO_PROPS","surfaceChildren","jsx","SurfaceContainer","View","collapsable","onLayout","navigationContainer","styles","navigationScopedChildren","MaybeMaskedNavigationContainer","enabled","GestureDetector","gesture","panGesture","animatedProps","StyleSheet","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/content.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -21,46 +21,38 @@ try {
 let hasWarnedMissingMaskedView = false;
 const MaybeMaskedNavigationContainer = exports.MaybeMaskedNavigationContainer = /*#__PURE__*/(0, _react.memo)(({
   enabled,
-  children
+  children,
+  pointerEvents
 }) => {
   const {
     stylesMap
   } = (0, _styles.useScreenStyles)();
-  const animatedNavigationContainerStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
-    "worklet";
-
-    return stylesMap.value[_constants.NAVIGATION_CONTAINER_STYLE_ID]?.style || _constants.NO_STYLES;
-  });
   const animatedNavigationMaskStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => {
     "worklet";
 
-    return stylesMap.value[_constants.NAVIGATION_MASK_STYLE_ID]?.style || _constants.NO_STYLES;
+    return stylesMap.value[_constants.NAVIGATION_MASK_ELEMENT_STYLE_ID]?.style || _constants.NO_STYLES;
   });
   (0, _react.useEffect)(() => {
     if (!enabled) return;
     if (LazyMaskedView !== _reactNative.View) return;
     if (hasWarnedMissingMaskedView) return;
     hasWarnedMissingMaskedView = true;
-    _logger.logger.warn("maskEnabled requires @react-native-masked-view/masked-view. Install it to enable navigation bounds masking.");
+    _logger.logger.warn("navigationMaskEnabled requires @react-native-masked-view/masked-view. Install it to enable navigation bounds masking.");
   }, [enabled]);
   if (!enabled) return children;
   if (LazyMaskedView === _reactNative.View) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
-      style: [styles.navigationContainer, animatedNavigationContainerStyle],
-      children: children
-    });
+    return children;
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(LazyMaskedView, {
     style: styles.navigationMaskedRoot
     // @ts-expect-error masked-view package types are too strict here
     ,
     maskElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
-      style: [styles.navigationMaskElement, animatedNavigationMaskStyle]
+      style: [styles.navigationMaskElement, animatedNavigationMaskStyle],
+      pointerEvents: "none"
     }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
-      style: [styles.navigationContainer, animatedNavigationContainerStyle],
-      children: children
-    })
+    pointerEvents: pointerEvents,
+    children: children
   });
 });
 const styles = _reactNative.StyleSheet.create({
@@ -69,9 +61,6 @@ const styles = _reactNative.StyleSheet.create({
   },
   navigationMaskElement: {
     backgroundColor: "white"
-  },
-  navigationContainer: {
-    flex: 1
   }
 });
 //# sourceMappingURL=maybe-masked-navigation-container.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_styles","_logger","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","LazyMaskedView","View","_","hasWarnedMissingMaskedView","MaybeMaskedNavigationContainer","exports","memo","enabled","children","stylesMap","useScreenStyles","animatedNavigationContainerStyle","useAnimatedStyle","value","NAVIGATION_CONTAINER_STYLE_ID","style","NO_STYLES","animatedNavigationMaskStyle","NAVIGATION_MASK_STYLE_ID","useEffect","logger","warn","jsx","styles","navigationContainer","navigationMaskedRoot","maskElement","navigationMaskElement","StyleSheet","create","flex","backgroundColor"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/maybe-masked-navigation-container.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_reactNativeReanimated","_interopRequireWildcard","_constants","_styles","_logger","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","LazyMaskedView","View","_","hasWarnedMissingMaskedView","MaybeMaskedNavigationContainer","exports","memo","enabled","children","pointerEvents","stylesMap","useScreenStyles","animatedNavigationMaskStyle","useAnimatedStyle","value","NAVIGATION_MASK_ELEMENT_STYLE_ID","style","NO_STYLES","useEffect","logger","warn","jsx","styles","navigationMaskedRoot","maskElement","navigationMaskElement","StyleSheet","create","flex","backgroundColor"],"sourceRoot":"../../../../../../src","sources":["shared/components/screen-container/layers/maybe-masked-navigation-container.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/shared/configs/presets.js

@@ -263,8 +263,8 @@ const SharedIGImage = ({
 
       // Extract raw style values from bounds result (legacy format)
       const sourceStyle = navigationStyles[sharedBoundTag];
-      const containerStyle = navigationStyles[_constants.NAVIGATION_CONTAINER_STYLE_ID];
-      const maskStyle = navigationStyles[_constants.NAVIGATION_MASK_STYLE_ID];
+      const containerStyle = navigationStyles[_constants.NAVIGATION_MASK_CONTAINER_STYLE_ID];
+      const maskStyle = navigationStyles[_constants.NAVIGATION_MASK_ELEMENT_STYLE_ID];
 
       // Normalize bounds result to new slot format for spreading
       const normalizedNav = (0, _normalizeInterpolatedStyle.normalizeInterpolatedStyle)(navigationStyles).result;
@@ -290,7 +290,7 @@ const SharedIGImage = ({
               }]
             }
           },
-          [_constants.NAVIGATION_CONTAINER_STYLE_ID]: containerStyle ? {
+          [_constants.NAVIGATION_MASK_CONTAINER_STYLE_ID]: containerStyle ? {
             style: {
               ...containerStyle,
               transform: [...(containerStyle.transform ?? []), {
@@ -300,7 +300,7 @@ const SharedIGImage = ({
               }]
             }
           } : undefined,
-          [_constants.NAVIGATION_MASK_STYLE_ID]: maskStyle ? {
+          [_constants.NAVIGATION_MASK_ELEMENT_STYLE_ID]: maskStyle ? {
             style: {
               ...maskStyle,
               borderRadius: (0, _reactNativeReanimated.interpolate)(progress, [0, 1], [0, 24])
@@ -572,7 +572,7 @@ const SharedXImage = ({
       const navigationStyles = bounds({
         id: sharedBoundTag
       }).navigation.zoom();
-      const maskStyle = navigationStyles[_constants.NAVIGATION_MASK_STYLE_ID];
+      const maskStyle = navigationStyles[_constants.NAVIGATION_MASK_ELEMENT_STYLE_ID];
 
       // Normalize bounds result to new slot format for spreading
       const normalizedNav = (0, _normalizeInterpolatedStyle.normalizeInterpolatedStyle)(navigationStyles).result;
@@ -582,7 +582,7 @@ const SharedXImage = ({
       const borderRadius = (0, _reactNativeReanimated.interpolate)(current.progress, [0, 1], [12, 0]);
       return {
         ...normalizedNav,
-        [_constants.NAVIGATION_MASK_STYLE_ID]: maskStyle ? {
+        [_constants.NAVIGATION_MASK_ELEMENT_STYLE_ID]: maskStyle ? {
           style: {
             ...maskStyle,
             borderRadius