react-native-screen-transitions 3.2.0 → 3.2.1

package/lib/commonjs/shared/providers/screen/styles.provider.js

@@ -22,48 +22,57 @@ function ScreenStylesProvider({
     currentInterpolator
   } = (0, _useScreenAnimation2._useScreenAnimation)();
 
-  // Track when a gesture is triggered while another screen is closing
-  const hasTriggeredGestureWhileInFlight = (0, _reactNativeReanimated.useSharedValue)(false);
+  /**
+   * Tracks when user starts a gesture while another screen is still closing.
+   * This persists until both the gesture ends AND the closing animation completes.
+   */
+  const isGesturingDuringCloseAnimation = (0, _reactNativeReanimated.useSharedValue)(false);
   const stylesMap = (0, _reactNativeReanimated.useDerivedValue)(() => {
     "worklet";
 
     const props = screenInterpolatorProps.value;
-    const bounds = (0, _bounds.createBounds)(props);
-
-    // Detect when user starts gesture on current screen while next screen is closing
-    if (props.current.gesture.isDragging && props.next?.closing) {
-      hasTriggeredGestureWhileInFlight.value = true;
+    const {
+      current,
+      next,
+      progress,
+      stackProgress
+    } = props;
+    const isDragging = current.gesture.isDragging;
+    const isNextClosing = !!next?.closing;
+    if (isDragging && isNextClosing) {
+      isGesturingDuringCloseAnimation.value = true;
     }
-
-    // Reset the flag when no longer dragging and next screen is done closing
-    if (!props.current.gesture.isDragging && !props.next?.closing && hasTriggeredGestureWhileInFlight.value) {
-      hasTriggeredGestureWhileInFlight.value = false;
+    if (!isDragging && !isNextClosing) {
+      isGesturingDuringCloseAnimation.value = false;
     }
+    const isInGestureMode = isDragging || isGesturingDuringCloseAnimation.value;
+    const hasPushedScreenWhileClosing = !isInGestureMode && isNextClosing && stackProgress > progress;
 
-    // Use current interpolator when gesture triggered while in-flight,
-    // otherwise use next interpolator if available (normal case)
-    const shouldUseCurrentInterpolator = props.current.gesture.isDragging || hasTriggeredGestureWhileInFlight.value;
-    const interpolator = shouldUseCurrentInterpolator ? currentInterpolator : nextInterpolator ?? currentInterpolator;
+    // Select interpolator
+    //  - If in gesture mode, use current screen's interpolator since we're driving
+    //    the animation from this screen (dragging back to dismiss next).
+    const interpolator = isInGestureMode ? currentInterpolator : nextInterpolator ?? currentInterpolator;
+    if (!interpolator) return _constants.NO_STYLES;
 
-    /**
-     * Maintainer Note:
-     * To avoid unnecessary jumps in off directions, we have to snap back to the currents progress.
-     * While this still introduces a 'snap back' animation, it's still very rare that a user would encounter this unless
-     * they're spamming things out. Not ideal, but this is the best way to go about dealing with fast rapid gestures.
-     *
-     * The alternative was preventing users from actually being able to drag back while animation was still in flight. But there was a significant delay
-     * when waiting for gestures to register again.
-     */
-    const effectiveProps = shouldUseCurrentInterpolator ? {
-      ...props,
-      progress: props.current.progress,
-      next: undefined
-    } : props;
+    // Build effective props with corrected progress
+    //  - Gesture mode: use current.progress only (avoids jumps during drag)
+    //  - Pushed while closing: use stackProgress (includes new screen)
+    //  - Normal: use derived progress as-is
+
+    let effectiveProgress = progress;
+    let effectiveNext = next;
+    if (isInGestureMode) {
+      effectiveProgress = current.progress;
+      effectiveNext = undefined;
+    } else if (hasPushedScreenWhileClosing) {
+      effectiveProgress = stackProgress;
+    }
     try {
-      if (!interpolator) return _constants.NO_STYLES;
       return interpolator({
-        ...effectiveProps,
-        bounds
+        ...props,
+        progress: effectiveProgress,
+        next: effectiveNext,
+        bounds: (0, _bounds.createBounds)(props)
       });
     } catch (err) {
       if (__DEV__) {

package/lib/commonjs/shared/providers/screen/styles.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNativeReanimated","_constants","_useScreenAnimation2","_bounds","_jsxRuntime","ScreenStylesContext","createContext","ScreenStylesProvider","children","parentCtx","useContext","screenInterpolatorProps","nextInterpolator","currentInterpolator","_useScreenAnimation","hasTriggeredGestureWhileInFlight","useSharedValue","stylesMap","useDerivedValue","props","value","bounds","createBounds","current","gesture","isDragging","next","closing","shouldUseCurrentInterpolator","interpolator","effectiveProps","progress","undefined","NO_STYLES","err","__DEV__","console","warn","useMemo","ancestorStylesMaps","jsx","Provider","useScreenStyles","ctx","Error"],"sourceRoot":"../../../../../src","sources":["shared/providers/screen/styles.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNativeReanimated","_constants","_useScreenAnimation2","_bounds","_jsxRuntime","ScreenStylesContext","createContext","ScreenStylesProvider","children","parentCtx","useContext","screenInterpolatorProps","nextInterpolator","currentInterpolator","_useScreenAnimation","isGesturingDuringCloseAnimation","useSharedValue","stylesMap","useDerivedValue","props","value","current","next","progress","stackProgress","isDragging","gesture","isNextClosing","closing","isInGestureMode","hasPushedScreenWhileClosing","interpolator","NO_STYLES","effectiveProgress","effectiveNext","undefined","bounds","createBounds","err","__DEV__","console","warn","useMemo","ancestorStylesMaps","jsx","Provider","useScreenStyles","ctx","Error"],"sourceRoot":"../../../../../src","sources":["shared/providers/screen/styles.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/providers/screen/styles.provider.js

@@ -17,48 +17,57 @@ export function ScreenStylesProvider({
     currentInterpolator
   } = _useScreenAnimation();
 
-  // Track when a gesture is triggered while another screen is closing
-  const hasTriggeredGestureWhileInFlight = useSharedValue(false);
+  /**
+   * Tracks when user starts a gesture while another screen is still closing.
+   * This persists until both the gesture ends AND the closing animation completes.
+   */
+  const isGesturingDuringCloseAnimation = useSharedValue(false);
   const stylesMap = useDerivedValue(() => {
     "worklet";
 
     const props = screenInterpolatorProps.value;
-    const bounds = createBounds(props);
-
-    // Detect when user starts gesture on current screen while next screen is closing
-    if (props.current.gesture.isDragging && props.next?.closing) {
-      hasTriggeredGestureWhileInFlight.value = true;
+    const {
+      current,
+      next,
+      progress,
+      stackProgress
+    } = props;
+    const isDragging = current.gesture.isDragging;
+    const isNextClosing = !!next?.closing;
+    if (isDragging && isNextClosing) {
+      isGesturingDuringCloseAnimation.value = true;
     }
-
-    // Reset the flag when no longer dragging and next screen is done closing
-    if (!props.current.gesture.isDragging && !props.next?.closing && hasTriggeredGestureWhileInFlight.value) {
-      hasTriggeredGestureWhileInFlight.value = false;
+    if (!isDragging && !isNextClosing) {
+      isGesturingDuringCloseAnimation.value = false;
     }
+    const isInGestureMode = isDragging || isGesturingDuringCloseAnimation.value;
+    const hasPushedScreenWhileClosing = !isInGestureMode && isNextClosing && stackProgress > progress;
 
-    // Use current interpolator when gesture triggered while in-flight,
-    // otherwise use next interpolator if available (normal case)
-    const shouldUseCurrentInterpolator = props.current.gesture.isDragging || hasTriggeredGestureWhileInFlight.value;
-    const interpolator = shouldUseCurrentInterpolator ? currentInterpolator : nextInterpolator ?? currentInterpolator;
+    // Select interpolator
+    //  - If in gesture mode, use current screen's interpolator since we're driving
+    //    the animation from this screen (dragging back to dismiss next).
+    const interpolator = isInGestureMode ? currentInterpolator : nextInterpolator ?? currentInterpolator;
+    if (!interpolator) return NO_STYLES;
 
-    /**
-     * Maintainer Note:
-     * To avoid unnecessary jumps in off directions, we have to snap back to the currents progress.
-     * While this still introduces a 'snap back' animation, it's still very rare that a user would encounter this unless
-     * they're spamming things out. Not ideal, but this is the best way to go about dealing with fast rapid gestures.
-     *
-     * The alternative was preventing users from actually being able to drag back while animation was still in flight. But there was a significant delay
-     * when waiting for gestures to register again.
-     */
-    const effectiveProps = shouldUseCurrentInterpolator ? {
-      ...props,
-      progress: props.current.progress,
-      next: undefined
-    } : props;
+    // Build effective props with corrected progress
+    //  - Gesture mode: use current.progress only (avoids jumps during drag)
+    //  - Pushed while closing: use stackProgress (includes new screen)
+    //  - Normal: use derived progress as-is
+
+    let effectiveProgress = progress;
+    let effectiveNext = next;
+    if (isInGestureMode) {
+      effectiveProgress = current.progress;
+      effectiveNext = undefined;
+    } else if (hasPushedScreenWhileClosing) {
+      effectiveProgress = stackProgress;
+    }
     try {
-      if (!interpolator) return NO_STYLES;
       return interpolator({
-        ...effectiveProps,
-        bounds
+        ...props,
+        progress: effectiveProgress,
+        next: effectiveNext,
+        bounds: createBounds(props)
       });
     } catch (err) {
       if (__DEV__) {

package/lib/module/shared/providers/screen/styles.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useMemo","useDerivedValue","useSharedValue","NO_STYLES","_useScreenAnimation","createBounds","jsx","_jsx","ScreenStylesContext","ScreenStylesProvider","children","parentCtx","screenInterpolatorProps","nextInterpolator","currentInterpolator","hasTriggeredGestureWhileInFlight","stylesMap","props","value","bounds","current","gesture","isDragging","next","closing","shouldUseCurrentInterpolator","interpolator","effectiveProps","progress","undefined","err","__DEV__","console","warn","ancestorStylesMaps","Provider","useScreenStyles","ctx","Error"],"sourceRoot":"../../../../../src","sources":["shared/providers/screen/styles.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createContext","useContext","useMemo","useDerivedValue","useSharedValue","NO_STYLES","_useScreenAnimation","createBounds","jsx","_jsx","ScreenStylesContext","ScreenStylesProvider","children","parentCtx","screenInterpolatorProps","nextInterpolator","currentInterpolator","isGesturingDuringCloseAnimation","stylesMap","props","value","current","next","progress","stackProgress","isDragging","gesture","isNextClosing","closing","isInGestureMode","hasPushedScreenWhileClosing","interpolator","effectiveProgress","effectiveNext","undefined","bounds","err","__DEV__","console","warn","ancestorStylesMaps","Provider","useScreenStyles","ctx","Error"],"sourceRoot":"../../../../../src","sources":["shared/providers/screen/styles.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/shared/providers/screen/styles.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.provider.d.ts","sourceRoot":"","sources":["../../../../../src/shared/providers/screen/styles.provider.tsx"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,WAAW,EAGhB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAG/E,KAAK,KAAK,GAAG;IACZ,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC1B,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC/B,SAAS,EAAE,WAAW,CAAC,2BAA2B,CAAC,CAAC;IACpD,kBAAkB,EAAE,WAAW,CAAC,2BAA2B,CAAC,EAAE,CAAC;CAC/D,CAAC;AAMF,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,2CAqFvD;AAED,wBAAgB,eAAe,6BAQ9B"}
+{"version":3,"file":"styles.provider.d.ts","sourceRoot":"","sources":["../../../../../src/shared/providers/screen/styles.provider.tsx"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,WAAW,EAGhB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAG/E,KAAK,KAAK,GAAG;IACZ,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC1B,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC/B,SAAS,EAAE,WAAW,CAAC,2BAA2B,CAAC,CAAC;IACpD,kBAAkB,EAAE,WAAW,CAAC,2BAA2B,CAAC,EAAE,CAAC;CAC/D,CAAC;AAMF,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,2CA2FvD;AAED,wBAAgB,eAAe,6BAQ9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screen-transitions",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Easy screen transitions for React Native and Expo",
   "author": "Ed",
   "license": "MIT",
@@ -43,7 +43,8 @@
     "build": "bob build",
     "lint": "biome check ./src",
     "typecheck": "tsc --noEmit",
-    "prepublishOnly": "bun run build"
+    "prepublishOnly": "bun run build",
+    "release": "release-it"
   },
   "keywords": [
     "react-native",
@@ -73,8 +74,10 @@
     "react-native-screens": ">=4.4.0"
   },
   "devDependencies": {
+    "@release-it/conventional-changelog": "^10.0.1",
     "@types/react": "~19.1.10",
     "react-native-builder-bob": "0.39.0",
+    "release-it": "^19.0.4",
     "typescript": "catalog:"
   },
   "react-native-builder-bob": {
@@ -91,5 +94,28 @@
       ]
     ]
   },
+  "release-it": {
+    "git": {
+      "commitMessage": "chore: release ${version}",
+      "tagName": "v${version}",
+      "commitArgs": [
+        "-n"
+      ]
+    },
+    "npm": {
+      "publish": true
+    },
+    "github": {
+      "release": true
+    },
+    "plugins": {
+      "@release-it/conventional-changelog": {
+        "preset": {
+          "name": "angular"
+        },
+        "path": "."
+      }
+    }
+  },
   "gitHead": "888d4df9936ec0e3b8221bea7cd81115e6301693"
 }

package/src/shared/providers/screen/styles.provider.tsx

@@ -28,56 +28,62 @@ export function ScreenStylesProvider({ children }: Props) {
 	const { screenInterpolatorProps, nextInterpolator, currentInterpolator } =
 		_useScreenAnimation();
 
-	// Track when a gesture is triggered while another screen is closing
-	const hasTriggeredGestureWhileInFlight = useSharedValue(false);
+	/**
+	 * Tracks when user starts a gesture while another screen is still closing.
+	 * This persists until both the gesture ends AND the closing animation completes.
+	 */
+	const isGesturingDuringCloseAnimation = useSharedValue(false);
 
 	const stylesMap = useDerivedValue<TransitionInterpolatedStyle>(() => {
 		"worklet";
 		const props = screenInterpolatorProps.value;
-		const bounds = createBounds(props);
+		const { current, next, progress, stackProgress } = props;
+		const isDragging = current.gesture.isDragging;
+		const isNextClosing = !!next?.closing;
 
-		// Detect when user starts gesture on current screen while next screen is closing
-		if (props.current.gesture.isDragging && props.next?.closing) {
-			hasTriggeredGestureWhileInFlight.value = true;
+		if (isDragging && isNextClosing) {
+			isGesturingDuringCloseAnimation.value = true;
 		}
 
-		// Reset the flag when no longer dragging and next screen is done closing
-		if (
-			!props.current.gesture.isDragging &&
-			!props.next?.closing &&
-			hasTriggeredGestureWhileInFlight.value
-		) {
-			hasTriggeredGestureWhileInFlight.value = false;
+		if (!isDragging && !isNextClosing) {
+			isGesturingDuringCloseAnimation.value = false;
 		}
 
-		// Use current interpolator when gesture triggered while in-flight,
-		// otherwise use next interpolator if available (normal case)
-		const shouldUseCurrentInterpolator =
-			props.current.gesture.isDragging ||
-			hasTriggeredGestureWhileInFlight.value;
+		const isInGestureMode = isDragging || isGesturingDuringCloseAnimation.value;
 
-		const interpolator = shouldUseCurrentInterpolator
+		const hasPushedScreenWhileClosing =
+			!isInGestureMode && isNextClosing && stackProgress > progress;
+
+		// Select interpolator
+		//  - If in gesture mode, use current screen's interpolator since we're driving
+		//    the animation from this screen (dragging back to dismiss next).
+		const interpolator = isInGestureMode
 			? currentInterpolator
 			: (nextInterpolator ?? currentInterpolator);
 
-		/**
-		 * Maintainer Note:
-		 * To avoid unnecessary jumps in off directions, we have to snap back to the currents progress.
-		 * While this still introduces a 'snap back' animation, it's still very rare that a user would encounter this unless
-		 * they're spamming things out. Not ideal, but this is the best way to go about dealing with fast rapid gestures.
-		 *
-		 * The alternative was preventing users from actually being able to drag back while animation was still in flight. But there was a significant delay
-		 * when waiting for gestures to register again.
-		 */
-		const effectiveProps = shouldUseCurrentInterpolator
-			? { ...props, progress: props.current.progress, next: undefined }
-			: props;
+		if (!interpolator) return NO_STYLES;
+
+		// Build effective props with corrected progress
+		//  - Gesture mode: use current.progress only (avoids jumps during drag)
+		//  - Pushed while closing: use stackProgress (includes new screen)
+		//  - Normal: use derived progress as-is
+
+		let effectiveProgress = progress;
+		let effectiveNext = next;
+
+		if (isInGestureMode) {
+			effectiveProgress = current.progress;
+			effectiveNext = undefined;
+		} else if (hasPushedScreenWhileClosing) {
+			effectiveProgress = stackProgress;
+		}
 
 		try {
-			if (!interpolator) return NO_STYLES;
 			return interpolator({
-				...effectiveProps,
-				bounds,
+				...props,
+				progress: effectiveProgress,
+				next: effectiveNext,
+				bounds: createBounds(props),
 			});
 		} catch (err) {
 			if (__DEV__) {