react-native-screen-transitions 3.7.1 → 3.8.0-beta.0

package/lib/typescript/shared/utils/animation/spring/springConfigs.d.ts

@@ -0,0 +1,46 @@
+import type { ReduceMotion } from "react-native-reanimated";
+/**
+ * Internal spring animation configuration.
+ *
+ * @param mass - The weight of the spring. Reducing this value makes the
+ *   animation faster.
+ * @param damping - How quickly a spring slows down. Higher damping means the
+ *   spring will come to rest faster.
+ * @param stiffness - How bouncy the spring is.
+ * @param duration - Perceptual duration of the animation in milliseconds.
+ *   Actual duration is 1.5 times the value of perceptual duration.
+ * @param dampingRatio - How damped the spring is. Value `1` means the spring is
+ *   critically damped, value `<1` means the spring is underdamped and value
+ *   `>1` means the spring is overdamped.
+ * @param velocity - Initial velocity applied to the spring equation.
+ * @param overshootClamping - Whether a spring can bounce over the `toValue`.
+ * @param energyThreshold - Relative energy threshold below which the spring
+ *   will snap to `toValue` without further oscillations.
+ * @param reduceMotion - Optional reduced-motion override. `ReduceMotion.Always`
+ *   finishes immediately, `ReduceMotion.Never` runs normally, and
+ *   `ReduceMotion.System` is treated like the default in this internal fork.
+ * @see https://docs.swmansion.com/react-native-reanimated/docs/animations/withSpring/#config-
+ */
+export type SpringConfig = {
+    mass?: number;
+    overshootClamping?: boolean;
+    energyThreshold?: number;
+    velocity?: number;
+    reduceMotion?: ReduceMotion;
+} & ({
+    stiffness?: number;
+    damping?: number;
+    duration?: never;
+    dampingRatio?: never;
+    clamp?: never;
+} | {
+    stiffness?: never;
+    damping?: never;
+    duration?: number;
+    dampingRatio?: number;
+    clamp?: {
+        min?: number;
+        max?: number;
+    };
+});
+//# sourceMappingURL=springConfigs.d.ts.map

package/lib/typescript/shared/utils/animation/spring/springConfigs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"springConfigs.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/animation/spring/springConfigs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC5B,GAAG,CACD;IACA,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;CACb,GACD;IACA,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACtC,CACH,CAAC"}

package/lib/typescript/shared/utils/animation/spring/springUtils.d.ts

@@ -0,0 +1,68 @@
+import type { Animation } from "react-native-reanimated";
+import type { SpringConfig } from "./springConfigs";
+type Timestamp = number;
+export type DefaultSpringConfig = {
+    [K in keyof Required<SpringConfig>]: K extends "reduceMotion" | "clamp" ? Required<SpringConfig>[K] | undefined : Required<SpringConfig>[K];
+};
+export interface SpringConfigInner {
+    useDuration: boolean;
+    skipAnimation: boolean;
+    settleDistance: number;
+}
+export interface SpringAnimation extends Animation<SpringAnimation> {
+    current: number;
+    toValue: number;
+    velocity: number;
+    settled: boolean;
+    lastTimestamp: Timestamp;
+    startTimestamp: Timestamp;
+    startValue: number;
+    zeta: number;
+    omega0: number;
+    omega1: number;
+    initialEnergy: number;
+}
+export type InnerSpringAnimation = SpringAnimation;
+export declare function checkIfConfigIsValid(config: DefaultSpringConfig): boolean;
+export declare function safeMergeConfigs<TConfig extends object>(defaults: TConfig, userConfig?: Partial<TConfig>): TConfig;
+export declare function initialCalculations(stiffness: number | undefined, config: DefaultSpringConfig & SpringConfigInner): {
+    zeta: number;
+    omega0: number;
+    omega1: number;
+};
+/**
+ * We make an assumption that we can manipulate zeta without changing duration
+ * of movement. According to theory this change is small and tests shows that we
+ * can indeed ignore it.
+ */
+export declare function scaleZetaToMatchClamps(animation: SpringAnimation, clamp: {
+    min?: number;
+    max?: number;
+}): number;
+export declare function getEnergy(displacement: number, velocity: number, stiffness: number, mass: number): number;
+/** Runs before initial */
+export declare function calculateNewStiffnessToMatchDuration(x0: number, config: DefaultSpringConfig & SpringConfigInner, v0: number): number;
+export declare function criticallyDampedSpringCalculations(animation: InnerSpringAnimation, precalculatedValues: {
+    v0: number;
+    x0: number;
+    omega0: number;
+    t: number;
+}): {
+    position: number;
+    velocity: number;
+};
+export declare function underDampedSpringCalculations(animation: InnerSpringAnimation, precalculatedValues: {
+    zeta: number;
+    v0: number;
+    x0: number;
+    omega0: number;
+    omega1: number;
+    t: number;
+}): {
+    position: number;
+    velocity: number;
+};
+export declare function isAnimationTerminatingCalculation(animation: InnerSpringAnimation, config: DefaultSpringConfig & SpringConfigInner): boolean;
+export declare function isAnimationSettledCalculation(animation: InnerSpringAnimation, config: DefaultSpringConfig & SpringConfigInner): boolean;
+export {};
+//# sourceMappingURL=springUtils.d.ts.map

package/lib/typescript/shared/utils/animation/spring/springUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"springUtils.d.ts","sourceRoot":"","sources":["../../../../../../src/shared/utils/animation/spring/springUtils.ts"],"names":[],"mappings":"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"}

package/lib/typescript/shared/utils/animation/state.d.ts

@@ -0,0 +1,6 @@
+export type AnimationState = {
+    finished: boolean;
+    settled: boolean;
+};
+export type AnimationStateCallback = (state: AnimationState) => void;
+//# sourceMappingURL=state.d.ts.map

package/lib/typescript/shared/utils/animation/state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/animation/state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC"}

package/lib/typescript/shared/utils/bounds/navigation/reveal/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/utils/bounds/navigation/reveal/build.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAMhF,wBAAgB,iBAAiB,CAAC,EACjC,GAAG,EACH,KAAK,EACL,aAAa,GACb,EAAE,uBAAuB,GAAG,uBAAuB,CAobnD"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/utils/bounds/navigation/reveal/build.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAMhF,wBAAgB,iBAAiB,CAAC,EACjC,GAAG,EACH,KAAK,EACL,aAAa,GACb,EAAE,uBAAuB,GAAG,uBAAuB,CAgbnD"}

package/lib/typescript/shared/utils/bounds/navigation/zoom/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/utils/bounds/navigation/zoom/build.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAgC5E,wBAAgB,eAAe,CAAC,EAC/B,GAAG,EACH,WAAW,EACX,KAAK,GACL,EAAE,qBAAqB,GAAG,qBAAqB,CAga/C"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/utils/bounds/navigation/zoom/build.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAgC5E,wBAAgB,eAAe,CAAC,EAC/B,GAAG,EACH,WAAW,EACX,KAAK,GACL,EAAE,qBAAqB,GAAG,qBAAqB,CA8Z/C"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-native-screen-transitions",
-	"version": "3.7.1",
+	"version": "3.8.0-beta.0",
 	"description": "Easy screen transitions for React Native and Expo",
 	"author": "Ed",
 	"license": "MIT",

package/src/blank-stack/components/stack-view.tsx

@@ -9,8 +9,8 @@ import {
 } from "../../shared/components/activity";
 import { Overlay } from "../../shared/components/overlay";
 import { ScreenComposer } from "../../shared/providers/screen/screen-composer";
+import { withBlankStack } from "../../shared/providers/stack/blank-stack.provider";
 import { withStackCore } from "../../shared/providers/stack/core.provider";
-import { withManagedStack } from "../../shared/providers/stack/managed.provider";
 import type { BaseStackScene } from "../../shared/types/stack.types";
 import type {
 	BlankStackDescriptor,
@@ -53,7 +53,7 @@ const BlankSceneRow = memo(function BlankSceneRow({
 
 export const StackView = withStackCore(
 	{ TRANSITIONS_ALWAYS_ON: true, DISABLE_NATIVE_SCREENS: false },
-	withManagedStack<BlankStackDescriptor, BlankStackNavigationHelpers>(
+	withBlankStack<BlankStackDescriptor, BlankStackNavigationHelpers>(
 		({ scenes, shouldShowFloatOverlay }) => {
 			return (
 				<Fragment>

package/src/component-stack/components/stack-view.tsx

@@ -2,8 +2,8 @@ import { Fragment } from "react";
 import { Overlay } from "../../shared/components/overlay";
 import { SceneView } from "../../shared/components/scene-view";
 import { ScreenComposer } from "../../shared/providers/screen/screen-composer";
+import { withBlankStack } from "../../shared/providers/stack/blank-stack.provider";
 import { withStackCore } from "../../shared/providers/stack/core.provider";
-import { withManagedStack } from "../../shared/providers/stack/managed.provider";
 import { StackType } from "../../shared/types/stack.types";
 import type {
 	ComponentStackDescriptor,
@@ -13,7 +13,7 @@ import { ComponentScreen } from "./component-screen";
 
 export const StackView = withStackCore(
 	{ TRANSITIONS_ALWAYS_ON: true, STACK_TYPE: StackType.COMPONENT },
-	withManagedStack<ComponentStackDescriptor, ComponentStackNavigationHelpers>(
+	withBlankStack<ComponentStackDescriptor, ComponentStackNavigationHelpers>(
 		({ scenes, shouldShowFloatOverlay }) => {
 			return (
 				<Fragment>

package/src/shared/adapters/with-screen-transitions/stack-layout.tsx

@@ -10,11 +10,6 @@ import {
 	useStackCoreContext,
 	withStackCore,
 } from "../../providers/stack/core.provider";
-import { useStackDerived } from "../../providers/stack/helpers/use-stack-derived";
-import {
-	AnimationStore,
-	type AnimationStoreMap,
-} from "../../stores/animation.store";
 import type { BaseStackDescriptor, BaseStackRoute } from "../../types";
 import { StackType } from "../../types/stack.types";
 import { isOverlayVisible } from "../../utils/overlay/visibility";
@@ -44,7 +39,6 @@ type TransitionStackState = {
 	routes: BaseStackRoute[];
 	routeKeys: string[];
 	scenes: ScreenTransitionsAdapterScene[];
-	animationMaps: AnimationStoreMap[];
 	routeIndexByKey: Map<string, number>;
 	shouldShowFloatOverlay: boolean;
 };
@@ -81,7 +75,6 @@ function buildTransitionStackState({
 	const allRoutes = routes.concat(preloadedRoutes);
 	const routeKeys: string[] = [];
 	const scenes: ScreenTransitionsAdapterScene[] = [];
-	const animationMaps: AnimationStoreMap[] = [];
 	const routeIndexByKey = new Map<string, number>();
 	let shouldShowFloatOverlay = false;
 
@@ -114,7 +107,6 @@ function buildTransitionStackState({
 			previousDescriptor,
 		});
 		routeKeys.push(route.key);
-		animationMaps.push(AnimationStore.getBag(route.key));
 		routeIndexByKey.set(route.key, sceneIndex);
 
 		if (
@@ -131,7 +123,6 @@ function buildTransitionStackState({
 		routes: allRoutes,
 		routeKeys,
 		scenes,
-		animationMaps,
 		routeIndexByKey,
 		shouldShowFloatOverlay,
 	};
@@ -155,9 +146,6 @@ function ScreenTransitionsStackContent({
 			}),
 		[layoutArgs.state, layoutArgs.descriptors],
 	);
-	const { optimisticFocusedIndex } = useStackDerived(
-		transitionState.animationMaps,
-	);
 	const stackContextValue = useMemo<StackContextValue>(
 		() => ({
 			flags,
@@ -165,7 +153,6 @@ function ScreenTransitionsStackContent({
 			routeKeys: transitionState.routeKeys,
 			routes: transitionState.routes as Route<string>[],
 			scenes: transitionState.scenes,
-			optimisticFocusedIndex,
 			focusedIndex: layoutArgs.state.index,
 		}),
 		[
@@ -175,7 +162,6 @@ function ScreenTransitionsStackContent({
 			transitionState.routeKeys,
 			transitionState.routes,
 			transitionState.scenes,
-			optimisticFocusedIndex,
 		],
 	);
 	const adapterContextValue = useMemo(

package/src/shared/components/create-boundary-component/hooks/use-measurer.ts

@@ -39,7 +39,7 @@ export const useMeasurer = ({
 	const { width: viewportWidth, height: viewportHeight } =
 		useWindowDimensions();
 
-	const scrollState = ScrollStore.getValue(currentScreenKey, "state");
+	const scrollState = ScrollStore.getValue(currentScreenKey, "coordination");
 	const pendingLifecycleStartBlockCount = SystemStore.getValue(
 		currentScreenKey,
 		"pendingLifecycleStartBlockCount",

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

@@ -12,7 +12,10 @@ import Animated, {
 } from "react-native-reanimated";
 import { NO_PROPS, NO_STYLES } from "../constants";
 import { RegisterBoundsProvider } from "../providers/register-bounds.provider";
-import { useScrollGestureCoordination } from "../providers/screen/gestures/scroll-coordination";
+import {
+	ScrollMetadataOwnerProvider,
+	useScrollGestureCoordination,
+} from "../providers/screen/gestures/scroll-coordination";
 import { useScreenStyles } from "../providers/screen/styles";
 import type { TransitionAwareProps } from "../types/screen.types";
 
@@ -55,6 +58,7 @@ export function createTransitionAwareComponent<P extends object>(
 			onContentSizeChange,
 			onLayout,
 			nativeGesture,
+			metadataOwnerProviderValue,
 		} = useScrollGestureCoordination({
 			onContentSizeChange: scrollableProps.onContentSizeChange,
 			onLayout: scrollableProps.onLayout,
@@ -89,14 +93,18 @@ export function createTransitionAwareComponent<P extends object>(
 			/>
 		);
 
-		if (!nativeGesture) {
-			return scrollableComponent;
-		}
-
-		return (
+		const coordinatedScrollableComponent = nativeGesture ? (
 			<GestureDetector gesture={nativeGesture}>
 				{scrollableComponent}
 			</GestureDetector>
+		) : (
+			scrollableComponent
+		);
+
+		return (
+			<ScrollMetadataOwnerProvider value={metadataOwnerProviderValue}>
+				{coordinatedScrollableComponent}
+			</ScrollMetadataOwnerProvider>
 		);
 	});
 

package/src/shared/components/overlay/variations/float-overlay.tsx

@@ -1,11 +1,9 @@
 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 { ScreenAnimationProvider } from "../../../providers/screen/animation";
 import type { BaseDescriptor } from "../../../providers/screen/descriptors";
 import { DescriptorsProvider } from "../../../providers/screen/descriptors";
-import { ScreenOptionsProvider } from "../../../providers/screen/options";
 import { ScreenStylesProvider } from "../../../providers/screen/styles";
 import type { OverlayScreenState } from "../../../types/overlay.types";
 
@@ -17,12 +15,7 @@ import { OverlayHost } from "./overlay-host";
  * Gets routes and descriptors from stack context.
  */
 export function FloatOverlay() {
-	const { scenes, optimisticFocusedIndex, flags, routes, routeKeys } =
-		useStack();
-	const focusedIndex = useOptimisticFocusedIndex(
-		optimisticFocusedIndex,
-		routeKeys.length,
-	);
+	const { scenes, focusedIndex, flags, routes, routeKeys } = useStack();
 
 	const activeOverlay = useMemo(
 		() =>
@@ -71,16 +64,11 @@ export function FloatOverlay() {
 
 	return (
 		<DescriptorsProvider current={current} previous={previous} next={next}>
-			<ScreenOptionsProvider>
-				<ScreenAnimationProvider>
-					<ScreenStylesProvider isFloatingOverlay>
-						<OverlayHost
-							scene={scene}
-							overlayScreenState={overlayScreenState}
-						/>
-					</ScreenStylesProvider>
-				</ScreenAnimationProvider>
-			</ScreenOptionsProvider>
+			<ScreenAnimationProvider>
+				<ScreenStylesProvider isFloatingOverlay>
+					<OverlayHost scene={scene} overlayScreenState={overlayScreenState} />
+				</ScreenStylesProvider>
+			</ScreenAnimationProvider>
 		</DescriptorsProvider>
 	);
 }

package/src/shared/components/scene-view.tsx

@@ -10,7 +10,7 @@ type SceneViewProps = {
 };
 
 /**
- * Shared scene view for managed stacks (blank-stack, component-stack).
+ * Shared scene view for JS-rendered stacks (blank-stack, component-stack).
  * Wraps screen render output with navigation context providers
  * and optional screen overlay.
  */

package/src/shared/components/screen-lifecycle/hooks/use-close-transition-intent.ts

@@ -5,8 +5,8 @@ import {
 	type BaseDescriptor,
 	useDescriptorDerivations,
 } from "../../../providers/screen/descriptors";
+import { useBlankStackContext } from "../../../providers/stack/blank-stack.provider";
 import { useStackCoreContext } from "../../../providers/stack/core.provider";
-import { useManagedStackContext } from "../../../providers/stack/managed.provider";
 import { GestureStore } from "../../../stores/gesture.store";
 import {
 	LifecycleTransitionRequestKind,
@@ -22,22 +22,25 @@ interface CloseHookParams {
 	resetStores: () => void;
 }
 
-const useManagedClose = ({
+const useBlankStackClose = ({
 	current,
 	requestLifecycleTransition,
 	resetStores,
 }: CloseHookParams) => {
-	const { handleCloseRoute } = useManagedStackContext();
+	const { handleCloseRoute } = useBlankStackContext();
 
 	useLayoutEffect(() => {
 		if (current.activity !== "closing") {
 			return;
 		}
 
-		requestLifecycleTransition(LifecycleTransitionRequestKind.ManagedClose, 0);
+		requestLifecycleTransition(
+			LifecycleTransitionRequestKind.BlankStackClose,
+			0,
+		);
 	}, [current.activity, requestLifecycleTransition]);
 
-	const handleManagedCloseEnd = useStableCallback((finished: boolean) => {
+	const handleBlankStackCloseEnd = useStableCallback((finished: boolean) => {
 		if (!finished) return;
 		handleCloseRoute({ route: current.route });
 		requestAnimationFrame(() => {
@@ -45,7 +48,7 @@ const useManagedClose = ({
 		});
 	});
 
-	return { handleManagedCloseEnd };
+	return { handleBlankStackCloseEnd };
 };
 
 /**
@@ -114,7 +117,7 @@ export function useCloseTransitionIntent(
 	current: BaseDescriptor,
 	system: SystemStoreMap,
 ): {
-	handleManagedCloseEnd?: (finished: boolean) => void;
+	handleBlankStackCloseEnd?: (finished: boolean) => void;
 	handleNativeCloseEnd?: (finished: boolean) => void;
 } {
 	const routeKey = current.route.key;
@@ -136,5 +139,5 @@ export function useCloseTransitionIntent(
 		return useNativeStackClose(closeParams);
 	}
 
-	return useManagedClose(closeParams);
+	return useBlankStackClose(closeParams);
 }

package/src/shared/components/screen-lifecycle/hooks/use-transition-start-controller.ts

@@ -11,13 +11,13 @@ export const useTransitionStartController = ({
 	current,
 	animations,
 	system,
-	onManagedCloseFinish,
+	onBlankStackCloseFinish,
 	onNativeCloseFinish,
 }: {
 	current: BaseDescriptor;
 	animations: AnimationStoreMap;
 	system: SystemStoreMap;
-	onManagedCloseFinish?: (finished: boolean) => void;
+	onBlankStackCloseFinish?: (finished: boolean) => void;
 	onNativeCloseFinish?: (finished: boolean) => void;
 }) => {
 	const {
@@ -51,8 +51,8 @@ export const useTransitionStartController = ({
 			}
 
 			const onAnimationFinish =
-				kind === LifecycleTransitionRequestKind.ManagedClose
-					? onManagedCloseFinish
+				kind === LifecycleTransitionRequestKind.BlankStackClose
+					? onBlankStackCloseFinish
 					: kind === LifecycleTransitionRequestKind.NativeClose
 						? onNativeCloseFinish
 						: undefined;

package/src/shared/components/screen-lifecycle/index.tsx

@@ -20,7 +20,7 @@ export const ScreenLifecycle = ({ children }: Props) => {
 	const animations = AnimationStore.getBag(current.route.key);
 	const system = SystemStore.getBag(current.route.key);
 
-	const { handleManagedCloseEnd, handleNativeCloseEnd } =
+	const { handleBlankStackCloseEnd, handleNativeCloseEnd } =
 		useCloseTransitionIntent(current, system);
 
 	useOpenTransitionIntent(current, animations, system);
@@ -29,7 +29,7 @@ export const ScreenLifecycle = ({ children }: Props) => {
 		current,
 		animations,
 		system,
-		onManagedCloseFinish: handleManagedCloseEnd,
+		onBlankStackCloseFinish: handleBlankStackCloseEnd,
 		onNativeCloseFinish: handleNativeCloseEnd,
 	});
 

package/src/shared/constants.ts

@@ -48,6 +48,7 @@ const DEFAULT_RAW_GESTURE_VALUES = {
 	normY: 0,
 	scale: 1,
 	normScale: 0,
+	rotation: 0,
 } as const;
 
 const DEFAULT_GESTURE_VALUES = {
@@ -182,14 +183,3 @@ export const FALSE = 0;
  * Small value for floating-point comparisons to handle animation/interpolation imprecision
  */
 export const EPSILON = 1e-5;
-
-/**
- * Number of consecutive frames progress must remain near its target before it
- * is treated as logically settled.
- */
-export const LOGICAL_SETTLE_REQUIRED_FRAMES = 5;
-
-/**
- * Progress distance from target required for logical settle.
- */
-export const LOGICAL_SETTLE_PROGRESS_THRESHOLD = 0.001;

package/src/shared/hooks/navigation/use-screen-state.ts

@@ -7,7 +7,6 @@ import {
 } from "../../providers/screen/descriptors";
 import type { ScreenTransitionConfig } from "../../types/screen.types";
 import type { BaseStackNavigation } from "../../types/stack.types";
-import { useOptimisticFocusedIndex } from "./use-optimistic-focused-index";
 import { type StackContextValue, useStack } from "./use-stack";
 
 export interface ScreenState<
@@ -64,7 +63,7 @@ export interface ScreenState<
 export function useScreenState<
 	TNavigation extends BaseStackNavigation = BaseStackNavigation,
 >(): ScreenState<TNavigation> {
-	const { routes, scenes, routeKeys, optimisticFocusedIndex } =
+	const { routes, scenes, routeKeys, focusedIndex } =
 		useStack<StackContextValue>();
 	const { current } = useDescriptors<BaseDescriptor>();
 
@@ -73,11 +72,6 @@ export function useScreenState<
 		[routeKeys, current.route.key],
 	);
 
-	const focusedIndex = useOptimisticFocusedIndex(
-		optimisticFocusedIndex,
-		routeKeys.length,
-	);
-
 	const focusedScene = useMemo(() => {
 		return scenes[focusedIndex] ?? scenes[scenes.length - 1];
 	}, [scenes, focusedIndex]);

package/src/shared/hooks/navigation/use-stack.tsx

@@ -8,7 +8,6 @@ import {
 	useRef,
 	useSyncExternalStore,
 } from "react";
-import type { DerivedValue } from "react-native-reanimated";
 import type { StackCoreContextValue } from "../../providers/stack/core.provider";
 import type { OverlayProps } from "../../types/overlay.types";
 import type {
@@ -41,7 +40,6 @@ export interface StackContextValue extends StackCoreContextValue {
 	routeKeys: string[];
 	routes: Route<string>[];
 	scenes: StackScene[];
-	optimisticFocusedIndex: DerivedValue<number>;
 	focusedIndex: number;
 	requestDismiss?: StackDismissRequest;
 }

package/src/shared/index.ts

@@ -65,6 +65,10 @@ export type {
 	ScreenTransitionConfig,
 	ScreenTransitionDepthTarget,
 	ScreenTransitionTarget,
+	ScrollGestureAxis,
+	ScrollGestureAxisState,
+	ScrollGestureState,
+	ScrollMetadataState,
 	TransitionInterpolatedStyle,
 	TransitionSlotStyle,
 	TransitionSpec,

package/src/shared/providers/screen/animation/helpers/accessors/use-build-transition-accessor.ts

@@ -44,25 +44,30 @@ export const createTransitionAccessor = (
 ) => {
 	"worklet";
 
-	const getSources = (): TransitionAccessorSource[] => {
+	const getSources = (): readonly TransitionAccessorSource[] => {
 		"worklet";
 		if (!descendantSources) {
-			return [...sources];
+			return sources;
 		}
 
 		const descendants = descendantSources.get();
 		if (descendants.length === 0) {
-			return [...sources];
+			return sources;
 		}
 
-		return [...sources, ...descendants.map(({ source }) => source)];
+		const currentSources = sources.slice();
+		for (let index = 0; index < descendants.length; index++) {
+			currentSources.push(descendants[index].source);
+		}
+
+		return currentSources;
 	};
 
 	const buildScope = (
 		sourceIndex: TransitionSourceIndex,
+		currentSources: readonly TransitionAccessorSource[],
 	): ScreenInterpolationProps | null => {
 		"worklet";
-		const currentSources = getSources();
 		const source = currentSources[sourceIndex];
 		if (!source) return null;
 
@@ -84,7 +89,7 @@ export const createTransitionAccessor = (
 					return null;
 				}
 
-				return buildScope(targetIndex);
+				return buildScope(targetIndex, currentSources);
 			},
 		};
 	};
@@ -101,7 +106,7 @@ export const createTransitionAccessor = (
 			return null;
 		}
 
-		return buildScope(targetIndex);
+		return buildScope(targetIndex, currentSources);
 	};
 };
 
@@ -127,26 +132,24 @@ export const useBuildTransitionAccessor = () => {
 			screenInterpolatorPropsRevision,
 		};
 
-		const ancestorTransitionSources = ancestorScreenAnimationSources.map(
-			(source) => ({
+		const transitionSources: TransitionAccessorSource[] =
+			ancestorScreenAnimationSources.map((source) => ({
 				...source,
 				boundsAccessor: buildSourceBoundsAccessor(source),
-			}),
-		);
+			}));
 
 		const selfTransitionSource = {
 			...selfSource,
 			boundsAccessor: buildSourceBoundsAccessor(selfSource),
 		};
 
-		const transitionSources: TransitionAccessorSource[] = [
-			...[...ancestorTransitionSources].reverse(),
-			selfTransitionSource,
-		];
+		transitionSources.reverse();
+		const originIndex = transitionSources.length;
+		transitionSources.push(selfTransitionSource);
 
 		return createTransitionAccessor(
 			transitionSources,
-			ancestorTransitionSources.length,
+			originIndex,
 			descendantScreenAnimationSources,
 		);
 	}, [