react-native-screen-transitions 4.0.0-alpha.0 → 4.0.0-alpha.10

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

@@ -1,14 +1,10 @@
-import { useMemo } from "react";
-import { snapDescriptorToIndex } from "../../../animation/snap-to";
-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 { ScreenSlotProvider } from "../../../providers/screen/styles";
-import type { OverlayScreenState } from "../../../types/overlay.types";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import { useStackCoreStore } from "../../../providers/stack/core.provider";
 
-import { getActiveFloatOverlay } from "../helpers/get-active-overlay";
+import {
+	getFloatOverlayStack,
+	getFloatOverlayTransitions,
+} from "../helpers/get-active-overlay";
 import { OverlayHost } from "./overlay-host";
 
 /**
@@ -16,65 +12,28 @@ import { OverlayHost } from "./overlay-host";
  * Gets routes and descriptors from stack context.
  */
 export function FloatOverlay() {
-	const { scenes, focusedIndex, flags, routes, routeKeys } = useStack();
-
-	const activeOverlay = useMemo(
-		() =>
-			getActiveFloatOverlay(scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON),
-		[scenes, focusedIndex, flags.TRANSITIONS_ALWAYS_ON],
+	const scenes = useBlankStackStore((store) => store.scenes);
+	const transitionsAlwaysOn = useStackCoreStore(
+		(store) => store.flags.TRANSITIONS_ALWAYS_ON,
 	);
 
-	const overlayData = useMemo(() => {
-		if (!activeOverlay) return null;
-
-		const { scene, overlayIndex } = activeOverlay;
-		const previous = scenes[overlayIndex - 1]?.descriptor;
-		const current = scene.descriptor;
-		const next = scenes[overlayIndex + 1]?.descriptor;
-		const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
-		const focusedDescriptor = focusedScene?.descriptor;
-
-		const overlayScreenState: OverlayScreenState<BaseDescriptor["navigation"]> =
-			{
-				index: routeKeys.indexOf(current.route.key),
-				options: focusedDescriptor?.options ?? {},
-				routes,
-				focusedRoute: focusedScene?.route ?? current.route,
-				focusedIndex,
-				meta: focusedDescriptor?.options?.meta,
-				navigation: current.navigation,
-				snapTo: (index: number) => {
-					snapDescriptorToIndex(current, index);
-				},
-			};
-
-		return {
-			scene,
-			previous,
-			current,
-			next,
-			overlayScreenState,
-		};
-	}, [activeOverlay, scenes, focusedIndex, routeKeys, routes]);
-
-	if (!overlayData) {
+	const overlayStack = getFloatOverlayStack(scenes, transitionsAlwaysOn);
+	if (overlayStack.length === 0) {
 		return null;
 	}
 
-	const { scene, previous, current, next, overlayScreenState } = overlayData;
-
-	return (
-		<DescriptorsProvider current={current} previous={previous} next={next}>
-			<ScreenOptionsProvider>
-				<ScreenAnimationProvider>
-					<ScreenSlotProvider isFloatingOverlay>
-						<OverlayHost
-							scene={scene}
-							overlayScreenState={overlayScreenState}
-						/>
-					</ScreenSlotProvider>
-				</ScreenAnimationProvider>
-			</ScreenOptionsProvider>
-		</DescriptorsProvider>
+	const overlayTransitions = getFloatOverlayTransitions(overlayStack, scenes);
+
+	return overlayTransitions.map(
+		({ scene, activity, driverScene }, layerIndex) => (
+			<OverlayHost
+				key={scene.route.key}
+				scene={scene}
+				driverScene={driverScene}
+				previousOverlayScene={overlayTransitions[layerIndex - 1]?.scene}
+				activity={activity}
+				layerIndex={layerIndex}
+			/>
+		),
 	);
 }

package/src/components/overlay/variations/overlay-host.tsx

@@ -1,52 +1,164 @@
-import { memo, useMemo } from "react";
-import { Animated, StyleSheet, View } from "react-native";
-import { useDerivedValue } from "react-native-reanimated";
-import type { StackScene } from "../../../hooks/navigation/use-stack";
+import { memo, useMemo, useRef } from "react";
+import { StyleSheet, View } from "react-native";
+import Animated, { useDerivedValue } from "react-native-reanimated";
+import { snapDescriptorToIndex } from "../../../animation/snap-to";
 import { NavigationScreenProvider } from "../../../providers/navigation/navigation-host.provider";
-import { useScreenAnimation } from "../../../providers/screen/animation";
-import type { BaseDescriptor } from "../../../providers/screen/descriptors";
+import { useOptionalScreenAnimationStore } from "../../../providers/screen/animation";
+import type { ScreenAnimationContextValue } from "../../../providers/screen/animation/animation.provider";
+import {
+	type ScreenSlotContextValue,
+	useOptionalScreenSlotStore,
+} from "../../../providers/screen/styles/slot.provider";
+import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
+import type { OverlayProps } from "../../../types/overlay.types";
 import type {
-	OverlayProps,
-	OverlayScreenState,
-} from "../../../types/overlay.types";
+	FloatOverlayActivity,
+	FloatOverlayEntry,
+} from "../helpers/get-active-overlay";
+import {
+	type ReadyOverlayResources,
+	retainReadyOverlayResources,
+} from "../helpers/retain-ready-overlay-resources";
+import { useOverlaySlot } from "../hooks/use-overlay-slot";
 
 type OverlayHostProps = {
-	scene: StackScene;
-	overlayScreenState: OverlayScreenState<BaseDescriptor["navigation"]>;
+	scene: FloatOverlayEntry["scene"];
+	driverScene: FloatOverlayEntry["scene"];
+	previousOverlayScene?: FloatOverlayEntry["scene"];
+	activity: FloatOverlayActivity;
+	layerIndex: number;
 };
 
 export const OverlayHost = memo(function OverlayHost({
 	scene,
-	overlayScreenState,
+	driverScene,
+	previousOverlayScene,
+	activity,
+	layerIndex,
 }: OverlayHostProps) {
-	const OverlayComponent = scene.descriptor.options.overlay;
+	const overlayAnimationStore = useOptionalScreenAnimationStore(
+		scene.route.key,
+	);
+	const driverAnimationStore = useOptionalScreenAnimationStore(
+		driverScene.route.key,
+	);
+	const previousOverlayAnimationStore = useOptionalScreenAnimationStore(
+		previousOverlayScene?.route.key ?? scene.route.key,
+	);
+	const driverSlots = useOptionalScreenSlotStore(driverScene.route.key);
+	const overlayComponentRef = useRef(scene.descriptor.options.overlay);
+	const OverlayComponent = overlayComponentRef.current;
+	const readyResourcesRef = useRef<ReadyOverlayResources | null>(null);
+	readyResourcesRef.current = retainReadyOverlayResources(
+		readyResourcesRef.current,
+		overlayAnimationStore,
+		driverScene,
+		driverAnimationStore,
+		driverSlots,
+	);
+	const readyResources = readyResourcesRef.current;
+
+	if (!OverlayComponent || !readyResources) {
+		return null;
+	}
+
+	return (
+		<ReadyOverlayHost
+			scene={scene}
+			driverScene={readyResources.driverScene}
+			activity={activity}
+			layerIndex={layerIndex}
+			overlayAnimationStore={readyResources.overlayAnimationStore}
+			driverAnimationStore={readyResources.driverAnimationStore}
+			previousOverlayAnimationStore={
+				previousOverlayScene ? previousOverlayAnimationStore : undefined
+			}
+			driverSlots={readyResources.driverSlots}
+			OverlayComponent={OverlayComponent}
+		/>
+	);
+});
+
+type ReadyOverlayHostProps = OverlayHostProps & {
+	overlayAnimationStore: ScreenAnimationContextValue;
+	driverAnimationStore: ScreenAnimationContextValue;
+	previousOverlayAnimationStore?: ScreenAnimationContextValue | null;
+	driverSlots: ScreenSlotContextValue;
+	OverlayComponent: NonNullable<
+		FloatOverlayEntry["scene"]["descriptor"]["options"]["overlay"]
+	>;
+};
 
-	const screenAnimation = useScreenAnimation();
+function ReadyOverlayHost({
+	scene,
+	driverScene,
+	activity,
+	layerIndex,
+	overlayAnimationStore,
+	driverAnimationStore,
+	previousOverlayAnimationStore,
+	driverSlots,
+	OverlayComponent,
+}: ReadyOverlayHostProps) {
+	const { scenes, focusedIndex, routeKeys, routes } = useBlankStackStore();
+	const descriptor = scene.descriptor;
+	const focusedScene = scenes[focusedIndex] ?? scenes[scenes.length - 1];
+	const focusedDescriptor = focusedScene?.descriptor;
+	const { animatedProps, animatedStyle } = useOverlaySlot({
+		overlayAnimationStore,
+		overlayInterpolator: scene.descriptor.options.screenStyleInterpolator,
+		driverAnimationStore,
+		previousOverlayAnimationStore: previousOverlayAnimationStore ?? undefined,
+		driverInterpolator: driverScene.descriptor.options.screenStyleInterpolator,
+		interpolatorReady: driverSlots.interpolatorReady,
+		isIncoming: scene.route.key === driverScene.route.key,
+	});
 	const relativeProgress = useDerivedValue(() => {
 		"worklet";
-		return screenAnimation.get().stackProgress;
+		overlayAnimationStore.screenInterpolatorPropsRevision.get();
+		return overlayAnimationStore.screenInterpolatorProps.get().stackProgress;
 	});
 
-	const overlayProps: OverlayProps<BaseDescriptor["navigation"]> = useMemo(
+	const overlayProps: OverlayProps = useMemo(
 		() => ({
-			...overlayScreenState,
+			route: scene.route,
+			index: routeKeys.indexOf(scene.route.key),
+			options: focusedDescriptor?.options ?? {},
+			routes,
+			focusedRoute: focusedScene?.route ?? scene.route,
+			focusedIndex,
+			meta: focusedDescriptor?.options?.meta,
+			navigation: scene.descriptor.navigation,
+			snapTo: (index: number) => {
+				snapDescriptorToIndex(scene.descriptor, index);
+			},
 			progress: relativeProgress,
 		}),
-		[relativeProgress, overlayScreenState],
+		[
+			scene,
+			focusedDescriptor?.options,
+			focusedIndex,
+			focusedScene?.route,
+			relativeProgress,
+			routeKeys,
+			routes,
+		],
 	);
-
-	if (!OverlayComponent) {
-		return null;
-	}
-
 	return (
 		<Animated.View
-			pointerEvents="box-none"
-			style={[styles.container, styles.floating, StyleSheet.absoluteFill]}
+			animatedProps={animatedProps}
+			pointerEvents={activity === "active" ? "box-none" : "none"}
+			style={[
+				styles.container,
+				styles.floating,
+				StyleSheet.absoluteFill,
+				{ zIndex: 1000 + layerIndex },
+				animatedStyle,
+			]}
 		>
 			<NavigationScreenProvider
-				navigation={scene.descriptor.navigation}
-				route={scene.route}
+				navigation={descriptor.navigation}
+				route={descriptor.route}
 			>
 				<View
 					pointerEvents="box-none"
@@ -57,7 +169,7 @@ export const OverlayHost = memo(function OverlayHost({
 			</NavigationScreenProvider>
 		</Animated.View>
 	);
-});
+}
 
 const styles = StyleSheet.create({
 	overlay: {

package/src/components/screen-container/hooks/use-backdrop-pointer-events.ts

@@ -1,11 +1,9 @@
 import { useState } from "react";
 import { useAnimatedReaction } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
-import { useDescriptors } from "../../../providers/screen/descriptors";
-import { useScreenOptionsContext } from "../../../providers/screen/options";
-import { useStackCoreContext } from "../../../providers/stack/core.provider";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
+import { useScreenOptionsStore } from "../../../providers/screen/options";
 import type { BackdropBehavior } from "../../../types/screen.types";
-import { StackType } from "../../../types/stack.types";
 
 interface BackdropPointerEventsResult {
 	pointerEvents: "box-none" | undefined;
@@ -18,13 +16,13 @@ interface BackdropPointerEventsResult {
  *
  * - Runtime interpolator `backdropBehavior` takes precedence
  * - Explicit descriptor `backdropBehavior` option is next
- * - Component stacks default to 'passthrough' (box-none)
- * - Other stacks default to 'block' (undefined = normal touch handling)
+ * - Otherwise defaults to 'block' (undefined = normal touch handling)
  */
 export function useBackdropPointerEvents(): BackdropPointerEventsResult {
-	const { current } = useDescriptors();
-	const screenOptions = useScreenOptionsContext();
-	const { flags } = useStackCoreContext();
+	const screenOptions = useScreenOptionsStore();
+	const descriptorBackdropBehavior = useDescriptorsStore(
+		(store) => store.options.backdropBehavior,
+	);
 	const [runtimeBackdropBehavior, setRuntimeBackdropBehavior] = useState<
 		BackdropBehavior | undefined
 	>(undefined);
@@ -40,11 +38,8 @@ export function useBackdropPointerEvents(): BackdropPointerEventsResult {
 		[screenOptions],
 	);
 
-	const isComponentStack = flags.STACK_TYPE === StackType.COMPONENT;
 	const backdropBehavior: BackdropBehavior =
-		runtimeBackdropBehavior ??
-		current.options.backdropBehavior ??
-		(isComponentStack ? "passthrough" : "block");
+		runtimeBackdropBehavior ?? descriptorBackdropBehavior ?? "block";
 
 	const pointerEvents =
 		backdropBehavior === "passthrough" ? "box-none" : undefined;

package/src/components/screen-container/hooks/use-content-layout.ts

@@ -1,10 +1,7 @@
 import { useCallback } from "react";
 import { type LayoutChangeEvent, useWindowDimensions } from "react-native";
 import { scheduleOnUI } from "react-native-worklets";
-import {
-	useDescriptorDerivations,
-	useDescriptors,
-} from "../../../providers/screen/descriptors";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { AnimationStore } from "../../../stores/animation.store";
 import {
 	LifecycleTransitionRequestKind,
@@ -12,10 +9,16 @@ import {
 } from "../../../stores/system.store";
 
 export function useContentLayout() {
-	const { current } = useDescriptors();
-	const { isFirstKey } = useDescriptorDerivations();
+	const routeKey = useDescriptorsStore(
+		(store) => store.derivations.currentScreenKey,
+	);
+	const isFirstKey = useDescriptorsStore(
+		(store) => store.derivations.isFirstKey,
+	);
+	const experimental_animateOnInitialMount = useDescriptorsStore(
+		(store) => store.options.experimental_animateOnInitialMount,
+	);
 	const { height: screenHeight } = useWindowDimensions();
-	const routeKey = current.route.key;
 	const animations = AnimationStore.getBag(routeKey);
 	const system = SystemStore.getBag(routeKey);
 
@@ -23,9 +26,6 @@ export function useContentLayout() {
 		system;
 	const { requestLifecycleTransition } = system.actions;
 
-	const experimental_animateOnInitialMount =
-		current.options.experimental_animateOnInitialMount;
-
 	return useCallback(
 		(event: LayoutChangeEvent) => {
 			const { width, height } = event.nativeEvent.layout;

package/src/components/screen-container/layers/backdrop.tsx

@@ -1,10 +1,10 @@
 import { type ComponentType, memo, useCallback, useMemo } from "react";
 import { Pressable, StyleSheet } from "react-native";
 import Animated from "react-native-reanimated";
-import { scheduleOnUI } from "react-native-worklets";
+import { scheduleOnRN, scheduleOnUI } from "react-native-worklets";
 import { DefaultSnapSpec } from "../../../configs/specs";
 import { useNavigationHelpers } from "../../../hooks/navigation/use-navigation-helpers";
-import { useDescriptors } from "../../../providers/screen/descriptors";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
 import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import { AnimationStore } from "../../../stores/animation.store";
 import { GestureStore } from "../../../stores/gesture.store";
@@ -24,13 +24,26 @@ export const BackdropLayer = memo(function BackdropLayer({
 	backdropBehavior: BackdropBehavior;
 	isBackdropActive: boolean;
 }) {
-	const { current } = useDescriptors();
-	const { dismissScreen } = useNavigationHelpers();
+	const { requestDismiss } = useNavigationHelpers();
 
-	const BackdropComponent = current.options.backdropComponent;
-	const routeKey = current.route.key;
+	const routeKey = useDescriptorsStore(
+		(store) => store.derivations.currentScreenKey,
+	);
+	const BackdropComponent = useDescriptorsStore(
+		(store) => store.options.backdropComponent,
+	);
+	const rawSnapPoints = useDescriptorsStore(
+		(store) => store.options.snapPoints,
+	);
+	const isGestureDismissEnabled = useDescriptorsStore(
+		(store) => store.options.gestureEnabled !== false,
+	);
+	const canDismiss = isGestureDismissEnabled;
+	const transitionSpec = useDescriptorsStore(
+		(store) => store.options.transitionSpec,
+	);
 	const animations = AnimationStore.getBag(routeKey);
-	const { targetProgress, resolvedAutoSnapPoint } =
+	const { targetProgress, animationProgress, resolvedAutoSnapPoint } =
 		SystemStore.getBag(routeKey);
 
 	const AnimatedBackdropComponent = useMemo(
@@ -45,22 +58,18 @@ export const BackdropLayer = memo(function BackdropLayer({
 
 	const handleBackdropPress = useCallback(() => {
 		if (backdropBehavior === "dismiss") {
-			dismissScreen();
+			requestDismiss();
 			return;
 		}
 
 		if (backdropBehavior === "collapse") {
-			const rawSnapPoints = current.options.snapPoints;
-			const canDismiss = current.options.gestureEnabled !== false;
-
 			// No snap points → fallback to dismiss
 			if (!rawSnapPoints || rawSnapPoints.length === 0) {
-				dismissScreen();
+				requestDismiss();
 				return;
 			}
 
 			const gestures = GestureStore.getBag(routeKey);
-			const transitionSpec = current.options.transitionSpec;
 
 			scheduleOnUI(() => {
 				"worklet";
@@ -96,20 +105,28 @@ export const BackdropLayer = memo(function BackdropLayer({
 
 				animateToProgress({
 					target,
+					markEntering: false,
 					spec,
 					animations,
 					targetProgress,
-					onAnimationFinish: shouldDismiss ? dismissScreen : undefined,
+					animationProgress,
 				});
+
+				if (shouldDismiss) {
+					scheduleOnRN(requestDismiss);
+				}
 			});
 		}
 	}, [
 		animations,
 		targetProgress,
+		animationProgress,
 		resolvedAutoSnapPoint,
 		backdropBehavior,
-		current,
-		dismissScreen,
+		rawSnapPoints,
+		canDismiss,
+		transitionSpec,
+		requestDismiss,
 		routeKey,
 	]);
 

package/src/components/screen-container/layers/content.tsx

@@ -1,18 +1,16 @@
-/** biome-ignore-all lint/style/noNonNullAssertion: <Screen gesture is under the gesture context, so this will always exist.> */
 import { type ComponentType, memo, useMemo } from "react";
 import { StyleSheet, View } from "react-native";
 import { GestureDetector } from "react-native-gesture-handler";
 import Animated from "react-native-reanimated";
-import { useDescriptors } from "../../../providers/screen/descriptors";
-import { useGestureContext } from "../../../providers/screen/gestures";
-import { OriginProvider } from "../../../providers/screen/origin.provider";
+import { useDescriptorsStore } from "../../../providers/screen/descriptors";
+import { useScreenGestureStore } from "../../../providers/screen/gestures";
 import { useSlotProps, useSlotStyles } from "../../../providers/screen/styles";
 import type { ScreenContentComponentProps } from "../../../types";
 import { ScreenFallbackHost } from "../../boundary/portal/components/boundary-portal/components/host";
 import { useContentLayout } from "../hooks/use-content-layout";
 import { MaybeMaskedNavigationContainer } from "./maybe-masked-navigation-container";
 import { usesLayerRenderProps } from "./render-component";
-import { SurfaceContainer } from "./surface-container";
+import { SurfaceLayer } from "./surface";
 
 type Props = {
 	children: React.ReactNode;
@@ -22,11 +20,16 @@ type Props = {
 
 export const ContentLayer = memo(
 	({ children, pointerEvents, isBackdropActive }: Props) => {
-		const { current } = useDescriptors();
-
-		const gestureContext = useGestureContext();
-		const ContentComponent = current.options.contentComponent;
-		const isNavigationMaskEnabled = !!current.options.navigationMaskEnabled;
+		const gestureContext = useScreenGestureStore();
+		const ContentComponent = useDescriptorsStore(
+			(store) => store.options.contentComponent,
+		);
+		const isNavigationMaskEnabled = useDescriptorsStore(
+			(store) => !!store.options.navigationMaskEnabled,
+		);
+		const hasAutoSnapPoint = useDescriptorsStore(
+			(store) => store.options.snapPoints?.includes("auto") ?? false,
+		);
 		const contentPointerEvents = isBackdropActive ? "box-none" : pointerEvents;
 
 		const AnimatedContentComponent = useMemo(() => {
@@ -37,9 +40,6 @@ export const ContentLayer = memo(
 				: null;
 		}, [ContentComponent]);
 
-		const hasAutoSnapPoint =
-			current.options.snapPoints?.includes("auto") ?? false;
-
 		const handleContentLayout = useContentLayout();
 
 		const animatedContentStyle = useSlotStyles("content");
@@ -51,28 +51,28 @@ export const ContentLayer = memo(
 		const contentProps =
 			animatedContentProps as ScreenContentComponentProps["props"];
 
+		const screenChildren = hasAutoSnapPoint ? (
+			<View collapsable={false} onLayout={handleContentLayout}>
+				{children}
+			</View>
+		) : (
+			children
+		);
+
 		const contentChildren = (
 			<MaybeMaskedNavigationContainer
 				pointerEvents={contentPointerEvents}
 				enabled={isNavigationMaskEnabled}
 			>
-				<SurfaceContainer pointerEvents={contentPointerEvents}>
-					<OriginProvider>
-						{hasAutoSnapPoint ? (
-							<View collapsable={false} onLayout={handleContentLayout}>
-								{children}
-							</View>
-						) : (
-							children
-						)}
-						<ScreenFallbackHost />
-					</OriginProvider>
-				</SurfaceContainer>
+				<SurfaceLayer pointerEvents={contentPointerEvents}>
+					{screenChildren}
+				</SurfaceLayer>
+				<ScreenFallbackHost />
 			</MaybeMaskedNavigationContainer>
 		);
 
 		return (
-			<GestureDetector gesture={gestureContext!.detectorGesture}>
+			<GestureDetector gesture={gestureContext.detectorGesture}>
 				{AnimatedContentComponent ? (
 					<AnimatedContentComponent
 						style={contentStyles}

package/src/components/screen-container/layers/maybe-masked-navigation-container.tsx

@@ -1,5 +1,5 @@
 import { memo, useCallback } from "react";
-import { StyleSheet, View, type ViewProps } from "react-native";
+import { I18nManager, StyleSheet, View, type ViewProps } from "react-native";
 import Animated from "react-native-reanimated";
 import {
 	NAVIGATION_MASK_CONTAINER_STYLE_ID,
@@ -97,7 +97,17 @@ const styles = StyleSheet.create({
 	navigationContainer: {
 		flex: 1,
 	},
-	navigationMaskElement: {
-		backgroundColor: "white",
-	},
+	// The mask rect's translate math assumes a physical top-left base. Under
+	// native RTL a fixed-width flex child anchors to the right edge, so pin it
+	// to the physical left (`end` = left edge in RTL).
+	navigationMaskElement: I18nManager.isRTL
+		? {
+				backgroundColor: "white",
+				end: 0,
+				position: "absolute",
+				top: 0,
+			}
+		: {
+				backgroundColor: "white",
+			},
 });