react-native-screen-transitions 3.6.0-alpha.3 → 3.6.0-alpha.4

package/src/shared/providers/stack/direct.provider.tsx

@@ -79,8 +79,7 @@ function useDirectStackValue(
 		};
 	}, [state.routes, state.preloadedRoutes, preloadedDescriptors, descriptors]);
 
-	const { stackProgress, optimisticFocusedIndex } =
-		useStackDerived(animationMaps);
+	const { optimisticFocusedIndex } = useStackDerived(animationMaps);
 
 	const focusedIndex = state.index;
 
@@ -91,18 +90,9 @@ function useDirectStackValue(
 			routeKeys,
 			routes: allRoutes,
 			scenes,
-			stackProgress,
 			optimisticFocusedIndex,
 		}),
-		[
-			flags,
-			navigatorKey,
-			routeKeys,
-			allRoutes,
-			scenes,
-			stackProgress,
-			optimisticFocusedIndex,
-		],
+		[flags, navigatorKey, routeKeys, allRoutes, scenes, optimisticFocusedIndex],
 	);
 
 	// DirectStack context value

package/src/shared/providers/stack/helpers/use-stack-derived.ts

@@ -1,9 +1,9 @@
 import { type DerivedValue, useDerivedValue } from "react-native-reanimated";
 import type { AnimationStoreMap } from "../../../stores/animation.store";
 
+type StackDerivedAnimationMap = Pick<AnimationStoreMap, "closing">;
+
 export interface StackDerived {
-	/** Sum of all individual screen progress values. */
-	stackProgress: DerivedValue<number>;
 	/**
 	 * Focused index that accounts for closing screens.
 	 * Counts consecutive closing screens from the top so that
@@ -13,21 +13,12 @@ export interface StackDerived {
 }
 
 /**
- * Derives aggregated stack progress and an optimistic focused index
- * from animation store maps. Shared between managed and direct providers.
+ * Derives an optimistic focused index from animation store maps.
+ * Shared between managed and direct providers.
  */
 export function useStackDerived(
-	animationMaps: AnimationStoreMap[],
+	animationMaps: StackDerivedAnimationMap[],
 ): StackDerived {
-	const stackProgress = useDerivedValue(() => {
-		"worklet";
-		let total = 0;
-		for (let i = 0; i < animationMaps.length; i++) {
-			total += animationMaps[i].progress.get();
-		}
-		return total;
-	});
-
 	const optimisticFocusedIndex = useDerivedValue(() => {
 		"worklet";
 		const lastIndex = animationMaps.length - 1;
@@ -39,5 +30,5 @@ export function useStackDerived(
 		return lastIndex - closingFromTop;
 	});
 
-	return { stackProgress, optimisticFocusedIndex };
+	return { optimisticFocusedIndex };
 }

package/src/shared/providers/stack/managed.provider.tsx

@@ -47,9 +47,7 @@ function useManagedStackValue<
 	const navigatorKey = props.state.key;
 
 	const processed = useProcessedRoutes(state.routes, state.descriptors);
-	const { stackProgress, optimisticFocusedIndex } = useStackDerived(
-		processed.animationMaps,
-	);
+	const { optimisticFocusedIndex } = useStackDerived(processed.animationMaps);
 	const closingRouteMap = useClosingRouteMap(
 		processed.routeKeys,
 		processed.animationMaps,
@@ -65,7 +63,6 @@ function useManagedStackValue<
 			routeKeys: processed.routeKeys,
 			routes: state.routes as Route<string>[],
 			scenes: processed.scenes as BaseStackScene[],
-			stackProgress,
 			optimisticFocusedIndex,
 		}),
 		[
@@ -74,7 +71,6 @@ function useManagedStackValue<
 			processed.routeKeys,
 			state.routes,
 			processed.scenes,
-			stackProgress,
 			optimisticFocusedIndex,
 		],
 	);

package/src/shared/stores/animation.store.ts

@@ -7,6 +7,7 @@ import { createStore } from "../utils/create-store";
 
 export type AnimationStoreMap = {
 	progress: SharedValue<number>;
+	effectiveProgress: SharedValue<number>;
 	willAnimate: SharedValue<number>;
 	progressAnimating: SharedValue<number>;
 	closing: SharedValue<number>;
@@ -16,6 +17,7 @@ export type AnimationStoreMap = {
 function createAnimationBag(): AnimationStoreMap {
 	return {
 		progress: makeMutable(0),
+		effectiveProgress: makeMutable(0),
 		willAnimate: makeMutable(0),
 		closing: makeMutable(0),
 		progressAnimating: makeMutable(0),
@@ -24,14 +26,15 @@ function createAnimationBag(): AnimationStoreMap {
 }
 
 /**
- * Route-keyed screen transition state for the public animation lifecycle. These
- * shared values track the current progress, whether a transition is about to
- * begin, and whether a screen is entering, closing, or actively animating.
+ * Route-keyed screen transition state for the public animation lifecycle.
+ * `progress` tracks committed transition progress; `effectiveProgress` tracks
+ * the hydrated progress after live gesture policy is applied.
  */
 export const AnimationStore = createStore<AnimationStoreMap>({
 	createBag: createAnimationBag,
 	disposeBag: (bag) => {
 		cancelAnimation(bag.progress);
+		cancelAnimation(bag.effectiveProgress);
 		cancelAnimation(bag.willAnimate);
 		cancelAnimation(bag.progressAnimating);
 		cancelAnimation(bag.closing);

package/src/shared/types/animation.types.ts

@@ -25,7 +25,7 @@ export type ScreenTransitionOptions = Pick<
 	ScreenTransitionConfig,
 	| "navigationMaskEnabled"
 	| "gestureEnabled"
-	| "experimental_allowDisabledGestureTracking"
+	| "gestureTracking"
 	| "gestureDirection"
 	| "gestureSensitivity"
 	| "gestureVelocityImpact"
@@ -287,13 +287,17 @@ export type TransitionSlotStyle = AnimatedViewStyle | TransitionSlotDefinition;
  * Runtime options returned by `screenStyleInterpolator`.
  *
  * These values are not style slots. They are derived per frame and consumed by
- * the transition runtime.
+ * the transition runtime. Structural options that change the React tree, such
+ * as `navigationMaskEnabled`, must be configured statically on the screen.
  *
  * If `gestureSensitivity` is derived from the current gesture, prefer
  * `active.gesture.raw` so the sensitivity calculation does not feed back into
  * itself.
  */
-export type TransitionInterpolatorOptions = ScreenTransitionOptions;
+export type TransitionInterpolatorOptions = Omit<
+	ScreenTransitionOptions,
+	"navigationMaskEnabled" | "gestureTracking"
+>;
 
 /**
  * Internal normalized slot format.

package/src/shared/types/index.ts

@@ -33,6 +33,7 @@ export type {
 } from "./gesture.types";
 export type { OverlayProps } from "./overlay.types";
 export type {
+	GestureTracking,
 	Layout,
 	ScreenKey,
 	ScreenTransitionConfig,

package/src/shared/types/screen.types.ts

@@ -33,6 +33,7 @@ export type ScreenKey = string;
 export type SheetScrollGestureBehavior =
 	| "expand-and-collapse"
 	| "collapse-only";
+export type GestureTracking = "auto" | "never" | "always";
 
 /**
  * A single snap point value. Either a fraction of screen height (0–1) or
@@ -130,21 +131,17 @@ export type ScreenTransitionConfig = {
 	gestureEnabled?: boolean;
 
 	/**
-	 * Allows screens with `gestureEnabled={false}` to still activate gestures for
-	 * live gesture values while preventing gesture dismissal.
+	 * Controls whether the screen tracks live gesture values.
 	 *
-	 * This is a v3 compatibility bridge for the next gesture behavior. Direction
-	 * ownership/claims participate while this is enabled so nested screens can
-	 * intentionally shadow parent gestures for resistance-style animations.
+	 * - `"auto"` tracks gestures when dismissal is enabled, or when snap points
+	 *   can move without dismissal.
+	 * - `"never"` disables gesture tracking for the screen.
+	 * - `"always"` keeps tracking live gesture values even when
+	 *   `gestureEnabled` is `false`, without allowing dismiss.
 	 *
-	 * Screens with `snapPoints` already keep gesture tracking when
-	 * `gestureEnabled={false}`; this flag mainly affects disabled non-snap
-	 * gestures.
-	 *
-	 * @experimental This API may change in future versions.
-	 * @default false
+	 * @default "auto"
 	 */
-	experimental_allowDisabledGestureTracking?: boolean;
+	gestureTracking?: GestureTracking;
 
 	/**
 	 * The direction(s) of the screen gesture used to dismiss the screen.

package/src/shared/utils/bounds/navigation/reveal/build.ts

@@ -328,7 +328,6 @@ export function buildRevealStyles({
 
 		return {
 			options: {
-				navigationMaskEnabled: true,
 				gestureProgressMode,
 				gestureSensitivity,
 				gestureReleaseVelocityScale,
@@ -424,7 +423,6 @@ export function buildRevealStyles({
 
 	return {
 		options: {
-			navigationMaskEnabled: true,
 			gestureProgressMode,
 		},
 		content: {