react-native-screen-transitions 3.3.0-rc.3 → 3.4.0-alpha.0

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

@@ -0,0 +1,224 @@
+"use strict";
+
+import { forwardRef, memo, useCallback, useMemo } from "react";
+import { Pressable, View as RNView } from "react-native";
+import Animated, { runOnUI, useAnimatedRef } from "react-native-reanimated";
+import { useAssociatedStyles } from "../../hooks/animation/use-associated-style";
+import { useLayoutAnchorContext } from "../../providers/layout-anchor.provider";
+import { useDescriptorDerivations } from "../../providers/screen/descriptors";
+import { AnimationStore } from "../../stores/animation.store";
+import { BoundStore } from "../../stores/bounds";
+import { prepareStyleForBounds } from "../../utils/bounds/helpers/styles";
+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 { 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) => {
+  "worklet";
+
+  BoundStore.setGroupActiveId(group, id);
+};
+export function createBoundaryComponent(Wrapped) {
+  const AnimatedComponent = Animated.createAnimatedComponent(Wrapped);
+  const Inner = /*#__PURE__*/forwardRef((props, _ref) => {
+    const {
+      enabled = true,
+      group,
+      id,
+      anchor,
+      scaleMode,
+      target,
+      method,
+      style,
+      onPress,
+      ...rest
+    } = props;
+    const sharedBoundTag = buildBoundaryMatchKey({
+      group,
+      id
+    });
+    const animatedRef = useAnimatedRef();
+    const {
+      previousScreenKey: preferredSourceScreenKey,
+      currentScreenKey,
+      nextScreenKey,
+      ancestorKeys,
+      navigatorKey,
+      ancestorNavigatorKeys,
+      hasConfiguredInterpolator
+    } = useDescriptorDerivations();
+    const runtimeEnabled = enabled && hasConfiguredInterpolator;
+    const hasNextScreen = !!nextScreenKey;
+    const shouldUpdateDestination = !hasNextScreen;
+    const layoutAnchor = useLayoutAnchorContext();
+    const boundaryConfig = useMemo(() => {
+      if (anchor === undefined && scaleMode === undefined && target === undefined && method === undefined) {
+        return undefined;
+      }
+      return {
+        anchor,
+        scaleMode,
+        target,
+        method
+      };
+    }, [anchor, scaleMode, target, method]);
+    const isAnimating = AnimationStore.getRouteAnimation(currentScreenKey, "animating");
+    const progress = AnimationStore.getRouteAnimation(currentScreenKey, "progress");
+    const preparedStyles = useMemo(() => prepareStyleForBounds(style), [style]);
+    const {
+      associatedStyles
+    } = useAssociatedStyles({
+      id: sharedBoundTag,
+      resetTransformOnUnset: true,
+      waitForFirstResolvedStyle: true
+    });
+    const maybeMeasureAndStore = useBoundaryMeasureAndStore({
+      enabled,
+      sharedBoundTag,
+      preferredSourceScreenKey,
+      currentScreenKey,
+      ancestorKeys,
+      navigatorKey,
+      ancestorNavigatorKeys,
+      isAnimating,
+      preparedStyles,
+      animatedRef,
+      layoutAnchor
+    });
+    const shouldRunDestinationEffects = runtimeEnabled && !hasNextScreen;
+
+    // Register/unregister this boundary in the presence map so source/destination
+    // matching can resolve across screens (including ancestor relationships).
+    useBoundaryPresence({
+      enabled: runtimeEnabled,
+      sharedBoundTag,
+      currentScreenKey,
+      ancestorKeys,
+      navigatorKey,
+      ancestorNavigatorKeys,
+      boundaryConfig
+    });
+
+    // On the source screen, capture source bounds when a matching destination
+    // appears on the next screen.
+    useAutoSourceMeasurement({
+      enabled: runtimeEnabled,
+      sharedBoundTag,
+      nextScreenKey,
+      maybeMeasureAndStore
+    });
+
+    // Primary destination capture: once a pending source link exists for this tag,
+    // measure destination bounds and complete the pair.
+    usePendingDestinationMeasurement({
+      sharedBoundTag,
+      enabled: shouldRunDestinationEffects,
+      expectedSourceScreenKey: preferredSourceScreenKey,
+      maybeMeasureAndStore
+    });
+
+    // Reliability fallback: retry destination capture during transition progress
+    // when the initial pending-destination attempt happens before layout is ready.
+    usePendingDestinationRetryMeasurement({
+      sharedBoundTag,
+      enabled: shouldRunDestinationEffects,
+      currentScreenKey,
+      expectedSourceScreenKey: preferredSourceScreenKey,
+      progress,
+      animating: isAnimating,
+      maybeMeasureAndStore
+    });
+
+    // Grouped boundaries (e.g. paged/detail UIs): re-measure when this boundary
+    // becomes the active member so destination bounds stay accurate.
+    useGroupActiveMeasurement({
+      enabled: runtimeEnabled,
+      group,
+      id,
+      shouldUpdateDestination,
+      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({
+      enabled: runtimeEnabled,
+      group,
+      hasNextScreen,
+      isAnimating,
+      maybeMeasureAndStore
+    });
+
+    // Destination mount-time capture path: onLayout schedules a one-time UI-thread
+    // initial measurement when transitions are active.
+    useInitialLayoutHandler({
+      enabled: runtimeEnabled,
+      sharedBoundTag,
+      currentScreenKey,
+      ancestorKeys,
+      expectedSourceScreenKey: preferredSourceScreenKey,
+      maybeMeasureAndStore
+    });
+    const handlePress = useCallback((...args) => {
+      // Press path has priority: capture source before user onPress/navigation.
+      if (group) {
+        runOnUI(setGroupActiveIdOnUI)(group, String(id));
+      }
+      runOnUI(maybeMeasureAndStore)({
+        shouldSetSource: true
+      });
+      if (typeof onPress === "function") {
+        onPress(...args);
+      }
+    }, [group, id, maybeMeasureAndStore, onPress]);
+    const resolvedOnPress = typeof onPress === "function" ? handlePress : undefined;
+    return /*#__PURE__*/_jsx(AnimatedComponent, {
+      ...rest,
+      ref: animatedRef,
+      style: [style, enabled ? associatedStyles : undefined],
+      onPress: resolvedOnPress,
+      collapsable: false
+    });
+  });
+  return /*#__PURE__*/memo(Inner);
+}
+
+// Pre-built boundary component variants
+const BoundaryView = createBoundaryComponent(RNView);
+BoundaryView.displayName = "Transition.Boundary.View";
+const BoundaryPressable = createBoundaryComponent(Pressable);
+BoundaryPressable.displayName = "Transition.Boundary.Pressable";
+
+/**
+ * Shared-boundary components.
+ *
+ * How measurement works:
+ * 1. Source screen captures bounds for a tag.
+ * 2. Destination screen captures bounds for the same tag.
+ * 3. The link is updated as layout changes (group-active + scroll-settled paths).
+ *
+ * Press behavior:
+ * - When a boundary has `onPress` (typically `Boundary.Pressable`), source
+ *   measurement runs before the user callback. This gives navigation transitions
+ *   fresh source geometry on the first frame.
+ *
+ * Use:
+ * - `Boundary.View` for passive/shared elements.
+ * - `Boundary.Pressable` for tappable elements that start navigation.
+ */
+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
+};
+//# sourceMappingURL=index.js.map

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

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

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

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../../../src","sources":["shared/components/create-boundary-component/types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/shared/components/create-boundary-component/utils/build-boundary-match-key.js

@@ -0,0 +1,17 @@
+"use strict";
+
+export function buildBoundaryMatchKey(paramsOrGroup, legacyId) {
+  "worklet";
+
+  if (typeof paramsOrGroup === "object" && paramsOrGroup !== null) {
+    const {
+      group,
+      id
+    } = paramsOrGroup;
+    return group ? `${group}:${id}` : String(id);
+  }
+  const group = paramsOrGroup;
+  const id = legacyId;
+  return group ? `${group}:${id}` : String(id);
+}
+//# sourceMappingURL=build-boundary-match-key.js.map

package/lib/module/shared/components/create-boundary-component/utils/build-boundary-match-key.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["buildBoundaryMatchKey","paramsOrGroup","legacyId","group","id","String"],"sourceRoot":"../../../../../../src","sources":["shared/components/create-boundary-component/utils/build-boundary-match-key.ts"],"mappings":";;AAcA,OAAO,SAASA,qBAAqBA,CACpCC,aAA+D,EAC/DC,QAAqB,EACZ;EACT,SAAS;;EAET,IAAI,OAAOD,aAAa,KAAK,QAAQ,IAAIA,aAAa,KAAK,IAAI,EAAE;IAChE,MAAM;MAAEE,KAAK;MAAEC;IAAG,CAAC,GAAGH,aAAa;IACnC,OAAOE,KAAK,GAAG,GAAGA,KAAK,IAAIC,EAAE,EAAE,GAAGC,MAAM,CAACD,EAAE,CAAC;EAC7C;EAEA,MAAMD,KAAK,GAAGF,aAAa;EAC3B,MAAMG,EAAE,GAAGF,QAAQ;EACnB,OAAOC,KAAK,GAAG,GAAGA,KAAK,IAAIC,EAAE,EAAE,GAAGC,MAAM,CAACD,EAAE,CAAC;AAC7C","ignoreList":[]}

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

@@ -2,12 +2,13 @@
 
 /** biome-ignore-all lint/style/noNonNullAssertion: <This helper is usually being used inside a transitionable stack> */
 
-import { forwardRef, memo } from "react";
+import { forwardRef, memo, useCallback } from "react";
 import { GestureDetector } from "react-native-gesture-handler";
-import Animated, { runOnUI, useAnimatedRef, useComposedEventHandler } from "react-native-reanimated";
+import Animated, { runOnUI, useAnimatedRef, useComposedEventHandler, useSharedValue } from "react-native-reanimated";
 import { useAssociatedStyles } from "../hooks/animation/use-associated-style";
 import { useScrollRegistry } from "../hooks/gestures/use-scroll-registry";
 import { RegisterBoundsProvider } from "../providers/register-bounds.provider";
+import { ScrollSettleProvider } from "../providers/scroll-settle.provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function createTransitionAwareComponent(Wrapped, options = {}) {
   const {
@@ -18,8 +19,18 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
     const {
       remeasureOnFocus: _remeasureOnFocus,
       onScroll: userOnScroll,
+      onMomentumScrollEnd: userOnMomentumScrollEnd,
+      onScrollEndDrag: userOnScrollEndDrag,
       ...scrollableProps
     } = props;
+    const settledSignal = useSharedValue(0);
+    const emitScrollSettled = useCallback(() => {
+      runOnUI(() => {
+        "worklet";
+
+        settledSignal.value = settledSignal.value + 1;
+      })();
+    }, [settledSignal]);
 
     // Determine scroll direction from the horizontal prop (standard ScrollView API)
     const scrollDirection = scrollableProps.horizontal ? "horizontal" : "vertical";
@@ -36,22 +47,39 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
       direction: scrollDirection
     });
     const composedScrollHandler = useComposedEventHandler([scrollHandler, userOnScroll ?? null]);
+    const handleMomentumScrollEnd = useCallback(event => {
+      userOnMomentumScrollEnd?.(event);
+      emitScrollSettled();
+    }, [userOnMomentumScrollEnd, emitScrollSettled]);
+    const handleScrollEndDrag = useCallback(event => {
+      userOnScrollEndDrag?.(event);
+      const velocityX = Math.abs(event?.nativeEvent?.velocity?.x ?? 0);
+      const velocityY = Math.abs(event?.nativeEvent?.velocity?.y ?? 0);
+
+      // If there is no momentum, onMomentumScrollEnd may not fire.
+      // Emit settled signal here only when velocity is effectively zero.
+      if (velocityX < 0.01 && velocityY < 0.01) {
+        emitScrollSettled();
+      }
+    }, [userOnScrollEndDrag, emitScrollSettled]);
     const scrollableComponent = /*#__PURE__*/_jsx(AnimatedComponent, {
       ...scrollableProps,
       ref: ref,
       onScroll: composedScrollHandler,
+      onMomentumScrollEnd: handleMomentumScrollEnd,
+      onScrollEndDrag: handleScrollEndDrag,
       onContentSizeChange: onContentSizeChange,
       onLayout: onLayout,
       scrollEventThrottle: scrollableProps.scrollEventThrottle || 16
     });
 
     // If no gesture owner found for this axis, render without GestureDetector
-    if (!nativeGesture) {
-      return scrollableComponent;
-    }
-    return /*#__PURE__*/_jsx(GestureDetector, {
-      gesture: nativeGesture,
-      children: scrollableComponent
+    return /*#__PURE__*/_jsx(ScrollSettleProvider, {
+      settledSignal: settledSignal,
+      children: !nativeGesture ? scrollableComponent : /*#__PURE__*/_jsx(GestureDetector, {
+        gesture: nativeGesture,
+        children: scrollableComponent
+      })
     });
   });
   const Inner = /*#__PURE__*/forwardRef((props, _) => {
@@ -66,10 +94,13 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
     } = props;
     const animatedRef = useAnimatedRef();
     const {
-      associatedStyles
+      associatedStyles,
+      associatedProps
     } = useAssociatedStyles({
       id: sharedBoundTag || styleId,
-      style
+      style,
+      resetTransformOnUnset: !!sharedBoundTag,
+      waitForFirstResolvedStyle: false
     });
     return /*#__PURE__*/_jsx(RegisterBoundsProvider, {
       animatedRef: animatedRef,
@@ -84,6 +115,7 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
         ...rest,
         ref: animatedRef,
         style: [style, associatedStyles],
+        animatedProps: associatedProps,
         onPress: captureActiveOnPress,
         onLayout: runOnUI(handleInitialLayout),
         collapsable: !sharedBoundTag,

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","GestureDetector","Animated","runOnUI","useAnimatedRef","useComposedEventHandler","useAssociatedStyles","useScrollRegistry","RegisterBoundsProvider","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","remeasureOnFocus","_remeasureOnFocus","onScroll","userOnScroll","scrollableProps","scrollDirection","horizontal","scrollHandler","onContentSizeChange","onLayout","nativeGesture","direction","composedScrollHandler","scrollableComponent","scrollEventThrottle","gesture","children","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","id","captureActiveOnPress","handleInitialLayout","collapsable"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":";;AAAA;;AAEA,SAA6BA,UAAU,EAAEC,IAAI,QAAQ,OAAO;AAE5D,SAASC,eAAe,QAAQ,8BAA8B;AAC9D,OAAOC,QAAQ,IACdC,OAAO,EACPC,cAAc,EACdC,uBAAuB,QACjB,yBAAyB;AAChC,SAASC,mBAAmB,QAAQ,yCAAyC;AAC7E,SAASC,iBAAiB,QAAQ,uCAAuC;AACzE,SAASC,sBAAsB,QAAQ,uCAAuC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAO/E,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;MACLC,gBAAgB,EAAEC,iBAAiB;MACnCC,QAAQ,EAAEC,YAAY;MACtB,GAAGC;IACJ,CAAC,GAAGN,KAAK;;IAET;IACA,MAAMO,eAAe,GAAGD,eAAe,CAACE,UAAU,GAC/C,YAAY,GACZ,UAAU;;IAEb;IACA,MAAM;MAAEC,aAAa;MAAEC,mBAAmB;MAAEC,QAAQ;MAAEC;IAAc,CAAC,GACpEvB,iBAAiB,CAAC;MACjBqB,mBAAmB,EAAEJ,eAAe,CAACI,mBAAmB;MACxDC,QAAQ,EAAEL,eAAe,CAACK,QAAQ;MAClCE,SAAS,EAAEN;IACZ,CAAC,CAAC;IAEH,MAAMO,qBAAqB,GAAG3B,uBAAuB,CAAC,CACrDsB,aAAa,EACbJ,YAAY,IAAI,IAAI,CACpB,CAAC;IAEF,MAAMU,mBAAmB,gBACxBvB,IAAA,CAACK,iBAAiB;MAAA,GACZS,eAAe;MACpBL,GAAG,EAAEA,GAAI;MACTG,QAAQ,EAAEU,qBAAsB;MAChCJ,mBAAmB,EAAEA,mBAAoB;MACzCC,QAAQ,EAAEA,QAAS;MACnBK,mBAAmB,EAAEV,eAAe,CAACU,mBAAmB,IAAI;IAAG,CAC/D,CACD;;IAED;IACA,IAAI,CAACJ,aAAa,EAAE;MACnB,OAAOG,mBAAmB;IAC3B;IAEA,oBACCvB,IAAA,CAACT,eAAe;MAACkC,OAAO,EAAEL,aAAc;MAAAM,QAAA,EACtCH;IAAmB,CACJ,CAAC;EAEpB,CAAC,CAAC;EAEF,MAAMI,KAAK,gBAAGtC,UAAU,CAGtB,CAACmB,KAAK,EAAEoB,CAAC,KAAK;IACf,MAAM;MACLF,QAAQ;MACRG,KAAK;MACLC,cAAc;MACdC,OAAO;MACPC,OAAO;MACPtB,gBAAgB;MAChB,GAAGuB;IACJ,CAAC,GAAGzB,KAAY;IAEhB,MAAM0B,WAAW,GAAGxC,cAAc,CAAO,CAAC;IAE1C,MAAM;MAAEyC;IAAiB,CAAC,GAAGvC,mBAAmB,CAAC;MAChDwC,EAAE,EAAEN,cAAc,IAAIC,OAAO;MAC7BF;IACD,CAAC,CAAC;IAEF,oBACC7B,IAAA,CAACF,sBAAsB;MACtBoC,WAAW,EAAEA,WAAY;MACzBL,KAAK,EAAEA,KAAM;MACbG,OAAO,EAAEA,OAAQ;MACjBF,cAAc,EAAEA,cAAe;MAC/BpB,gBAAgB,EAAEA,gBAAiB;MAAAgB,QAAA,EAElCA,CAAC;QAAEW,oBAAoB;QAAEC;MAAoB,CAAC,kBAC9CtC,IAAA,CAACK,iBAAiB;QAAA,GACZ4B,IAAI;QACTxB,GAAG,EAAEyB,WAAY;QACjBL,KAAK,EAAE,CAACA,KAAK,EAAEM,gBAAgB,CAAE;QACjCH,OAAO,EAAEK,oBAAqB;QAC9BlB,QAAQ,EAAE1B,OAAO,CAAC6C,mBAAmB,CAAE;QACvCC,WAAW,EAAE,CAACT,cAAe;QAAAJ,QAAA,EAE5BA;MAAQ,CACS;IACnB,CACsB,CAAC;EAE3B,CAAC,CAAC;EAEF,IAAItB,YAAY,EAAE;IACjB,oBAAOd,IAAI,CAACiB,eAAe,CAAC;EAM7B;EAEA,oBAAOjB,IAAI,CAACqC,KAAK,CAAC;AAMnB","ignoreList":[]}
+{"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":[]}

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

@@ -30,18 +30,18 @@ export const NativeScreen = ({
   const {
     flags: {
       DISABLE_NATIVE_SCREENS = false
-    }
+    },
+    routes,
+    optimisticFocusedIndex
   } = useStack();
   const {
     activeScreensLimit,
-    routes,
-    optimisticFocusedIndex,
     backdropBehaviors
   } = useManagedStackContext();
   const routesLength = routes.length;
   const screenRef = useAnimatedRef();
-  const sceneProgress = AnimationStore.getAnimation(routeKey, "progress");
-  const sceneClosing = AnimationStore.getAnimation(routeKey, "closing");
+  const sceneProgress = AnimationStore.getRouteAnimation(routeKey, "progress");
+  const sceneClosing = AnimationStore.getRouteAnimation(routeKey, "closing");
   const screenActivity = useSharedValue(ScreenActivity.TRANSITIONING_OR_BELOW_TOP);
   useDerivedValue(() => {
     if (!sceneProgress) {

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","activeScreensLimit","routes","optimisticFocusedIndex","backdropBehaviors","routesLength","length","screenRef","sceneProgress","getAnimation","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","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":[]}

package/lib/module/shared/components/overlay/helpers/get-active-overlay.js

@@ -1,9 +1,11 @@
 "use strict";
 
+import { isFloatOverlayVisible } from "../../../utils/overlay/visibility";
+
 /**
  * Find the active float overlay from scenes.
  * Scans from the top of the stack downward to find the first screen
- * with overlayMode="float" and overlayShown=true.
+ * with a visible overlay that isn't explicitly set to legacy screen mode.
  */
 export function getActiveFloatOverlay(scenes, index, transitionsAlwaysOn) {
   if (scenes.length === 0) {
@@ -23,7 +25,7 @@ export function getActiveFloatOverlay(scenes, index, transitionsAlwaysOn) {
     if (!transitionsAlwaysOn && !options?.enableTransitions) {
       continue;
     }
-    if (options?.overlayMode === "float" && options?.overlayShown) {
+    if (isFloatOverlayVisible(options)) {
       return {
         scene,
         overlayIndex: i

package/lib/module/shared/components/overlay/helpers/get-active-overlay.js.map

@@ -1 +1 @@
-{"version":3,"names":["getActiveFloatOverlay","scenes","index","transitionsAlwaysOn","length","startIndex","Math","max","i","scene","options","descriptor","enableTransitions","overlayMode","overlayShown","overlayIndex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/get-active-overlay.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACpCC,MAAoB,EACpBC,KAAa,EACbC,mBAA4B,EACyB;EACrD,IAAIF,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACxB,OAAO,IAAI;EACZ;;EAEA;EACA;EACA;EACA;EACA,MAAMC,UAAU,GAAGC,IAAI,CAACC,GAAG,CAACL,KAAK,EAAED,MAAM,CAACG,MAAM,GAAG,CAAC,CAAC;EAErD,KAAK,IAAII,CAAC,GAAGH,UAAU,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACrC,MAAMC,KAAK,GAAGR,MAAM,CAACO,CAAC,CAAC;IACvB,MAAME,OAAO,GAAGD,KAAK,EAAEE,UAAU,EAAED,OAAO;;IAE1C;IACA,IAAI,CAACP,mBAAmB,IAAI,CAACO,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAIF,OAAO,EAAEG,WAAW,KAAK,OAAO,IAAIH,OAAO,EAAEI,YAAY,EAAE;MAC9D,OAAO;QAAEL,KAAK;QAAEM,YAAY,EAAEP;MAAE,CAAC;IAClC;EACD;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}
+{"version":3,"names":["isFloatOverlayVisible","getActiveFloatOverlay","scenes","index","transitionsAlwaysOn","length","startIndex","Math","max","i","scene","options","descriptor","enableTransitions","overlayIndex"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/helpers/get-active-overlay.ts"],"mappings":";;AACA,SAASA,qBAAqB,QAAQ,mCAAmC;;AAEzE;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,qBAAqBA,CACpCC,MAAoB,EACpBC,KAAa,EACbC,mBAA4B,EACyB;EACrD,IAAIF,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IACxB,OAAO,IAAI;EACZ;;EAEA;EACA;EACA;EACA;EACA,MAAMC,UAAU,GAAGC,IAAI,CAACC,GAAG,CAACL,KAAK,EAAED,MAAM,CAACG,MAAM,GAAG,CAAC,CAAC;EAErD,KAAK,IAAII,CAAC,GAAGH,UAAU,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACrC,MAAMC,KAAK,GAAGR,MAAM,CAACO,CAAC,CAAC;IACvB,MAAME,OAAO,GAAGD,KAAK,EAAEE,UAAU,EAAED,OAAO;;IAE1C;IACA,IAAI,CAACP,mBAAmB,IAAI,CAACO,OAAO,EAAEE,iBAAiB,EAAE;MACxD;IACD;IAEA,IAAIb,qBAAqB,CAACW,OAAO,CAAC,EAAE;MACnC,OAAO;QAAED,KAAK;QAAEI,YAAY,EAAEL;MAAE,CAAC;IAClC;EACD;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}

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

@@ -1,8 +1,11 @@
 "use strict";
 
 import { useMemo } from "react";
+import { snapDescriptorToIndex } from "../../../animation/snap-to";
+import { useOptimisticFocusedIndex } from "../../../hooks/navigation/use-optimistic-focused-index";
 import { useStack } from "../../../hooks/navigation/use-stack";
-import { KeysProvider } from "../../../providers/screen/keys.provider";
+import { ScreenAnimationProvider } from "../../../providers/screen/animation";
+import { DescriptorsProvider } from "../../../providers/screen/descriptors";
 import { ScreenStylesProvider } from "../../../providers/screen/styles.provider";
 import { getActiveFloatOverlay } from "../helpers/get-active-overlay";
 import { OverlayHost } from "./overlay-host";
@@ -15,27 +18,64 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export function FloatOverlay() {
   const {
     scenes,
-    focusedIndex,
-    flags
+    optimisticFocusedIndex,
+    flags,
+    routes,
+    routeKeys
   } = useStack();
+  const focusedIndex = useOptimisticFocusedIndex(optimisticFocusedIndex, routeKeys.length);
   const activeOverlay = useMemo(() => getActiveFloatOverlay(scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON), [scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON]);
-  if (!activeOverlay) {
+  const overlayData = useMemo(() => {
+    if (!activeOverlay) return null;
+    const {
+      scene,
+      overlayIndex
+    } = activeOverlay;
+    const previous = scenes[overlayIndex - 1]?.descriptor;
+    const current = scene.descriptor;
+    const next = scenes[overlayIndex + 1]?.descriptor;
+    const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
+    const focusedDescriptor = focusedScene?.descriptor;
+    const overlayScreenState = {
+      index: routeKeys.indexOf(current.route.key),
+      options: focusedDescriptor?.options ?? {},
+      routes,
+      focusedRoute: focusedScene?.route ?? current.route,
+      focusedIndex,
+      meta: focusedDescriptor?.options?.meta,
+      navigation: current.navigation,
+      snapTo: index => {
+        snapDescriptorToIndex(current, index);
+      }
+    };
+    return {
+      scene,
+      previous,
+      current,
+      next,
+      overlayScreenState
+    };
+  }, [activeOverlay, scenes, focusedIndex, routeKeys, routes]);
+  if (!overlayData) {
     return null;
   }
   const {
     scene,
-    overlayIndex
-  } = activeOverlay;
-  const previous = scenes[overlayIndex - 1]?.descriptor;
-  const current = scene.descriptor;
-  const next = scenes[overlayIndex + 1]?.descriptor;
-  return /*#__PURE__*/_jsx(KeysProvider, {
+    previous,
+    current,
+    next,
+    overlayScreenState
+  } = overlayData;
+  return /*#__PURE__*/_jsx(DescriptorsProvider, {
     current: current,
     previous: previous,
     next: next,
-    children: /*#__PURE__*/_jsx(ScreenStylesProvider, {
-      children: /*#__PURE__*/_jsx(OverlayHost, {
-        scene: scene
+    children: /*#__PURE__*/_jsx(ScreenAnimationProvider, {
+      children: /*#__PURE__*/_jsx(ScreenStylesProvider, {
+        children: /*#__PURE__*/_jsx(OverlayHost, {
+          scene: scene,
+          overlayScreenState: overlayScreenState
+        })
       })
     })
   });

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

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useStack","KeysProvider","ScreenStylesProvider","getActiveFloatOverlay","OverlayHost","jsx","_jsx","FloatOverlay","scenes","focusedIndex","flags","activeOverlay","TRANSITIONS_ALWAYS_ON","scene","overlayIndex","previous","descriptor","current","next","children"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/float-overlay.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,QAAQ,QAAQ,qCAAqC;AAC9D,SAASC,YAAY,QAAQ,yCAAyC;AACtE,SAASC,oBAAoB,QAAQ,2CAA2C;AAChF,SAASC,qBAAqB,QAAQ,+BAA+B;AACrE,SAASC,WAAW,QAAQ,gBAAgB;;AAE5C;AACA;AACA;AACA;AAHA,SAAAC,GAAA,IAAAC,IAAA;AAIA,OAAO,SAASC,YAAYA,CAAA,EAAG;EAC9B,MAAM;IAAEC,MAAM;IAAEC,YAAY;IAAEC;EAAM,CAAC,GAAGV,QAAQ,CAAC,CAAC;EAElD,MAAMW,aAAa,GAAGZ,OAAO,CAC5B,MACCI,qBAAqB,CAACK,MAAM,EAAEC,YAAY,EAAEC,KAAK,CAACE,qBAAqB,CAAC,EACzE,CAACJ,MAAM,EAAEC,YAAY,EAAEC,KAAK,CAACE,qBAAqB,CACnD,CAAC;EAED,IAAI,CAACD,aAAa,EAAE;IACnB,OAAO,IAAI;EACZ;EAEA,MAAM;IAAEE,KAAK;IAAEC;EAAa,CAAC,GAAGH,aAAa;EAE7C,MAAMI,QAAQ,GAAGP,MAAM,CAACM,YAAY,GAAG,CAAC,CAAC,EAAEE,UAAU;EACrD,MAAMC,OAAO,GAAGJ,KAAK,CAACG,UAAU;EAChC,MAAME,IAAI,GAAGV,MAAM,CAACM,YAAY,GAAG,CAAC,CAAC,EAAEE,UAAU;EAEjD,oBACCV,IAAA,CAACL,YAAY;IAACgB,OAAO,EAAEA,OAAQ;IAACF,QAAQ,EAAEA,QAAS;IAACG,IAAI,EAAEA,IAAK;IAAAC,QAAA,eAC9Db,IAAA,CAACJ,oBAAoB;MAAAiB,QAAA,eACpBb,IAAA,CAACF,WAAW;QAACS,KAAK,EAAEA;MAAM,CAAE;IAAC,CACR;EAAC,CACV,CAAC;AAEjB","ignoreList":[]}
+{"version":3,"names":["useMemo","snapDescriptorToIndex","useOptimisticFocusedIndex","useStack","ScreenAnimationProvider","DescriptorsProvider","ScreenStylesProvider","getActiveFloatOverlay","OverlayHost","jsx","_jsx","FloatOverlay","scenes","optimisticFocusedIndex","flags","routes","routeKeys","focusedIndex","length","activeOverlay","TRANSITIONS_ALWAYS_ON","overlayData","scene","overlayIndex","previous","descriptor","current","next","focusedScene","focusedDescriptor","overlayScreenState","index","indexOf","route","key","options","focusedRoute","meta","navigation","snapTo","children"],"sourceRoot":"../../../../../../src","sources":["shared/components/overlay/variations/float-overlay.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/components/overlay/variations/overlay-host.js

@@ -5,17 +5,16 @@ import { memo, useMemo } from "react";
 import { Animated, StyleSheet, useWindowDimensions, View } from "react-native";
 import { useDerivedValue } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useScreenAnimation } from "../../../hooks/animation/use-screen-animation";
-import { useScreenState } from "../../../hooks/navigation/use-screen-state";
+import { useScreenAnimation } from "../../../providers/screen/animation";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const OverlayHost = /*#__PURE__*/memo(function OverlayHost({
-  scene
+  scene,
+  overlayScreenState
 }) {
   const OverlayComponent = scene.descriptor.options.overlay;
   const screen = useWindowDimensions();
   const insets = useSafeAreaInsets();
   const screenAnimation = useScreenAnimation();
-  const screenState = useScreenState();
   const relativeProgress = useDerivedValue(() => {
     "worklet";
 
@@ -29,12 +28,13 @@ export const OverlayHost = /*#__PURE__*/memo(function OverlayHost({
     insets
   }));
   const overlayProps = useMemo(() => ({
-    ...screenState,
+    ...overlayScreenState,
     progress: relativeProgress,
+    /**@deprecated */
     overlayAnimation,
-    //Deprecated
-    screenAnimation //Deprecated
-  }), [relativeProgress, overlayAnimation, screenAnimation, screenState]);
+    /**@deprecated */
+    screenAnimation
+  }), [relativeProgress, overlayAnimation, screenAnimation, overlayScreenState]);
   if (!OverlayComponent) {
     return null;
   }