react-native-screen-transitions 3.3.0-beta.2 → 3.3.0-beta.4

package/lib/module/shared/animation/snap-to.js

@@ -1,10 +1,12 @@
 "use strict";
 
+/** biome-ignore-all lint/style/noNonNullAssertion: <Options always exist> */
 import { runOnUI } from "react-native-reanimated";
 import { DefaultSnapSpec } from "../configs/specs";
 import { AnimationStore } from "../stores/animation.store";
 import { HistoryStore } from "../stores/history.store";
 import { animateToProgress } from "../utils/animation/animate-to-progress";
+import { logger } from "../utils/logger";
 
 /**
  * Programmatically snap the currently focused screen to a specific snap point.
@@ -23,22 +25,26 @@ import { animateToProgress } from "../utils/animation/animate-to-progress";
  * ```
  */
 export function snapTo(index) {
-  const recent = HistoryStore.getMostRecent();
-  if (!recent) {
-    console.warn("snapTo: No screen in history");
+  // Find the most recent screen that has snapPoints defined.
+  // This handles cases where parent screens (e.g., expo-router) register after
+  // ComponentStack screens, but the ComponentStack is what we want to snap.
+  const allHistory = HistoryStore.toArray();
+  const screenWithSnapPoints = allHistory.filter(entry => {
+    const sp = entry.descriptor.options?.snapPoints;
+    return sp && sp.length > 0;
+  }).pop(); // Last item is most recent (toArray returns oldest-first)
+
+  if (!screenWithSnapPoints) {
+    logger.warn("snapTo: No screens with snapPoints in history");
     return;
   }
   const {
     descriptor
-  } = recent;
-  const snapPoints = descriptor.options?.snapPoints;
-  if (!snapPoints || snapPoints.length === 0) {
-    console.warn("snapTo: No snapPoints defined on current screen");
-    return;
-  }
+  } = screenWithSnapPoints;
+  const snapPoints = descriptor.options.snapPoints;
   const sorted = [...snapPoints].sort((a, b) => a - b);
   if (index < 0 || index >= sorted.length) {
-    console.warn(`snapTo: index ${index} out of bounds (0-${sorted.length - 1})`);
+    logger.warn(`snapTo: index ${index} out of bounds (0-${sorted.length - 1})`);
     return;
   }
   const targetProgress = sorted[index];

package/lib/module/shared/animation/snap-to.js.map

@@ -1 +1 @@
-{"version":3,"names":["runOnUI","DefaultSnapSpec","AnimationStore","HistoryStore","animateToProgress","snapTo","index","recent","getMostRecent","console","warn","descriptor","snapPoints","options","length","sorted","sort","a","b","targetProgress","animations","getAll","route","key","target","spec","open","transitionSpec","expand","close","collapse"],"sourceRoot":"../../../../src","sources":["shared/animation/snap-to.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,yBAAyB;AACjD,SAASC,eAAe,QAAQ,kBAAkB;AAClD,SAASC,cAAc,QAAQ,2BAA2B;AAC1D,SAASC,YAAY,QAAQ,yBAAyB;AACtD,SAASC,iBAAiB,QAAQ,wCAAwC;;AAE1E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAACC,KAAa,EAAQ;EAC3C,MAAMC,MAAM,GAAGJ,YAAY,CAACK,aAAa,CAAC,CAAC;EAE3C,IAAI,CAACD,MAAM,EAAE;IACZE,OAAO,CAACC,IAAI,CAAC,8BAA8B,CAAC;IAC5C;EACD;EAEA,MAAM;IAAEC;EAAW,CAAC,GAAGJ,MAAM;EAC7B,MAAMK,UAAU,GAAGD,UAAU,CAACE,OAAO,EAAED,UAAU;EAEjD,IAAI,CAACA,UAAU,IAAIA,UAAU,CAACE,MAAM,KAAK,CAAC,EAAE;IAC3CL,OAAO,CAACC,IAAI,CAAC,iDAAiD,CAAC;IAC/D;EACD;EAEA,MAAMK,MAAM,GAAG,CAAC,GAAGH,UAAU,CAAC,CAACI,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKD,CAAC,GAAGC,CAAC,CAAC;EAEpD,IAAIZ,KAAK,GAAG,CAAC,IAAIA,KAAK,IAAIS,MAAM,CAACD,MAAM,EAAE;IACxCL,OAAO,CAACC,IAAI,CACX,iBAAiBJ,KAAK,qBAAqBS,MAAM,CAACD,MAAM,GAAG,CAAC,GAC7D,CAAC;IACD;EACD;EAEA,MAAMK,cAAc,GAAGJ,MAAM,CAACT,KAAK,CAAC;EACpC,MAAMc,UAAU,GAAGlB,cAAc,CAACmB,MAAM,CAACV,UAAU,CAACW,KAAK,CAACC,GAAG,CAAC;EAE9DvB,OAAO,CAAC,MAAM;IACb,SAAS;;IACTI,iBAAiB,CAAC;MACjBoB,MAAM,EAAEL,cAAc;MACtBC,UAAU;MACVK,IAAI,EAAE;QACLC,IAAI,EAAEf,UAAU,CAACE,OAAO,CAACc,cAAc,EAAEC,MAAM,IAAI3B,eAAe;QAClE4B,KAAK,EAAElB,UAAU,CAACE,OAAO,CAACc,cAAc,EAAEG,QAAQ,IAAI7B;MACvD;IACD,CAAC,CAAC;EACH,CAAC,CAAC,CAAC,CAAC;AACL","ignoreList":[]}
+{"version":3,"names":["runOnUI","DefaultSnapSpec","AnimationStore","HistoryStore","animateToProgress","logger","snapTo","index","allHistory","toArray","screenWithSnapPoints","filter","entry","sp","descriptor","options","snapPoints","length","pop","warn","sorted","sort","a","b","targetProgress","animations","getAll","route","key","target","spec","open","transitionSpec","expand","close","collapse"],"sourceRoot":"../../../../src","sources":["shared/animation/snap-to.ts"],"mappings":";;AAAA;AACA,SAASA,OAAO,QAAQ,yBAAyB;AACjD,SAASC,eAAe,QAAQ,kBAAkB;AAClD,SAASC,cAAc,QAAQ,2BAA2B;AAC1D,SAASC,YAAY,QAAQ,yBAAyB;AACtD,SAASC,iBAAiB,QAAQ,wCAAwC;AAC1E,SAASC,MAAM,QAAQ,iBAAiB;;AAExC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,MAAMA,CAACC,KAAa,EAAQ;EAC3C;EACA;EACA;EACA,MAAMC,UAAU,GAAGL,YAAY,CAACM,OAAO,CAAC,CAAC;EACzC,MAAMC,oBAAoB,GAAGF,UAAU,CACrCG,MAAM,CAAEC,KAAK,IAAK;IAClB,MAAMC,EAAE,GAAGD,KAAK,CAACE,UAAU,CAACC,OAAO,EAAEC,UAAU;IAC/C,OAAOH,EAAE,IAAIA,EAAE,CAACI,MAAM,GAAG,CAAC;EAC3B,CAAC,CAAC,CACDC,GAAG,CAAC,CAAC,CAAC,CAAC;;EAET,IAAI,CAACR,oBAAoB,EAAE;IAC1BL,MAAM,CAACc,IAAI,CAAC,+CAA+C,CAAC;IAC5D;EACD;EAEA,MAAM;IAAEL;EAAW,CAAC,GAAGJ,oBAAoB;EAC3C,MAAMM,UAAU,GAAGF,UAAU,CAACC,OAAO,CAAEC,UAAW;EAElD,MAAMI,MAAM,GAAG,CAAC,GAAGJ,UAAU,CAAC,CAACK,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKD,CAAC,GAAGC,CAAC,CAAC;EAEpD,IAAIhB,KAAK,GAAG,CAAC,IAAIA,KAAK,IAAIa,MAAM,CAACH,MAAM,EAAE;IACxCZ,MAAM,CAACc,IAAI,CACV,iBAAiBZ,KAAK,qBAAqBa,MAAM,CAACH,MAAM,GAAG,CAAC,GAC7D,CAAC;IACD;EACD;EAEA,MAAMO,cAAc,GAAGJ,MAAM,CAACb,KAAK,CAAC;EACpC,MAAMkB,UAAU,GAAGvB,cAAc,CAACwB,MAAM,CAACZ,UAAU,CAACa,KAAK,CAACC,GAAG,CAAC;EAE9D5B,OAAO,CAAC,MAAM;IACb,SAAS;;IACTI,iBAAiB,CAAC;MACjByB,MAAM,EAAEL,cAAc;MACtBC,UAAU;MACVK,IAAI,EAAE;QACLC,IAAI,EAAEjB,UAAU,CAACC,OAAO,CAACiB,cAAc,EAAEC,MAAM,IAAIhC,eAAe;QAClEiC,KAAK,EAAEpB,UAAU,CAACC,OAAO,CAACiB,cAAc,EAAEG,QAAQ,IAAIlC;MACvD;IACD,CAAC,CAAC;EACH,CAAC,CAAC,CAAC,CAAC;AACL","ignoreList":[]}

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

@@ -7,7 +7,6 @@ import { GestureDetector } from "react-native-gesture-handler";
 import Animated, { runOnUI, useAnimatedRef } from "react-native-reanimated";
 import { useAssociatedStyles } from "../hooks/animation/use-associated-style";
 import { useScrollRegistry } from "../hooks/gestures/use-scroll-registry";
-import { useGestureContext } from "../providers/gestures.provider";
 import { RegisterBoundsProvider } from "../providers/register-bounds.provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function createTransitionAwareComponent(Wrapped, options = {}) {
@@ -16,34 +15,37 @@ export function createTransitionAwareComponent(Wrapped, options = {}) {
   } = options;
   const AnimatedComponent = Animated.createAnimatedComponent(Wrapped);
   const ScrollableInner = /*#__PURE__*/forwardRef((props, ref) => {
-    const {
-      nativeGesture
-    } = useGestureContext();
+    // Determine scroll direction from the horizontal prop (standard ScrollView API)
+    const scrollDirection = props.horizontal ? "horizontal" : "vertical";
+
+    // Get scroll handlers and the gesture owner's nativeGesture for this axis
     const {
       scrollHandler,
       onContentSizeChange,
       onLayout,
-      onTouchStart,
-      onTouchEnd
+      nativeGesture
     } = useScrollRegistry({
       onScroll: props.onScroll,
       onContentSizeChange: props.onContentSizeChange,
       onLayout: props.onLayout,
-      onTouchStart: props.onTouchStart,
-      onTouchEnd: props.onTouchEnd
+      direction: scrollDirection
     });
+    const scrollableComponent = /*#__PURE__*/_jsx(AnimatedComponent, {
+      ...props,
+      ref: ref,
+      onScroll: scrollHandler,
+      onContentSizeChange: onContentSizeChange,
+      onLayout: onLayout,
+      scrollEventThrottle: props.scrollEventThrottle || 16
+    });
+
+    // If no gesture owner found for this axis, render without GestureDetector
+    if (!nativeGesture) {
+      return scrollableComponent;
+    }
     return /*#__PURE__*/_jsx(GestureDetector, {
       gesture: nativeGesture,
-      children: /*#__PURE__*/_jsx(AnimatedComponent, {
-        ...props,
-        ref: ref,
-        onScroll: scrollHandler,
-        onContentSizeChange: onContentSizeChange,
-        onLayout: onLayout,
-        onTouchStart: onTouchStart,
-        onTouchEnd: onTouchEnd,
-        scrollEventThrottle: props.scrollEventThrottle || 16
-      })
+      children: scrollableComponent
     });
   });
   const Inner = /*#__PURE__*/forwardRef((props, _) => {

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","memo","GestureDetector","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useScrollRegistry","useGestureContext","RegisterBoundsProvider","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","nativeGesture","scrollHandler","onContentSizeChange","onLayout","onTouchStart","onTouchEnd","onScroll","gesture","children","scrollEventThrottle","Inner","_","style","sharedBoundTag","styleId","onPress","rest","animatedRef","associatedStyles","id","captureActiveOnPress","handleInitialLayout","collapsable"],"sourceRoot":"../../../../src","sources":["shared/components/create-transition-aware-component.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["forwardRef","memo","GestureDetector","Animated","runOnUI","useAnimatedRef","useAssociatedStyles","useScrollRegistry","RegisterBoundsProvider","jsx","_jsx","createTransitionAwareComponent","Wrapped","options","isScrollable","AnimatedComponent","createAnimatedComponent","ScrollableInner","props","ref","scrollDirection","horizontal","scrollHandler","onContentSizeChange","onLayout","nativeGesture","onScroll","direction","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":"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","ignoreList":[]}

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

@@ -1,13 +1,21 @@
 "use strict";
 
+/** biome-ignore-all lint/style/noNonNullAssertion: <Screen gesture is under the gesture context, so this will always exist.> */
 import { StackActions } from "@react-navigation/native";
 import { memo, useCallback } from "react";
 import { Pressable, StyleSheet, View } from "react-native";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { GestureDetector } from "react-native-gesture-handler";
+import Animated, { runOnUI, useAnimatedStyle } from "react-native-reanimated";
+import { DefaultSnapSpec } from "../configs/specs";
 import { NO_STYLES } from "../constants";
 import { useBackdropPointerEvents } from "../hooks/use-backdrop-pointer-events";
+import { useGestureContext } from "../providers/gestures.provider";
 import { useKeys } from "../providers/screen/keys.provider";
 import { useScreenStyles } from "../providers/screen/styles.provider";
+import { AnimationStore } from "../stores/animation.store";
+import { GestureStore } from "../stores/gesture.store";
+import { animateToProgress } from "../utils/animation/animate-to-progress";
+import { findCollapseTarget } from "../utils/gesture/find-collapse-target";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const ScreenContainer = /*#__PURE__*/memo(({
   children
@@ -22,10 +30,57 @@ export const ScreenContainer = /*#__PURE__*/memo(({
     pointerEvents,
     backdropBehavior
   } = useBackdropPointerEvents();
-  const isDismissable = backdropBehavior === "dismiss";
+  const gestureContext = useGestureContext();
+  const isBackdropActive = backdropBehavior === "dismiss" || backdropBehavior === "collapse";
+  const handleDismiss = useCallback(() => {
+    const state = current.navigation.getState();
+    current.navigation.dispatch({
+      ...StackActions.pop(),
+      source: current.route.key,
+      target: state.key
+    });
+  }, [current]);
   const handleBackdropPress = useCallback(() => {
-    current.navigation.dispatch(StackActions.pop());
-  }, [current.navigation]);
+    if (backdropBehavior === "dismiss") {
+      handleDismiss();
+      return;
+    }
+    if (backdropBehavior === "collapse") {
+      const snapPoints = current.options.snapPoints;
+      const canDismiss = current.options.gestureEnabled !== false;
+
+      // No snap points → fallback to dismiss
+      if (!snapPoints || snapPoints.length === 0) {
+        handleDismiss();
+        return;
+      }
+      const animations = AnimationStore.getAll(current.route.key);
+      const gestures = GestureStore.getRouteGestures(current.route.key);
+      const transitionSpec = current.options.transitionSpec;
+      runOnUI(() => {
+        "worklet";
+
+        const {
+          target,
+          shouldDismiss
+        } = findCollapseTarget(animations.progress.value, snapPoints, canDismiss);
+
+        // If already dismissing, skip
+        if (gestures.isDismissing.value) return;
+        gestures.isDismissing.value = shouldDismiss ? 1 : 0;
+        const spec = shouldDismiss ? transitionSpec : {
+          open: transitionSpec?.expand ?? DefaultSnapSpec,
+          close: transitionSpec?.collapse ?? DefaultSnapSpec
+        };
+        animateToProgress({
+          target,
+          spec,
+          animations,
+          onAnimationFinish: shouldDismiss ? handleDismiss : undefined
+        });
+      })();
+    }
+  }, [backdropBehavior, current, handleDismiss]);
   const animatedContentStyle = useAnimatedStyle(() => {
     "worklet";
 
@@ -41,15 +96,18 @@ export const ScreenContainer = /*#__PURE__*/memo(({
     pointerEvents: pointerEvents,
     children: [/*#__PURE__*/_jsx(Pressable, {
       style: StyleSheet.absoluteFillObject,
-      pointerEvents: isDismissable ? "auto" : "none",
-      onPress: isDismissable ? handleBackdropPress : undefined,
+      pointerEvents: isBackdropActive ? "auto" : "none",
+      onPress: isBackdropActive ? handleBackdropPress : undefined,
       children: /*#__PURE__*/_jsx(Animated.View, {
         style: [StyleSheet.absoluteFillObject, animatedBackdropStyle]
       })
-    }), /*#__PURE__*/_jsx(Animated.View, {
-      style: [styles.content, animatedContentStyle],
-      pointerEvents: isDismissable ? "box-none" : pointerEvents,
-      children: children
+    }), /*#__PURE__*/_jsx(GestureDetector, {
+      gesture: gestureContext.panGesture,
+      children: /*#__PURE__*/_jsx(Animated.View, {
+        style: [styles.content, animatedContentStyle],
+        pointerEvents: isBackdropActive ? "box-none" : pointerEvents,
+        children: children
+      })
     })]
   });
 });

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

@@ -1 +1 @@
-{"version":3,"names":["StackActions","memo","useCallback","Pressable","StyleSheet","View","Animated","useAnimatedStyle","NO_STYLES","useBackdropPointerEvents","useKeys","useScreenStyles","jsx","_jsx","jsxs","_jsxs","ScreenContainer","children","stylesMap","current","pointerEvents","backdropBehavior","isDismissable","handleBackdropPress","navigation","dispatch","pop","animatedContentStyle","value","contentStyle","animatedBackdropStyle","backdropStyle","overlayStyle","style","styles","container","absoluteFillObject","onPress","undefined","content","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/screen-container.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,0BAA0B;AACvD,SAASC,IAAI,EAAEC,WAAW,QAAQ,OAAO;AACzC,SAASC,SAAS,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC1D,OAAOC,QAAQ,IAAIC,gBAAgB,QAAQ,yBAAyB;AACpE,SAASC,SAAS,QAAQ,cAAc;AACxC,SAASC,wBAAwB,QAAQ,sCAAsC;AAC/E,SAASC,OAAO,QAAQ,mCAAmC;AAC3D,SAASC,eAAe,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAMtE,OAAO,MAAMC,eAAe,gBAAGf,IAAI,CAAC,CAAC;EAAEgB;AAAgB,CAAC,KAAK;EAC5D,MAAM;IAAEC;EAAU,CAAC,GAAGP,eAAe,CAAC,CAAC;EACvC,MAAM;IAAEQ;EAAQ,CAAC,GAAGT,OAAO,CAAC,CAAC;EAC7B,MAAM;IAAEU,aAAa;IAAEC;EAAiB,CAAC,GAAGZ,wBAAwB,CAAC,CAAC;EAEtE,MAAMa,aAAa,GAAGD,gBAAgB,KAAK,SAAS;EAEpD,MAAME,mBAAmB,GAAGrB,WAAW,CAAC,MAAM;IAC7CiB,OAAO,CAACK,UAAU,CAACC,QAAQ,CAACzB,YAAY,CAAC0B,GAAG,CAAC,CAAC,CAAC;EAChD,CAAC,EAAE,CAACP,OAAO,CAACK,UAAU,CAAC,CAAC;EAExB,MAAMG,oBAAoB,GAAGpB,gBAAgB,CAAC,MAAM;IACnD,SAAS;;IACT,OAAOW,SAAS,CAACU,KAAK,CAACC,YAAY,IAAIrB,SAAS;EACjD,CAAC,CAAC;EAEF,MAAMsB,qBAAqB,GAAGvB,gBAAgB,CAAC,MAAM;IACpD,SAAS;;IACT,OACCW,SAAS,CAACU,KAAK,CAACG,aAAa,IAAIb,SAAS,CAACU,KAAK,CAACI,YAAY,IAAIxB,SAAS;EAE5E,CAAC,CAAC;EAEF,oBACCO,KAAA,CAACV,IAAI;IAAC4B,KAAK,EAAEC,MAAM,CAACC,SAAU;IAACf,aAAa,EAAEA,aAAc;IAAAH,QAAA,gBAC3DJ,IAAA,CAACV,SAAS;MACT8B,KAAK,EAAE7B,UAAU,CAACgC,kBAAmB;MACrChB,aAAa,EAAEE,aAAa,GAAG,MAAM,GAAG,MAAO;MAC/Ce,OAAO,EAAEf,aAAa,GAAGC,mBAAmB,GAAGe,SAAU;MAAArB,QAAA,eAEzDJ,IAAA,CAACP,QAAQ,CAACD,IAAI;QACb4B,KAAK,EAAE,CAAC7B,UAAU,CAACgC,kBAAkB,EAAEN,qBAAqB;MAAE,CAC9D;IAAC,CACQ,CAAC,eACZjB,IAAA,CAACP,QAAQ,CAACD,IAAI;MACb4B,KAAK,EAAE,CAACC,MAAM,CAACK,OAAO,EAAEZ,oBAAoB,CAAE;MAC9CP,aAAa,EAAEE,aAAa,GAAG,UAAU,GAAGF,aAAc;MAAAH,QAAA,EAEzDA;IAAQ,CACK,CAAC;EAAA,CACX,CAAC;AAET,CAAC,CAAC;AAEF,MAAMiB,MAAM,GAAG9B,UAAU,CAACoC,MAAM,CAAC;EAChCL,SAAS,EAAE;IACVM,IAAI,EAAE;EACP,CAAC;EACDF,OAAO,EAAE;IACRE,IAAI,EAAE;EACP;AACD,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["StackActions","memo","useCallback","Pressable","StyleSheet","View","GestureDetector","Animated","runOnUI","useAnimatedStyle","DefaultSnapSpec","NO_STYLES","useBackdropPointerEvents","useGestureContext","useKeys","useScreenStyles","AnimationStore","GestureStore","animateToProgress","findCollapseTarget","jsx","_jsx","jsxs","_jsxs","ScreenContainer","children","stylesMap","current","pointerEvents","backdropBehavior","gestureContext","isBackdropActive","handleDismiss","state","navigation","getState","dispatch","pop","source","route","key","target","handleBackdropPress","snapPoints","options","canDismiss","gestureEnabled","length","animations","getAll","gestures","getRouteGestures","transitionSpec","shouldDismiss","progress","value","isDismissing","spec","open","expand","close","collapse","onAnimationFinish","undefined","animatedContentStyle","contentStyle","animatedBackdropStyle","backdropStyle","overlayStyle","style","styles","container","absoluteFillObject","onPress","gesture","panGesture","content","create","flex"],"sourceRoot":"../../../../src","sources":["shared/components/screen-container.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/constants.js

@@ -84,6 +84,7 @@ export const FULLSCREEN_DIMENSIONS = dimensions => {
  * Default gesture config
  */
 export const GESTURE_VELOCITY_IMPACT = 0.3;
+export const SNAP_VELOCITY_IMPACT = 0.1;
 export const DEFAULT_GESTURE_DIRECTION = "horizontal";
 export const DEFAULT_GESTURE_DRIVES_PROGRESS = true;
 export const DEFAULT_GESTURE_ACTIVATION_AREA = "screen";
@@ -95,4 +96,10 @@ export const FALSE = 0;
  * Small value for floating-point comparisons to handle animation/interpolation imprecision
  */
 export const EPSILON = 1e-5;
+
+/**
+ * Threshold for snapping animations to target when "close enough" (1% of range).
+ * Prevents micro-jitter/oscillation near animation endpoints.
+ */
+export const ANIMATION_SNAP_THRESHOLD = 0.01;
 //# sourceMappingURL=constants.js.map

package/lib/module/shared/constants.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","MASK_STYLE_ID","CONTAINER_STYLE_ID","NO_STYLES","Object","freeze","DEFAULT_GESTURE_VALUES","x","y","normalizedX","normalizedY","isDismissing","isDragging","direction","createScreenTransitionState","route","meta","progress","closing","animating","entering","gesture","DEFAULT_SCREEN_TRANSITION_STATE","EMPTY_BOUND_HELPER_RESULT","EMPTY_BOUND_HELPER_RESULT_RAW","scaleX","scaleY","scale","translateX","translateY","width","height","ENTER_RANGE","EXIT_RANGE","FULLSCREEN_DIMENSIONS","dimensions","pageX","pageY","GESTURE_VELOCITY_IMPACT","DEFAULT_GESTURE_DIRECTION","DEFAULT_GESTURE_DRIVES_PROGRESS","DEFAULT_GESTURE_ACTIVATION_AREA","IS_WEB","OS","TRUE","FALSE","EPSILON"],"sourceRoot":"../../../src","sources":["shared/constants.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,cAAc;AAOvC;AACA;AACA;AACA,OAAO,MAAMC,aAAa,GAAG,cAAc;AAC3C,OAAO,MAAMC,kBAAkB,GAAG,iBAAiB;;AAEnD;AACA;AACA;AACA,OAAO,MAAMC,SAAS,GAAGC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,CAAC;;AAE1C;AACA;AACA;AACA,MAAMC,sBAAsB,GAAG;EAC9BC,CAAC,EAAE,CAAC;EACJC,CAAC,EAAE,CAAC;EACJC,WAAW,EAAE,CAAC;EACdC,WAAW,EAAE,CAAC;EACdC,YAAY,EAAE,CAAC;EACfC,UAAU,EAAE,CAAC;EACbC,SAAS,EAAE;AACZ,CAAU;;AAEV;AACA;AACA;AACA,OAAO,MAAMC,2BAA2B,GAAGA,CAC1CC,KAAqB,EACrBC,IAA8B,MACF;EAC5BC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE,CAAC;EACVC,SAAS,EAAE,CAAC;EACZC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE;IAAE,GAAGf;EAAuB,CAAC;EACtCS,KAAK;EACLC;AACD,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMM,+BAAsD,GAClElB,MAAM,CAACC,MAAM,CAAC;EACbY,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE,CAAC;EACVC,SAAS,EAAE,CAAC;EACZC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAEf,sBAAsB;EAC/BS,KAAK,EAAE,CAAC;AACT,CAAC,CAAC;;AAEH;AACA;AACA;AACA,OAAO,MAAMQ,yBAAyB,GAAGnB,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC1D,OAAO,MAAMmB,6BAA6B,GAAGpB,MAAM,CAACC,MAAM,CAAC;EAC1DoB,MAAM,EAAE,CAAC;EACTC,MAAM,EAAE,CAAC;EACTC,KAAK,EAAE,CAAC;EACRC,UAAU,EAAE,CAAC;EACbC,UAAU,EAAE,CAAC;EACbC,KAAK,EAAE,CAAC;EACRC,MAAM,EAAE;AACT,CAAC,CAAC;AACF,OAAO,MAAMC,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,CAAU;AAC1C,OAAO,MAAMC,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC,CAAU;AAEzC,OAAO,MAAMC,qBAAqB,GACjCC,UAAkB,IACM;EACxB,SAAS;;EACT,OAAO;IACN5B,CAAC,EAAE,CAAC;IACJC,CAAC,EAAE,CAAC;IACJ4B,KAAK,EAAE,CAAC;IACRC,KAAK,EAAE,CAAC;IACRP,KAAK,EAAEK,UAAU,CAACL,KAAK;IACvBC,MAAM,EAAEI,UAAU,CAACJ;EACpB,CAAC;AACF,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMO,uBAAuB,GAAG,GAAG;AAC1C,OAAO,MAAMC,yBAAyB,GAAG,YAAY;AACrD,OAAO,MAAMC,+BAA+B,GAAG,IAAI;AACnD,OAAO,MAAMC,+BAA+C,GAAG,QAAQ;AAEvE,OAAO,MAAMC,MAAM,GAAG1C,QAAQ,CAAC2C,EAAE,KAAK,KAAK;AAE3C,OAAO,MAAMC,IAAI,GAAG,CAAC;AACrB,OAAO,MAAMC,KAAK,GAAG,CAAC;;AAEtB;AACA;AACA;AACA,OAAO,MAAMC,OAAO,GAAG,IAAI","ignoreList":[]}
+{"version":3,"names":["Platform","MASK_STYLE_ID","CONTAINER_STYLE_ID","NO_STYLES","Object","freeze","DEFAULT_GESTURE_VALUES","x","y","normalizedX","normalizedY","isDismissing","isDragging","direction","createScreenTransitionState","route","meta","progress","closing","animating","entering","gesture","DEFAULT_SCREEN_TRANSITION_STATE","EMPTY_BOUND_HELPER_RESULT","EMPTY_BOUND_HELPER_RESULT_RAW","scaleX","scaleY","scale","translateX","translateY","width","height","ENTER_RANGE","EXIT_RANGE","FULLSCREEN_DIMENSIONS","dimensions","pageX","pageY","GESTURE_VELOCITY_IMPACT","SNAP_VELOCITY_IMPACT","DEFAULT_GESTURE_DIRECTION","DEFAULT_GESTURE_DRIVES_PROGRESS","DEFAULT_GESTURE_ACTIVATION_AREA","IS_WEB","OS","TRUE","FALSE","EPSILON","ANIMATION_SNAP_THRESHOLD"],"sourceRoot":"../../../src","sources":["shared/constants.ts"],"mappings":";;AACA,SAASA,QAAQ,QAAQ,cAAc;AAOvC;AACA;AACA;AACA,OAAO,MAAMC,aAAa,GAAG,cAAc;AAC3C,OAAO,MAAMC,kBAAkB,GAAG,iBAAiB;;AAEnD;AACA;AACA;AACA,OAAO,MAAMC,SAAS,GAAGC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,CAAC;;AAE1C;AACA;AACA;AACA,MAAMC,sBAAsB,GAAG;EAC9BC,CAAC,EAAE,CAAC;EACJC,CAAC,EAAE,CAAC;EACJC,WAAW,EAAE,CAAC;EACdC,WAAW,EAAE,CAAC;EACdC,YAAY,EAAE,CAAC;EACfC,UAAU,EAAE,CAAC;EACbC,SAAS,EAAE;AACZ,CAAU;;AAEV;AACA;AACA;AACA,OAAO,MAAMC,2BAA2B,GAAGA,CAC1CC,KAAqB,EACrBC,IAA8B,MACF;EAC5BC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE,CAAC;EACVC,SAAS,EAAE,CAAC;EACZC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE;IAAE,GAAGf;EAAuB,CAAC;EACtCS,KAAK;EACLC;AACD,CAAC,CAAC;;AAEF;AACA;AACA;AACA,OAAO,MAAMM,+BAAsD,GAClElB,MAAM,CAACC,MAAM,CAAC;EACbY,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAE,CAAC;EACVC,SAAS,EAAE,CAAC;EACZC,QAAQ,EAAE,CAAC;EACXC,OAAO,EAAEf,sBAAsB;EAC/BS,KAAK,EAAE,CAAC;AACT,CAAC,CAAC;;AAEH;AACA;AACA;AACA,OAAO,MAAMQ,yBAAyB,GAAGnB,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC1D,OAAO,MAAMmB,6BAA6B,GAAGpB,MAAM,CAACC,MAAM,CAAC;EAC1DoB,MAAM,EAAE,CAAC;EACTC,MAAM,EAAE,CAAC;EACTC,KAAK,EAAE,CAAC;EACRC,UAAU,EAAE,CAAC;EACbC,UAAU,EAAE,CAAC;EACbC,KAAK,EAAE,CAAC;EACRC,MAAM,EAAE;AACT,CAAC,CAAC;AACF,OAAO,MAAMC,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,CAAU;AAC1C,OAAO,MAAMC,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC,CAAU;AAEzC,OAAO,MAAMC,qBAAqB,GACjCC,UAAkB,IACM;EACxB,SAAS;;EACT,OAAO;IACN5B,CAAC,EAAE,CAAC;IACJC,CAAC,EAAE,CAAC;IACJ4B,KAAK,EAAE,CAAC;IACRC,KAAK,EAAE,CAAC;IACRP,KAAK,EAAEK,UAAU,CAACL,KAAK;IACvBC,MAAM,EAAEI,UAAU,CAACJ;EACpB,CAAC;AACF,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMO,uBAAuB,GAAG,GAAG;AAC1C,OAAO,MAAMC,oBAAoB,GAAG,GAAG;AACvC,OAAO,MAAMC,yBAAyB,GAAG,YAAY;AACrD,OAAO,MAAMC,+BAA+B,GAAG,IAAI;AACnD,OAAO,MAAMC,+BAA+C,GAAG,QAAQ;AAEvE,OAAO,MAAMC,MAAM,GAAG3C,QAAQ,CAAC4C,EAAE,KAAK,KAAK;AAE3C,OAAO,MAAMC,IAAI,GAAG,CAAC;AACrB,OAAO,MAAMC,KAAK,GAAG,CAAC;;AAEtB;AACA;AACA;AACA,OAAO,MAAMC,OAAO,GAAG,IAAI;;AAE3B;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAG,IAAI","ignoreList":[]}

package/lib/module/shared/hooks/gestures/use-build-gestures.js

@@ -5,10 +5,43 @@ import { useCallback, useMemo, useRef } from "react";
 import { Gesture } from "react-native-gesture-handler";
 import { useKeys } from "../../providers/screen/keys.provider";
 import { GestureStore } from "../../stores/gesture.store";
+import { claimsAnyDirection } from "../../utils/gesture/compute-claimed-directions";
+import { resolveOwnership } from "../../utils/gesture/resolve-ownership";
 import { useScreenGestureHandlers } from "./use-screen-gesture-handlers";
+const DIRECTIONS = ["vertical", "vertical-inverted", "horizontal", "horizontal-inverted"];
+
+/**
+ * Finds ancestor pan gestures that we shadow (claim the same direction).
+ * Used to block ancestors when child claims priority.
+ */
+function findShadowedAncestorPanGestures(selfClaims, ancestorContext, isIsolated) {
+  const shadowedGestures = [];
+  let ancestor = ancestorContext;
+  while (ancestor) {
+    if (ancestor.isIsolated !== isIsolated) break;
+    const shadowsAncestor = DIRECTIONS.some(dir => selfClaims[dir] && ancestor?.claimedDirections?.[dir]);
+    if (shadowsAncestor && ancestor.panGesture) {
+      shadowedGestures.push(ancestor.panGesture);
+    }
+    ancestor = ancestor.ancestorContext;
+  }
+  return shadowedGestures;
+}
+/**
+ * Builds the Pan gesture for screen dismissal.
+ *
+ * Handles shadowing: when child claims same direction as ancestor,
+ * child's pan blocks ancestor's pan via `blocksExternalGesture()`.
+ *
+ * ScrollView coordination is handled separately by useScrollRegistry,
+ * which creates its own Native gesture per ScrollView.
+ */
 export const useBuildGestures = ({
   scrollConfig,
-  ancestorContext
+  ancestorContext,
+  claimedDirections,
+  childDirectionClaims,
+  isIsolated
 }) => {
   const {
     current
@@ -17,33 +50,21 @@ export const useBuildGestures = ({
   const isFirstScreen = useMemo(() => {
     return navState.routes.findIndex(r => r.key === current.route.key) === 0;
   }, [navState.routes, current.route.key]);
-
-  // Ref for external gesture coordination (e.g., swipeable lists)
   const panGestureRef = useRef(undefined);
   const gestureAnimationValues = GestureStore.getRouteGestures(current.route.key);
   const {
     snapPoints
   } = current.options;
-
-  // Dismiss gesture is controlled by gestureEnabled (disabled for first screen)
   const canDismiss = Boolean(isFirstScreen ? false : current.options.gestureEnabled);
-
-  // Snap navigation works independently - enabled when snap points exist
-  // This matches iOS native sheet behavior where gestureEnabled: false
-  // disables dismiss but you can still drag between detents
   const hasSnapPoints = Array.isArray(snapPoints) && snapPoints.length > 0;
   const gestureEnabled = canDismiss || hasSnapPoints;
+  const ownershipStatus = useMemo(() => resolveOwnership(claimedDirections, ancestorContext ?? null), [claimedDirections, ancestorContext]);
+  const selfClaimsAny = claimsAnyDirection(claimedDirections);
   const handleDismiss = useCallback(() => {
-    // If an ancestor navigator is already dismissing, skip this dismiss to
-    // avoid racing with the ancestor
-    if (ancestorContext?.gestureAnimationValues.isDismissing?.value) {
-      return;
-    }
+    if (ancestorContext?.gestureAnimationValues.isDismissing?.value) return;
     const state = current.navigation.getState();
     const routeStillPresent = state.routes.some(route => route.key === current.route.key);
-    if (!routeStillPresent) {
-      return;
-    }
+    if (!routeStillPresent) return;
     current.navigation.dispatch({
       ...StackActions.pop(),
       source: current.route.key,
@@ -60,38 +81,27 @@ export const useBuildGestures = ({
     scrollConfig,
     canDismiss,
     handleDismiss,
-    ancestorIsDismissing: ancestorContext?.gestureAnimationValues.isDismissing
+    ownershipStatus,
+    ancestorIsDismissing: ancestorContext?.gestureAnimationValues.isDismissing,
+    claimedDirections,
+    ancestorContext,
+    childDirectionClaims
   });
   return useMemo(() => {
     const panGesture = Gesture.Pan().withRef(panGestureRef).enabled(gestureEnabled).manualActivation(true).onTouchesDown(onTouchesDown).onTouchesMove(onTouchesMove).onStart(onStart).onUpdate(onUpdate).onEnd(onEnd);
 
-    // Native gesture setup depends on whether this screen has gestures
-    let nativeGesture;
-    if (gestureEnabled) {
-      // This screen has gestures - set up normal pan/native relationship
-      nativeGesture = Gesture.Native().requireExternalGestureToFail(panGesture);
-      panGesture.blocksExternalGesture(nativeGesture);
-    } else {
-      // This screen has no gestures
-      // Find nearest ancestor with gestureEnabled=true (attached pan)
-      let activePanAncestor = ancestorContext;
-      while (activePanAncestor && !activePanAncestor.gestureEnabled) {
-        activePanAncestor = activePanAncestor.ancestorContext;
-      }
-      if (activePanAncestor?.panGesture) {
-        // Found an ancestor with enabled pan - wait for it
-        nativeGesture = Gesture.Native().requireExternalGestureToFail(activePanAncestor.panGesture);
-      } else {
-        // No ancestor with enabled pan - plain native
-        nativeGesture = Gesture.Native();
+    // Block shadowed ancestor pan gestures when we claim same directions
+    if (selfClaimsAny) {
+      const shadowedAncestorGestures = findShadowedAncestorPanGestures(claimedDirections, ancestorContext, isIsolated);
+      for (const ancestorPan of shadowedAncestorGestures) {
+        panGesture.blocksExternalGesture(ancestorPan);
       }
     }
     return {
       panGesture,
       panGestureRef,
-      nativeGesture,
       gestureAnimationValues
     };
-  }, [gestureEnabled, onTouchesDown, onTouchesMove, onStart, onUpdate, onEnd, gestureAnimationValues, ancestorContext]);
+  }, [gestureEnabled, selfClaimsAny, claimedDirections, onTouchesDown, onTouchesMove, onStart, onUpdate, onEnd, gestureAnimationValues, ancestorContext, isIsolated]);
 };
 //# sourceMappingURL=use-build-gestures.js.map

package/lib/module/shared/hooks/gestures/use-build-gestures.js.map

@@ -1 +1 @@
-{"version":3,"names":["StackActions","useCallback","useMemo","useRef","Gesture","useKeys","GestureStore","useScreenGestureHandlers","useBuildGestures","scrollConfig","ancestorContext","current","navState","navigation","getState","isFirstScreen","routes","findIndex","r","key","route","panGestureRef","undefined","gestureAnimationValues","getRouteGestures","snapPoints","options","canDismiss","Boolean","gestureEnabled","hasSnapPoints","Array","isArray","length","handleDismiss","isDismissing","value","state","routeStillPresent","some","dispatch","pop","source","target","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","ancestorIsDismissing","panGesture","Pan","withRef","enabled","manualActivation","nativeGesture","Native","requireExternalGestureToFail","blocksExternalGesture","activePanAncestor"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-build-gestures.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["StackActions","useCallback","useMemo","useRef","Gesture","useKeys","GestureStore","claimsAnyDirection","resolveOwnership","useScreenGestureHandlers","DIRECTIONS","findShadowedAncestorPanGestures","selfClaims","ancestorContext","isIsolated","shadowedGestures","ancestor","shadowsAncestor","some","dir","claimedDirections","panGesture","push","useBuildGestures","scrollConfig","childDirectionClaims","current","navState","navigation","getState","isFirstScreen","routes","findIndex","r","key","route","panGestureRef","undefined","gestureAnimationValues","getRouteGestures","snapPoints","options","canDismiss","Boolean","gestureEnabled","hasSnapPoints","Array","isArray","length","ownershipStatus","selfClaimsAny","handleDismiss","isDismissing","value","state","routeStillPresent","dispatch","pop","source","target","onTouchesDown","onTouchesMove","onStart","onUpdate","onEnd","ancestorIsDismissing","Pan","withRef","enabled","manualActivation","shadowedAncestorGestures","ancestorPan","blocksExternalGesture"],"sourceRoot":"../../../../../src","sources":["shared/hooks/gestures/use-build-gestures.tsx"],"mappings":"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","ignoreList":[]}