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

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

@@ -13,19 +13,23 @@ import { useAutoSourceMeasurement } from "./hooks/use-auto-source-measurement";
 import { useBoundaryMeasureAndStore } from "./hooks/use-boundary-measure-and-store";
 import { useBoundaryPresence } from "./hooks/use-boundary-presence";
 import { useGroupActiveMeasurement } from "./hooks/use-group-active-measurement";
+import { useGroupActiveSourceMeasurement } from "./hooks/use-group-active-source-measurement";
 import { useInitialLayoutHandler } from "./hooks/use-initial-layout-handler";
 import { usePendingDestinationMeasurement } from "./hooks/use-pending-destination-measurement";
 import { usePendingDestinationRetryMeasurement } from "./hooks/use-pending-destination-retry-measurement";
 import { useScrollSettledMeasurement } from "./hooks/use-scroll-settled-measurement";
 import { buildBoundaryMatchKey } from "./utils/build-boundary-match-key";
 import { jsx as _jsx } from "react/jsx-runtime";
-const setGroupActiveIdOnUI = (group, id) => {
+const setGroupSelectionOnUI = (group, id) => {
   "worklet";
 
   BoundStore.setGroupActiveId(group, id);
 };
-export function createBoundaryComponent(Wrapped) {
-  const AnimatedComponent = Animated.createAnimatedComponent(Wrapped);
+export function createBoundaryComponent(Wrapped, options = {}) {
+  const {
+    alreadyAnimated = false
+  } = options;
+  const AnimatedComponent = alreadyAnimated ? Wrapped : Animated.createAnimatedComponent(Wrapped);
   const Inner = /*#__PURE__*/forwardRef((props, _ref) => {
     const {
       enabled = true,
@@ -75,8 +79,7 @@ export function createBoundaryComponent(Wrapped) {
       associatedStyles
     } = useAssociatedStyles({
       id: sharedBoundTag,
-      resetTransformOnUnset: true,
-      waitForFirstResolvedStyle: true
+      resetTransformOnUnset: true
     });
     const maybeMeasureAndStore = useBoundaryMeasureAndStore({
       enabled,
@@ -146,6 +149,18 @@ export function createBoundaryComponent(Wrapped) {
       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.
+    useGroupActiveSourceMeasurement({
+      enabled: runtimeEnabled,
+      group,
+      id,
+      hasNextScreen,
+      isAnimating,
+      maybeMeasureAndStore
+    });
+
     // While idle on source screens, re-measure after scroll settles so a later
     // close transition starts from up-to-date source geometry.
     useScrollSettledMeasurement({
@@ -169,10 +184,10 @@ export function createBoundaryComponent(Wrapped) {
     const handlePress = useCallback((...args) => {
       // Press path has priority: capture source before user onPress/navigation.
       if (group) {
-        runOnUI(setGroupActiveIdOnUI)(group, String(id));
+        runOnUI(setGroupSelectionOnUI)(group, String(id));
       }
       runOnUI(maybeMeasureAndStore)({
-        shouldSetSource: true
+        intent: "capture-source"
       });
       if (typeof onPress === "function") {
         onPress(...args);
@@ -217,8 +232,6 @@ export const Boundary = {
   /** Passive boundary wrapper (no built-in press semantics). */
   View: BoundaryView,
   /** Pressable boundary wrapper with press-priority source capture. */
-  Pressable: BoundaryPressable,
-  /** Factory for custom boundary wrappers. */
-  createBoundaryComponent
+  Pressable: BoundaryPressable
 };
 //# sourceMappingURL=index.js.map

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","useInitialLayoutHandler","usePendingDestinationMeasurement","usePendingDestinationRetryMeasurement","useScrollSettledMeasurement","buildBoundaryMatchKey","jsx","_jsx","setGroupActiveIdOnUI","group","id","setGroupActiveId","createBoundaryComponent","Wrapped","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","waitForFirstResolvedStyle","maybeMeasureAndStore","shouldRunDestinationEffects","expectedSourceScreenKey","animating","handlePress","args","String","shouldSetSource","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","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":[]}

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

@@ -12,9 +12,10 @@ import { ScrollSettleProvider } from "../providers/scroll-settle.provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function createTransitionAwareComponent(Wrapped, options = {}) {
   const {
-    isScrollable = false
+    isScrollable = false,
+    alreadyAnimated = false
   } = options;
-  const AnimatedComponent = Animated.createAnimatedComponent(Wrapped);
+  const AnimatedComponent = alreadyAnimated ? Wrapped : Animated.createAnimatedComponent(Wrapped);
   const ScrollableInner = /*#__PURE__*/forwardRef((props, ref) => {
     const {
       remeasureOnFocus: _remeasureOnFocus,
@@ -99,8 +100,7 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
     } = useAssociatedStyles({
       id: sharedBoundTag || styleId,
       style,
-      resetTransformOnUnset: !!sharedBoundTag,
-      waitForFirstResolvedStyle: false
+      resetTransformOnUnset: !!sharedBoundTag
     });
     return /*#__PURE__*/_jsx(RegisterBoundsProvider, {
       animatedRef: animatedRef,

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","useCallback","GestureDetector","Animated","runOnUI","useAnimatedRef","useComposedEventHandler","useSharedValue","useAssociatedStyles","useScrollRegistry","RegisterBoundsProvider","ScrollSettleProvider","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","scrollableProps","settledSignal","emitScrollSettled","value","scrollDirection","horizontal","scrollHandler","onContentSizeChange","onLayout","nativeGesture","direction","composedScrollHandler","handleMomentumScrollEnd","event","handleScrollEndDrag","velocityX","Math","abs","nativeEvent","velocity","x","velocityY","y","scrollableComponent","scrollEventThrottle","children","gesture","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","associatedProps","id","resetTransformOnUnset","waitForFirstResolvedStyle","captureActiveOnPress","handleInitialLayout","animatedProps","collapsable"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","useCallback","GestureDetector","Animated","runOnUI","useAnimatedRef","useComposedEventHandler","useSharedValue","useAssociatedStyles","useScrollRegistry","RegisterBoundsProvider","ScrollSettleProvider","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","alreadyAnimated","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","onMomentumScrollEnd","userOnMomentumScrollEnd","onScrollEndDrag","userOnScrollEndDrag","scrollableProps","settledSignal","emitScrollSettled","value","scrollDirection","horizontal","scrollHandler","onContentSizeChange","onLayout","nativeGesture","direction","composedScrollHandler","handleMomentumScrollEnd","event","handleScrollEndDrag","velocityX","Math","abs","nativeEvent","velocity","x","velocityY","y","scrollableComponent","scrollEventThrottle","children","gesture","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","associatedProps","id","resetTransformOnUnset","captureActiveOnPress","handleInitialLayout","animatedProps","collapsable"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -9,19 +9,25 @@ export const NativeScreenContainer = ({
 }) => {
   const {
     flags: {
-      DISABLE_NATIVE_SCREENS = false
+      DISABLE_NATIVE_SCREENS = false,
+      DISABLE_NATIVE_SCREEN_CONTAINER = false
     }
   } = useStack();
-  if (!DISABLE_NATIVE_SCREENS) {
+  if (!DISABLE_NATIVE_SCREENS && !DISABLE_NATIVE_SCREEN_CONTAINER) {
     return /*#__PURE__*/_jsx(ScreenContainer, {
       style: styles.container,
       children: children
     });
   }
-  return /*#__PURE__*/_jsx(View, {
-    style: styles.container,
-    children: children
-  });
+  return (
+    /*#__PURE__*/
+    // Mirror ScreenContainer's native boundary when screens are disabled.
+    _jsx(View, {
+      collapsable: false,
+      style: styles.container,
+      children: children
+    })
+  );
 };
 const styles = StyleSheet.create({
   container: {

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

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","View","ScreenContainer","useStack","jsx","_jsx","NativeScreenContainer","children","flags","DISABLE_NATIVE_SCREENS","style","styles","container","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen-container.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,QAAQ,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzD,OAAO,MAAMC,qBAAqB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7D,MAAM;IACLC,KAAK,EAAE;MAAEC,sBAAsB,GAAG;IAAM;EACzC,CAAC,GAAGN,QAAQ,CAAC,CAAC;EACd,IAAI,CAACM,sBAAsB,EAAE;IAC5B,oBACCJ,IAAA,CAACH,eAAe;MAACQ,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAL,QAAA,EAAEA;IAAQ,CAAkB,CAAC;EAExE;EACA,oBAAOF,IAAA,CAACJ,IAAI;IAACS,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAL,QAAA,EAAEA;EAAQ,CAAO,CAAC;AACxD,CAAC;AAED,MAAMI,MAAM,GAAGX,UAAU,CAACa,MAAM,CAAC;EAChCD,SAAS,EAAE;IACVE,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StyleSheet","View","ScreenContainer","useStack","jsx","_jsx","NativeScreenContainer","children","flags","DISABLE_NATIVE_SCREENS","DISABLE_NATIVE_SCREEN_CONTAINER","style","styles","container","collapsable","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/native-screen-container.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,eAAe,QAAQ,sBAAsB;AACtD,SAASC,QAAQ,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzD,OAAO,MAAMC,qBAAqB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAAK;EAC7D,MAAM;IACLC,KAAK,EAAE;MACNC,sBAAsB,GAAG,KAAK;MAC9BC,+BAA+B,GAAG;IACnC;EACD,CAAC,GAAGP,QAAQ,CAAC,CAAC;EACd,IAAI,CAACM,sBAAsB,IAAI,CAACC,+BAA+B,EAAE;IAChE,oBACCL,IAAA,CAACH,eAAe;MAACS,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAN,QAAA,EAAEA;IAAQ,CAAkB,CAAC;EAExE;EACA;IAAA;IACC;IACAF,IAAA,CAACJ,IAAI;MAACa,WAAW,EAAE,KAAM;MAACH,KAAK,EAAEC,MAAM,CAACC,SAAU;MAAAN,QAAA,EAChDA;IAAQ,CACJ;EAAC;AAET,CAAC;AAED,MAAMK,MAAM,GAAGZ,UAAU,CAACe,MAAM,CAAC;EAChCF,SAAS,EAAE;IACVG,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

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

@@ -39,24 +39,37 @@ export const NativeScreen = ({
     backdropBehaviors
   } = useManagedStackContext();
   const routesLength = routes.length;
+  const topIndex = routesLength - 1;
+  const topRouteKey = routes[topIndex]?.key ?? routeKey;
   const screenRef = useAnimatedRef();
-  const sceneProgress = AnimationStore.getRouteAnimation(routeKey, "progress");
   const sceneClosing = AnimationStore.getRouteAnimation(routeKey, "closing");
+  const topSceneProgress = AnimationStore.getRouteAnimation(topRouteKey, "progress");
+  const topSceneClosing = AnimationStore.getRouteAnimation(topRouteKey, "closing");
   const screenActivity = useSharedValue(ScreenActivity.TRANSITIONING_OR_BELOW_TOP);
   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 = interpolate(sceneProgress.get(), [0, 1 - EPSILON, 1], [1, 1, outputValue], 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 = interpolate(topSceneProgress.get(), [0, 1 - EPSILON, 1], [1, 1, outputValue], Extrapolation.CLAMP);
+    const next = Math.trunc(v) ?? ScreenActivity.TRANSITIONING_OR_BELOW_TOP;
+    if (next !== screenActivity.get()) {
+      screenActivity.set(next);
     }
   });
   const animatedProps = useAnimatedProps(() => {
@@ -87,8 +100,22 @@ export const NativeScreen = ({
       pointerEvents
     };
   });
-  const NativeScreenComponent = !DISABLE_NATIVE_SCREENS ? AnimatedNativeScreen : Animated.View;
-  return /*#__PURE__*/_jsx(NativeScreenComponent, {
+  if (DISABLE_NATIVE_SCREENS) {
+    return /*#__PURE__*/_jsx(Animated.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: StyleSheet.absoluteFill,
+      animatedProps: animatedProps,
+      children: /*#__PURE__*/_jsx(LayoutAnchorProvider, {
+        anchorRef: screenRef,
+        children: children
+      })
+    });
+  }
+  return /*#__PURE__*/_jsx(AnimatedNativeScreen, {
     enabled: true,
     ref: screenRef,
     style: StyleSheet.absoluteFill,

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","screenRef","sceneProgress","getRouteAnimation","sceneClosing","screenActivity","TRANSITIONING_OR_BELOW_TOP","set","INACTIVE","outputValue","ON_TOP","v","get","CLAMP","next","Math","trunc","animatedProps","activity","isClosing","activeIndex","value","isActive","activeBackdrop","activeAllowsPassthrough","isAllowedPassthroughBelow","pointerEvents","activityState","NativeScreenComponent","View","enabled","ref","style","absoluteFill","anchorRef"],"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","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":[]}

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

@@ -0,0 +1,38 @@
+"use strict";
+
+import { memo } from "react";
+import { StyleSheet } from "react-native";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { HIDDEN_STYLE, NO_STYLES } from "../../constants";
+import { useScreenStyles } from "../../providers/screen/styles.provider";
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * 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.
+ */
+export const DeferredVisibilityHost = /*#__PURE__*/memo(({
+  children
+}) => {
+  const {
+    resolutionMode
+  } = useScreenStyles();
+  const animatedStyle = useAnimatedStyle(() => {
+    "worklet";
+
+    return resolutionMode.value === "deferred" ? HIDDEN_STYLE : NO_STYLES;
+  });
+  return /*#__PURE__*/_jsx(Animated.View, {
+    collapsable: false,
+    style: [styles.host, animatedStyle],
+    children: children
+  });
+});
+const styles = StyleSheet.create({
+  host: {
+    flex: 1
+  }
+});
+//# sourceMappingURL=deferred-visibility-host.js.map

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

@@ -0,0 +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":[]}

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

@@ -0,0 +1,56 @@
+"use strict";
+
+import { useCallback } from "react";
+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 { animateToProgress } from "../../../utils/animation/animate-to-progress";
+export function useContentLayout() {
+  const {
+    current
+  } = useDescriptors();
+  const {
+    isFirstKey
+  } = useDescriptorDerivations();
+  const {
+    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");
+  return 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;
+    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;
+      }
+      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/module/shared/components/screen-container/hooks/use-content-layout.js.map

@@ -0,0 +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":[]}

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

@@ -2,6 +2,7 @@
 
 import { memo } from "react";
 import { StyleSheet, View } from "react-native";
+import { DeferredVisibilityHost } from "./deferred-visibility-host";
 import { useBackdropPointerEvents } from "./hooks/use-backdrop-pointer-events";
 import { BackdropLayer } from "./layers/backdrop";
 import { ContentLayer } from "./layers/content";
@@ -12,12 +13,14 @@ export const ScreenContainer = /*#__PURE__*/memo(({
   const {
     pointerEvents
   } = useBackdropPointerEvents();
-  return /*#__PURE__*/_jsxs(View, {
+  return /*#__PURE__*/_jsx(View, {
     style: styles.container,
     pointerEvents: pointerEvents,
-    children: [/*#__PURE__*/_jsx(BackdropLayer, {}), /*#__PURE__*/_jsx(ContentLayer, {
-      children: children
-    })]
+    children: /*#__PURE__*/_jsxs(DeferredVisibilityHost, {
+      children: [/*#__PURE__*/_jsx(BackdropLayer, {}), /*#__PURE__*/_jsx(ContentLayer, {
+        children: children
+      })]
+    })
   });
 });
 const styles = StyleSheet.create({

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

@@ -1 +1 @@
-{"version":3,"names":["memo","StyleSheet","View","useBackdropPointerEvents","BackdropLayer","ContentLayer","jsx","_jsx","jsxs","_jsxs","ScreenContainer","children","pointerEvents","style","styles","container","create","flex"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-container/index.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,aAAa,QAAQ,mBAAmB;AACjD,SAASC,YAAY,QAAQ,kBAAkB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAMhD,OAAO,MAAMC,eAAe,gBAAGV,IAAI,CAAC,CAAC;EAAEW;AAAgB,CAAC,KAAK;EAC5D,MAAM;IAAEC;EAAc,CAAC,GAAGT,wBAAwB,CAAC,CAAC;EAEpD,oBACCM,KAAA,CAACP,IAAI;IAACW,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACH,aAAa,EAAEA,aAAc;IAAAD,QAAA,gBAC3DJ,IAAA,CAACH,aAAa,IAAE,CAAC,eACjBG,IAAA,CAACF,YAAY;MAAAM,QAAA,EAAEA;IAAQ,CAAe,CAAC;EAAA,CAClC,CAAC;AAET,CAAC,CAAC;AAEF,MAAMG,MAAM,GAAGb,UAAU,CAACe,MAAM,CAAC;EAChCD,SAAS,EAAE;IACVE,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["memo","StyleSheet","View","DeferredVisibilityHost","useBackdropPointerEvents","BackdropLayer","ContentLayer","jsx","_jsx","jsxs","_jsxs","ScreenContainer","children","pointerEvents","style","styles","container","create","flex"],"sourceRoot":"../../../../../src","sources":["shared/components/screen-container/index.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,sBAAsB,QAAQ,4BAA4B;AACnE,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,aAAa,QAAQ,mBAAmB;AACjD,SAASC,YAAY,QAAQ,kBAAkB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAMhD,OAAO,MAAMC,eAAe,gBAAGX,IAAI,CAAC,CAAC;EAAEY;AAAgB,CAAC,KAAK;EAC5D,MAAM;IAAEC;EAAc,CAAC,GAAGT,wBAAwB,CAAC,CAAC;EAEpD,oBACCI,IAAA,CAACN,IAAI;IAACY,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACH,aAAa,EAAEA,aAAc;IAAAD,QAAA,eAC3DF,KAAA,CAACP,sBAAsB;MAAAS,QAAA,gBACtBJ,IAAA,CAACH,aAAa,IAAE,CAAC,eACjBG,IAAA,CAACF,YAAY;QAAAM,QAAA,EAAEA;MAAQ,CAAe,CAAC;IAAA,CAChB;EAAC,CACpB,CAAC;AAET,CAAC,CAAC;AAEF,MAAMG,MAAM,GAAGd,UAAU,CAACgB,MAAM,CAAC;EAChCD,SAAS,EAAE;IACVE,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}

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

@@ -1,17 +1,17 @@
 "use strict";
 
 /** biome-ignore-all lint/style/noNonNullAssertion: <Screen gesture is under the gesture context, so this will always exist.> */
-import { memo, useCallback } from "react";
-import { StyleSheet, useWindowDimensions, View } from "react-native";
+import { memo } from "react";
+import { StyleSheet, View } from "react-native";
 import { GestureDetector } from "react-native-gesture-handler";
-import Animated, { runOnUI, useAnimatedProps, useAnimatedStyle } from "react-native-reanimated";
-import { NO_PROPS, NO_STYLES } from "../../../constants";
+import Animated, { useAnimatedProps, useAnimatedStyle } from "react-native-reanimated";
+import { NAVIGATION_MASK_CONTAINER_STYLE_ID, NO_PROPS, NO_STYLES } from "../../../constants";
 import { useGestureContext } from "../../../providers/gestures";
-import { useDescriptorDerivations, useDescriptors } from "../../../providers/screen/descriptors";
+import { useDescriptors } from "../../../providers/screen/descriptors";
 import { useScreenStyles } from "../../../providers/screen/styles.provider";
-import { AnimationStore } from "../../../stores/animation.store";
-import { animateToProgress } from "../../../utils/animation/animate-to-progress";
+import { resolveNavigationMaskEnabled } from "../../../utils/resolve-screen-transition-options";
 import { useBackdropPointerEvents } from "../hooks/use-backdrop-pointer-events";
+import { useContentLayout } from "../hooks/use-content-layout";
 import { MaybeMaskedNavigationContainer } from "./maybe-masked-navigation-container";
 import { SurfaceContainer } from "./surface-container";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -24,81 +24,65 @@ export const ContentLayer = /*#__PURE__*/memo(({
   const {
     current
   } = useDescriptors();
-  const {
-    isFirstKey
-  } = useDescriptorDerivations();
   const {
     pointerEvents,
     isBackdropActive
   } = useBackdropPointerEvents();
   const gestureContext = useGestureContext();
-  const {
-    height: screenHeight
-  } = useWindowDimensions();
-  const isNavigationMaskEnabled = !!current.options.maskEnabled;
+  const isNavigationMaskEnabled = resolveNavigationMaskEnabled(current.options);
   const contentPointerEvents = isBackdropActive ? "box-none" : pointerEvents;
-  const routeKey = current.route.key;
-  const animations = AnimationStore.getRouteAnimations(routeKey);
-  const autoSnapPointValue = AnimationStore.getAnimation(routeKey, "autoSnapPoint");
   const hasAutoSnapPoint = current.options.snapPoints?.includes("auto") ?? false;
+  const handleContentLayout = useContentLayout();
   const animatedContentStyle = useAnimatedStyle(() => {
     "worklet";
 
     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 handleContentLayout = useCallback(event => {
-    const contentHeight = event.nativeEvent.layout.height;
-    if (contentHeight <= 0) return;
-    const fraction = Math.min(contentHeight / screenHeight, 1);
-    const transitionSpec = current.options.transitionSpec;
-    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;
-      }
-      animateToProgress({
-        target: nextFraction,
-        spec,
-        animations
-      });
-    })(fraction, isFirstKey, transitionSpec);
-  }, [animations, autoSnapPointValue, current.options.transitionSpec, isFirstKey, screenHeight]);
+  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: /*#__PURE__*/_jsx(MaybeMaskedNavigationContainer, {
-        enabled: isNavigationMaskEnabled,
-        children: /*#__PURE__*/_jsx(SurfaceContainer, {
-          pointerEvents: contentPointerEvents,
-          children: hasAutoSnapPoint ? /*#__PURE__*/_jsx(View, {
-            collapsable: false,
-            onLayout: handleContentLayout,
-            children: children
-          }) : children
-        })
-      })
+      children: navigationScopedChildren
     })
   });
 });
 const styles = StyleSheet.create({
   content: {
     flex: 1
+  },
+  navigationContainer: {
+    flex: 1
   }
 });
 //# sourceMappingURL=content.js.map