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

package/lib/typescript/shared/utils/gesture/compute-claimed-directions.d.ts

@@ -0,0 +1,23 @@
+import type { GestureDirection } from "../../types/gesture.types";
+import { type ClaimedDirections } from "../../types/ownership.types";
+/**
+ * Computes which directions a screen claims ownership of.
+ *
+ * A screen claims a direction when:
+ * 1. gestureEnabled is true AND
+ * 2. gestureDirection includes that direction
+ *
+ * For snap points, both directions on the axis are claimed automatically.
+ * This is because a snap point sheet handles both expand (inverse) and collapse (primary) gestures.
+ *
+ * @param gestureEnabled - Whether gestures are enabled for this screen
+ * @param gestureDirection - The gesture direction(s) configured for this screen
+ * @param hasSnapPoints - Whether this screen has snap points configured
+ * @returns The claimed directions for this screen
+ */
+export declare function computeClaimedDirections(gestureEnabled: boolean, gestureDirection: GestureDirection | GestureDirection[] | undefined, hasSnapPoints: boolean): ClaimedDirections;
+/**
+ * Checks if any direction is claimed.
+ */
+export declare function claimsAnyDirection(claims: ClaimedDirections): boolean;
+//# sourceMappingURL=compute-claimed-directions.d.ts.map

package/lib/typescript/shared/utils/gesture/compute-claimed-directions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compute-claimed-directions.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/gesture/compute-claimed-directions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EACN,KAAK,iBAAiB,EAGtB,MAAM,6BAA6B,CAAC;AAErC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,CACvC,cAAc,EAAE,OAAO,EACvB,gBAAgB,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,GAAG,SAAS,EACnE,aAAa,EAAE,OAAO,GACpB,iBAAiB,CAsDnB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAOrE"}

package/lib/typescript/shared/utils/gesture/determine-snap-target.d.ts

@@ -5,7 +5,11 @@ interface DetermineSnapTargetProps {
     velocity: number;
     /** Screen dimension along the snap axis (width or height) */
     dimension: number;
-    /** How much velocity affects the snap decision (0-1). Default 0.15 */
+    /**
+     * How much velocity affects the snap decision.
+     * Lower values = more deliberate/iOS-like, higher values = more responsive to flicks.
+     * @default 0.1
+     */
     velocityFactor?: number;
     /** Whether dismiss (progress=0) is allowed. Default true */
     canDismiss?: boolean;

package/lib/typescript/shared/utils/gesture/determine-snap-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"determine-snap-target.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/gesture/determine-snap-target.ts"],"names":[],"mappings":"AAAA,UAAU,wBAAwB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4DAA4D;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,yBAAyB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EACnC,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,cAAqB,EACrB,UAAiB,GACjB,EAAE,wBAAwB,GAAG,yBAAyB,CA0CtD"}
+{"version":3,"file":"determine-snap-target.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/gesture/determine-snap-target.ts"],"names":[],"mappings":"AAAA,UAAU,wBAAwB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4DAA4D;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,yBAAyB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EACnC,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,cAAoB,EACpB,UAAiB,GACjB,EAAE,wBAAwB,GAAG,yBAAyB,CA0CtD"}

package/lib/typescript/shared/utils/gesture/find-collapse-target.d.ts

@@ -0,0 +1,17 @@
+interface FindCollapseTargetResult {
+    target: number;
+    shouldDismiss: boolean;
+}
+/**
+ * Finds the next lower snap point for backdrop collapse behavior.
+ *
+ * - If above min snap: returns next lower snap point
+ * - If at or below min snap: returns 0 (dismiss) if canDismiss, else stays at min
+ *
+ * @param currentProgress - Current animation progress
+ * @param snapPoints - Array of snap points
+ * @param canDismiss - Whether dismissing is allowed
+ */
+export declare function findCollapseTarget(currentProgress: number, snapPoints: number[], canDismiss: boolean): FindCollapseTargetResult;
+export {};
+//# sourceMappingURL=find-collapse-target.d.ts.map

package/lib/typescript/shared/utils/gesture/find-collapse-target.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-collapse-target.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/gesture/find-collapse-target.ts"],"names":[],"mappings":"AAEA,UAAU,wBAAwB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CACjC,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,OAAO,GACjB,wBAAwB,CAoB1B"}

package/lib/typescript/shared/utils/gesture/resolve-ownership.d.ts

@@ -0,0 +1,36 @@
+import type { ClaimedDirections } from "../../types/ownership.types";
+import { type DirectionOwnership } from "../../types/ownership.types";
+/**
+ * Minimal interface for ancestor context needed for ownership resolution.
+ * This allows the function to be used without importing the full GestureContextType.
+ */
+export interface AncestorClaimsContext {
+    claimedDirections: ClaimedDirections;
+    ancestorContext: AncestorClaimsContext | null;
+}
+/**
+ * Resolves ownership status for all directions relative to the current screen.
+ *
+ * For each direction:
+ * 1. If the current screen claims it → 'self' (should activate)
+ * 2. Else, walk up ancestors looking for a claim → 'ancestor' (should fail to bubble)
+ * 3. If no one claims it → 'none' (should fail, no gesture response)
+ *
+ * This is computed during render (JS thread) and the result can be safely
+ * used in worklets since it's a plain object.
+ *
+ * @param selfClaims - The directions claimed by the current screen
+ * @param ancestorContext - The ancestor context chain (can be null if no ancestors)
+ * @returns Ownership status for all four directions
+ */
+export declare function resolveOwnership(selfClaims: ClaimedDirections, ancestorContext: AncestorClaimsContext | null): DirectionOwnership;
+/**
+ * Finds the nearest ancestor (or self if isCurrentOwner) that claims any direction.
+ * Used for setting up native gesture relationships.
+ *
+ * @param selfClaimsAny - Whether the current screen claims any direction
+ * @param ancestorContext - The ancestor context chain
+ * @returns The nearest context that claims a direction, or null
+ */
+export declare function findNearestOwner(selfClaimsAny: boolean, ancestorContext: AncestorClaimsContext | null): AncestorClaimsContext | null;
+//# sourceMappingURL=resolve-ownership.d.ts.map

package/lib/typescript/shared/utils/gesture/resolve-ownership.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-ownership.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/gesture/resolve-ownership.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAa,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAEN,KAAK,kBAAkB,EAGvB,MAAM,6BAA6B,CAAC;AAErC;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAC9C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC/B,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,qBAAqB,GAAG,IAAI,GAC3C,kBAAkB,CAYpB;AA4BD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC/B,aAAa,EAAE,OAAO,EACtB,eAAe,EAAE,qBAAqB,GAAG,IAAI,GAC3C,qBAAqB,GAAG,IAAI,CAuB9B"}

package/lib/typescript/shared/utils/gesture/velocity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"velocity.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/gesture/velocity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,uBAAuB,EACvB,6BAA6B,EAC7B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,UAAU,sBAAsB;IAC/B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,uBAAuB,CAAC,6BAA6B,CAAC,CAAC;IAC9D,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,UAAU,EAAE;QACX,UAAU,EAAE,OAAO,CAAC;QACpB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,QAAQ,EAAE,OAAO,CAAC;QAClB,gBAAgB,EAAE,OAAO,CAAC;KAC1B,CAAC;CACF;AAgID,eAAO,MAAM,QAAQ;yCAvHuB,MAAM,cAAc,MAAM;wCAa3B,MAAM,aAAa,MAAM;uDAU3C,MAAM,0BACN,MAAM;+FAkB5B,sBAAsB;sDAyDL,MAAM,2BACA,MAAM,cACnB,MAAM,kBACF,MAAM;CAuBtB,CAAC"}
+{"version":3,"file":"velocity.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/gesture/velocity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,uBAAuB,EACvB,6BAA6B,EAC7B,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,UAAU,sBAAsB;IAC/B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,uBAAuB,CAAC,6BAA6B,CAAC,CAAC;IAC9D,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,UAAU,EAAE;QACX,UAAU,EAAE,OAAO,CAAC;QACpB,kBAAkB,EAAE,OAAO,CAAC;QAC5B,QAAQ,EAAE,OAAO,CAAC;QAClB,gBAAgB,EAAE,OAAO,CAAC;KAC1B,CAAC;CACF;AAyID,eAAO,MAAM,QAAQ;yCAjIuB,MAAM,cAAc,MAAM;wCAa3B,MAAM,aAAa,MAAM;uDAU3C,MAAM,0BACN,MAAM;+FAkB5B,sBAAsB;sDAyDL,MAAM,2BACA,MAAM,cACnB,MAAM,kBACF,MAAM;CAiCtB,CAAC"}

package/package.json

@@ -1,122 +1,123 @@
 {
-  "name": "react-native-screen-transitions",
-  "version": "3.3.0-beta.3",
-  "description": "Easy screen transitions for React Native and Expo",
-  "author": "Ed",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/eds2002/react-native-screen-transitions.git",
-    "directory": "packages/react-native-screen-transitions"
-  },
-  "main": "lib/commonjs/shared/index.js",
-  "module": "lib/module/shared/index.js",
-  "types": "lib/typescript/shared/index.d.ts",
-  "react-native": "src/shared/index",
-  "exports": {
-    ".": {
-      "react-native": "./src/shared/index.ts",
-      "import": "./lib/module/shared/index.js",
-      "require": "./lib/commonjs/shared/index.js",
-      "types": "./lib/typescript/shared/index.d.ts"
-    },
-    "./native-stack": {
-      "react-native": "./src/native-stack/index.ts",
-      "import": "./lib/module/native-stack/index.js",
-      "require": "./lib/commonjs/native-stack/index.js",
-      "types": "./lib/typescript/native-stack/index.d.ts"
-    },
-    "./blank-stack": {
-      "react-native": "./src/blank-stack/index.ts",
-      "import": "./lib/module/blank-stack/index.js",
-      "require": "./lib/commonjs/blank-stack/index.js",
-      "types": "./lib/typescript/blank-stack/index.d.ts"
-    },
-    "./component-stack": {
-      "react-native": "./src/component-stack/index.ts",
-      "import": "./lib/module/component-stack/index.js",
-      "require": "./lib/commonjs/component-stack/index.js",
-      "types": "./lib/typescript/component-stack/index.d.ts"
-    }
-  },
-  "scripts": {
-    "build": "bob build",
-    "lint": "biome check ./src",
-    "typecheck": "tsc --noEmit",
-    "prepublishOnly": "bun run build",
-    "release": "release-it",
-    "release:beta": "release-it --preRelease=beta"
-  },
-  "keywords": [
-    "react-native",
-    "transitions",
-    "animation",
-    "react-navigation",
-    "expo-router",
-    "reanimated"
-  ],
-  "files": [
-    "lib",
-    "src",
-    "README.md",
-    "LICENSE"
-  ],
-  "peerDependencies": {
-    "@react-navigation/elements": ">=2.0.0",
-    "@react-navigation/native": ">=6.0.0",
-    "@react-navigation/native-stack": ">=7.0.0",
-    "@types/react": "*",
-    "@types/react-native": "*",
-    "react": "*",
-    "react-native": "*",
-    "react-native-gesture-handler": ">=2.16.1",
-    "react-native-reanimated": ">=3.16.0 || >=4.0.0-",
-    "react-native-safe-area-context": "*",
-    "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": {
-    "source": "src",
-    "output": "lib",
-    "targets": [
-      "commonjs",
-      "module",
-      [
-        "typescript",
-        {
-          "project": "tsconfig.build.json"
-        }
-      ]
-    ]
-  },
-  "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"
+	"name": "react-native-screen-transitions",
+	"version": "3.3.0-beta.4",
+	"description": "Easy screen transitions for React Native and Expo",
+	"author": "Ed",
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/eds2002/react-native-screen-transitions.git",
+		"directory": "packages/react-native-screen-transitions"
+	},
+	"main": "lib/commonjs/shared/index.js",
+	"module": "lib/module/shared/index.js",
+	"types": "lib/typescript/shared/index.d.ts",
+	"react-native": "src/shared/index",
+	"exports": {
+		".": {
+			"react-native": "./src/shared/index.ts",
+			"import": "./lib/module/shared/index.js",
+			"require": "./lib/commonjs/shared/index.js",
+			"types": "./lib/typescript/shared/index.d.ts"
+		},
+		"./native-stack": {
+			"react-native": "./src/native-stack/index.ts",
+			"import": "./lib/module/native-stack/index.js",
+			"require": "./lib/commonjs/native-stack/index.js",
+			"types": "./lib/typescript/native-stack/index.d.ts"
+		},
+		"./blank-stack": {
+			"react-native": "./src/blank-stack/index.ts",
+			"import": "./lib/module/blank-stack/index.js",
+			"require": "./lib/commonjs/blank-stack/index.js",
+			"types": "./lib/typescript/blank-stack/index.d.ts"
+		},
+		"./component-stack": {
+			"react-native": "./src/component-stack/index.ts",
+			"import": "./lib/module/component-stack/index.js",
+			"require": "./lib/commonjs/component-stack/index.js",
+			"types": "./lib/typescript/component-stack/index.d.ts"
+		}
+	},
+	"scripts": {
+		"build": "bob build",
+		"lint": "biome check ./src",
+		"typecheck": "tsc --noEmit",
+		"prepublishOnly": "bun run build",
+		"release": "release-it",
+		"release:beta": "release-it --preRelease=beta"
+	},
+	"keywords": [
+		"react-native",
+		"transitions",
+		"animation",
+		"react-navigation",
+		"expo-router",
+		"reanimated"
+	],
+	"files": [
+		"lib",
+		"src",
+		"!src/**/__tests__",
+		"README.md",
+		"LICENSE"
+	],
+	"peerDependencies": {
+		"@react-navigation/elements": ">=2.0.0",
+		"@react-navigation/native": ">=6.0.0",
+		"@react-navigation/native-stack": ">=7.0.0",
+		"@types/react": "*",
+		"@types/react-native": "*",
+		"react": "*",
+		"react-native": "*",
+		"react-native-gesture-handler": ">=2.16.1",
+		"react-native-reanimated": ">=3.16.0 || >=4.0.0-",
+		"react-native-safe-area-context": "*",
+		"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": {
+		"source": "src",
+		"output": "lib",
+		"targets": [
+			"commonjs",
+			"module",
+			[
+				"typescript",
+				{
+					"project": "tsconfig.build.json"
+				}
+			]
+		]
+	},
+	"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/animation/snap-to.ts

@@ -1,3 +1,4 @@
+/** 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";

package/src/shared/components/create-transition-aware-component.tsx

@@ -6,7 +6,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 type { TransitionAwareProps } from "../types/screen.types";
 
@@ -26,33 +25,37 @@ export function createTransitionAwareComponent<P extends object>(
 		React.ComponentRef<typeof Wrapped>,
 		TransitionAwareProps<P>
 	>((props: any, ref) => {
-		const { nativeGesture } = useGestureContext()!;
-		const {
-			scrollHandler,
-			onContentSizeChange,
-			onLayout,
-			onTouchStart,
-			onTouchEnd,
-		} = useScrollRegistry({
-			onScroll: props.onScroll,
-			onContentSizeChange: props.onContentSizeChange,
-			onLayout: props.onLayout,
-			onTouchStart: props.onTouchStart,
-			onTouchEnd: props.onTouchEnd,
-		});
+		// 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, nativeGesture } =
+			useScrollRegistry({
+				onScroll: props.onScroll,
+				onContentSizeChange: props.onContentSizeChange,
+				onLayout: props.onLayout,
+				direction: scrollDirection,
+			});
+
+		const scrollableComponent = (
+			<AnimatedComponent
+				{...(props as any)}
+				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 (
 			<GestureDetector gesture={nativeGesture}>
-				<AnimatedComponent
-					{...(props as any)}
-					ref={ref}
-					onScroll={scrollHandler}
-					onContentSizeChange={onContentSizeChange}
-					onLayout={onLayout}
-					onTouchStart={onTouchStart}
-					onTouchEnd={onTouchEnd}
-					scrollEventThrottle={props.scrollEventThrottle || 16}
-				/>
+				{scrollableComponent}
 			</GestureDetector>
 		);
 	});

package/src/shared/components/screen-container.tsx

@@ -1,13 +1,19 @@
+/** 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 { GestureDetector } from "react-native-gesture-handler";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
+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";
 
 type Props = {
 	children: React.ReactNode;
@@ -19,11 +25,67 @@ export const ScreenContainer = memo(({ children }: Props) => {
 	const { pointerEvents, backdropBehavior } = useBackdropPointerEvents();
 	const gestureContext = useGestureContext();
 
-	const isDismissable = backdropBehavior === "dismiss";
+	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,8 +103,8 @@ export const ScreenContainer = memo(({ children }: Props) => {
 		<View style={styles.container} pointerEvents={pointerEvents}>
 			<Pressable
 				style={StyleSheet.absoluteFillObject}
-				pointerEvents={isDismissable ? "auto" : "none"}
-				onPress={isDismissable ? handleBackdropPress : undefined}
+				pointerEvents={isBackdropActive ? "auto" : "none"}
+				onPress={isBackdropActive ? handleBackdropPress : undefined}
 			>
 				<Animated.View
 					style={[StyleSheet.absoluteFillObject, animatedBackdropStyle]}
@@ -51,7 +113,7 @@ export const ScreenContainer = memo(({ children }: Props) => {
 			<GestureDetector gesture={gestureContext!.panGesture}>
 				<Animated.View
 					style={[styles.content, animatedContentStyle]}
-					pointerEvents={isDismissable ? "box-none" : pointerEvents}
+					pointerEvents={isBackdropActive ? "box-none" : pointerEvents}
 				>
 					{children}
 				</Animated.View>

package/src/shared/constants.ts

@@ -93,6 +93,7 @@ export const FULLSCREEN_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: ActivationArea = "screen";
@@ -106,3 +107,9 @@ 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;