react-native-screen-transitions 3.10.0 → 3.11.1

package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts

@@ -2,7 +2,7 @@ import type {
 	NormalizedTransitionInterpolatedStyle,
 	NormalizedTransitionSlotStyle,
 } from "../../../../../types/animation.types";
-import { shouldSlotInherit } from "../../constants";
+import { isReservedStyleSlot, shouldSlotInherit } from "../../constants";
 import { materializeResolvedSlot } from "./materialize-slot";
 import { getResolvedSlotState } from "./slot-state";
 import type {
@@ -72,15 +72,79 @@ const hasResettableDisappearedKeys = (
 	return false;
 };
 
+const mergeStateRecord = <Value>(
+	previous: Record<string, Value> | undefined,
+	current: Record<string, Value> | undefined,
+): Record<string, Value> | undefined => {
+	"worklet";
+
+	if (!previous) {
+		return current;
+	}
+
+	if (!current) {
+		return previous;
+	}
+
+	return {
+		...previous,
+		...current,
+	};
+};
+
+const mergeResettableStyleStates = (
+	previousState: ResettableStyleState | undefined,
+	currentState: ResettableStyleState | undefined,
+): ResettableStyleState | undefined => {
+	"worklet";
+
+	if (!previousState) {
+		return currentState;
+	}
+
+	if (!currentState) {
+		return previousState;
+	}
+
+	return {
+		styleKeys: mergeStateRecord(
+			previousState.styleKeys,
+			currentState.styleKeys,
+		),
+		styleResetValues: mergeStateRecord(
+			previousState.styleResetValues,
+			currentState.styleResetValues,
+		),
+		propKeys: mergeStateRecord(previousState.propKeys, currentState.propKeys),
+		propResetValues: mergeStateRecord(
+			previousState.propResetValues,
+			currentState.propResetValues,
+		),
+	};
+};
+
 const getResolvedSlotOutput = ({
 	slot,
 	previousState,
+	deferMissingKeyResets,
 }: {
 	slot: NormalizedTransitionSlotStyle | undefined;
 	previousState: ResettableStyleState | undefined;
+	deferMissingKeyResets: boolean;
 }) => {
 	"worklet";
 	const state = getResolvedSlotState(slot);
+
+	if (deferMissingKeyResets) {
+		// This used to force a reset when animationProgress reached zero during
+		// close. Zero is still drawable while ownership and native visibility
+		// settle, so it is not a safe cleanup boundary for reserved slots.
+		return {
+			resolvedSlot: getForwardedSlot(slot, state.hasAnyKeys),
+			nextState: mergeResettableStyleStates(previousState, state.nextState),
+		};
+	}
+
 	const hasStyleResetPatch = hasResettableDisappearedKeys(
 		previousState?.styleKeys,
 		previousState?.styleResetValues,
@@ -401,6 +465,7 @@ const appendResolvedSlot = (
 	const { resolvedSlot, nextState } = getResolvedSlotOutput({
 		slot: getSlotForId(context, slotId),
 		previousState: context.previousStyleStatesBySlot[slotId],
+		deferMissingKeyResets: isReservedStyleSlot(slotId),
 	});
 
 	writeResolvedSlotOutput({
@@ -470,9 +535,11 @@ const appendPreviousSlots = (context: ResolveSlotStylesContext) => {
 };
 
 /**
- * Resolves slot styles for the current screen pass and emits reset values for
- * transition-owned keys that existed in the previous resolved map but no longer
- * exist in the current one.
+ * Resolves slot styles for the current screen pass.
+ *
+ * Custom slots reset omitted keys immediately. Reserved screen slots retain
+ * omitted keys because lifecycle progress does not define a safe visual reset
+ * boundary.
  */
 export const resolveSlotStyles = ({
 	localStylesMaps,

package/src/shared/providers/screen/styles/helpers/select-interpolator-frame.ts

@@ -0,0 +1,41 @@
+import type { ScreenInterpolatorFrame } from "../../animation/helpers/pipeline";
+
+export type SelectedInterpolatorFrame = Pick<
+	ScreenInterpolatorFrame,
+	| "progress"
+	| "transitionProgress"
+	| "next"
+	| "focused"
+	| "active"
+	| "inactive"
+	| "logicallySettled"
+>;
+
+export const selectInterpolatorFrame = (
+	frame: ScreenInterpolatorFrame,
+	useCurrentOnly: boolean,
+): SelectedInterpolatorFrame => {
+	"worklet";
+
+	if (!useCurrentOnly) {
+		return {
+			progress: frame.progress,
+			transitionProgress: frame.transitionProgress,
+			next: frame.next,
+			focused: frame.focused,
+			active: frame.active,
+			inactive: frame.inactive,
+			logicallySettled: frame.logicallySettled,
+		};
+	}
+
+	return {
+		progress: frame.current.progress,
+		transitionProgress: frame.current.transitionProgress,
+		next: undefined,
+		focused: true,
+		active: frame.current,
+		inactive: frame.previous,
+		logicallySettled: frame.current.settled,
+	};
+};

package/src/shared/providers/screen/styles/helpers/visibility-gate.ts

@@ -18,6 +18,31 @@ type ScreenVisibilityGateDecision = {
 	shouldOpenGate: boolean;
 };
 
+type InitialDestinationStyleGateState = {
+	shouldPrepareStyles: boolean;
+	isVisibilityBlocked: boolean;
+	stylesReady: boolean;
+};
+
+type InitialDestinationStyleGateDecision = {
+	shouldMarkStylesReady: boolean;
+	shouldWithholdStyles: boolean;
+};
+
+export const resolveInitialDestinationStyleGate = ({
+	shouldPrepareStyles,
+	isVisibilityBlocked,
+	stylesReady,
+}: InitialDestinationStyleGateState): InitialDestinationStyleGateDecision => {
+	"worklet";
+
+	return {
+		shouldMarkStylesReady:
+			shouldPrepareStyles && isVisibilityBlocked && !stylesReady,
+		shouldWithholdStyles: shouldPrepareStyles && !stylesReady,
+	};
+};
+
 export const resolveScreenVisibilityGate = ({
 	isFloatingOverlay,
 	hasVisibilityGateOpened,

package/src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx

@@ -1,5 +1,10 @@
 import { useMemo } from "react";
-import { useDerivedValue, useSharedValue } from "react-native-reanimated";
+import {
+	type SharedValue,
+	useAnimatedReaction,
+	useDerivedValue,
+	useSharedValue,
+} from "react-native-reanimated";
 import { NO_STYLES } from "../../../../constants";
 import { AnimationStore } from "../../../../stores/animation.store";
 import {
@@ -12,7 +17,7 @@ import type {
 	TransitionInterpolatedStyle,
 } from "../../../../types/animation.types";
 import { logger } from "../../../../utils/logger";
-import { useScreenAnimationContext } from "../../animation";
+import { useScreenAnimationStore } from "../../animation";
 import { useBuildBoundsAccessor } from "../../animation/helpers/accessors/use-build-bounds-accessor";
 import { useBuildTransitionAccessor } from "../../animation/helpers/accessors/use-build-transition-accessor";
 import type { ScreenInterpolatorFrame } from "../../animation/helpers/pipeline";
@@ -21,16 +26,22 @@ import { syncSelectedInterpolatorOptions } from "../../animation/helpers/selecte
 import { useDescriptorsStore } from "../../descriptors";
 import {
 	syncScreenOptionsOverrides,
-	useScreenOptionsContext,
+	useScreenOptionsStore,
 } from "../../options";
 import { collectInterpolatorSharedValues } from "../helpers/collect-interpolator-shared-values";
 import { normalizeSlots } from "../helpers/normalize-slots";
+import { resolveInterpolatorStyleHandoff } from "../helpers/resolve-interpolator-style-handoff";
 import type { LocalStyleLayers } from "../helpers/resolve-slot-styles";
+import {
+	type SelectedInterpolatorFrame,
+	selectInterpolatorFrame,
+} from "../helpers/select-interpolator-frame";
 import { stripInterpolatorOptions } from "../helpers/strip-interpolator-options";
 import {
 	hasCloseTransitionFinished,
 	isOpenTransitionBlocked,
 } from "../helpers/transition-visual-state";
+import { resolveInitialDestinationStyleGate } from "../helpers/visibility-gate";
 
 const NO_STYLE_LAYERS: LocalStyleLayers = [];
 
@@ -42,8 +53,7 @@ type InterpolatorResult = {
 type RunInterpolatorParams = {
 	interpolator: ScreenStyleInterpolator | undefined;
 	props: ScreenInterpolatorFrame;
-	progress: ScreenInterpolatorFrame["progress"];
-	next: ScreenInterpolatorFrame["next"];
+	selectedFrame: SelectedInterpolatorFrame;
 	bounds: Parameters<ScreenStyleInterpolator>[0]["bounds"];
 	transition: Parameters<ScreenStyleInterpolator>[0]["transition"];
 };
@@ -65,8 +75,7 @@ const normalizeRawStyleMap = (
 const runInterpolator = ({
 	interpolator,
 	props,
-	progress,
-	next,
+	selectedFrame,
 	bounds,
 	transition,
 }: RunInterpolatorParams): InterpolatorResult | undefined => {
@@ -79,8 +88,7 @@ const runInterpolator = ({
 	try {
 		const raw = interpolator({
 			...props,
-			progress,
-			next,
+			...selectedFrame,
 			bounds,
 			transition,
 		});
@@ -101,17 +109,6 @@ const runInterpolator = ({
 	}
 };
 
-const appendLayer = (
-	layers: LocalStyleLayers,
-	result: InterpolatorResult | undefined,
-) => {
-	"worklet";
-
-	if (result) {
-		layers.push(result.stylesMap);
-	}
-};
-
 /**
  * Builds the raw interpolated style layers for the current screen pass.
  *
@@ -128,16 +125,26 @@ const appendLayer = (
  * normal interpolator selection once the gesture-driven close is no longer in
  * play.
  *
- * The result is ordered from lowest to highest priority. Resolution happens
- * downstream, where slot ids determine whether slots inherit from ancestors and
- * where higher owner layers override lower owner layers per key.
+ * At an ownership handoff, the current interpolator remains live but is
+ * evaluated without the next-screen relationship. The next owner replaces
+ * matching scalar keys and composes its live transforms after the current
+ * screen's self-owned transforms.
  */
-export const useInterpolatedStylesMap = () => {
+export const useInterpolatedStylesMap = ({
+	enabled,
+	visibilityBlocked,
+}: {
+	enabled: boolean;
+	visibilityBlocked: SharedValue<boolean>;
+}) => {
 	const currentScreenKey = useDescriptorsStore(
 		(s) => s.derivations.currentScreenKey,
 	);
 	const nextScreenKey = useDescriptorsStore((s) => s.derivations.nextScreenKey);
-	const screenOptions = useScreenOptionsContext();
+	const destinationPairKey = useDescriptorsStore(
+		(s) => s.derivations.destinationPairKey,
+	);
+	const screenOptions = useScreenOptionsStore();
 	const {
 		screenInterpolatorProps,
 		screenInterpolatorPropsRevision,
@@ -146,7 +153,7 @@ export const useInterpolatedStylesMap = () => {
 		currentInterpolator,
 		ancestorScreenAnimationSources,
 		descendantScreenAnimationSources,
-	} = useScreenAnimationContext();
+	} = useScreenAnimationStore();
 	const boundsAccessor = useBuildBoundsAccessor();
 	const transition = useBuildTransitionAccessor();
 	const nextInterpolatorReady = useSharedValue(0);
@@ -169,6 +176,28 @@ export const useInterpolatedStylesMap = () => {
 	} = SystemStore.getBag(activeScreenKey);
 
 	const isGesturingDuringCloseAnimation = useSharedValue(false);
+	const initialDestinationStylesReady = useSharedValue(0);
+	const shouldPrepareInitialDestinationStyles =
+		enabled && !!destinationPairKey && !nextScreenKey && !!currentInterpolator;
+
+	useAnimatedReaction(
+		() => {
+			"worklet";
+			return visibilityBlocked.get();
+		},
+		(isVisibilityBlocked) => {
+			"worklet";
+			const styleGate = resolveInitialDestinationStyleGate({
+				shouldPrepareStyles: shouldPrepareInitialDestinationStyles,
+				isVisibilityBlocked,
+				stylesReady: !!initialDestinationStylesReady.get(),
+			});
+
+			if (styleGate.shouldMarkStylesReady) {
+				initialDestinationStylesReady.set(1);
+			}
+		},
+	);
 
 	const localStylesMaps = useDerivedValue<LocalStyleLayers>(() => {
 		"worklet";
@@ -180,7 +209,7 @@ export const useInterpolatedStylesMap = () => {
 		);
 		const props = screenInterpolatorProps.get();
 
-		const { current, next, progress } = props;
+		const { current, next } = props;
 		const isDragging = current.gesture.dragging;
 		const isNextClosing = !!next?.closing;
 
@@ -230,23 +259,32 @@ export const useInterpolatedStylesMap = () => {
 			? "current"
 			: "next";
 
-		let selectedProgress = progress;
-		let selectedNext = next;
-
-		if (isInGestureMode) {
-			selectedProgress = current.progress;
-			selectedNext = undefined;
-		}
-
+		// Once the next interpolator owns the relationship, the current
+		// interpolator remains responsible only for its own live presentation.
+		// This preserves snap-point transforms without letting current-screen
+		// unfocus rules compete with the next screen's outgoing transition.
+		const currentSelectedFrame = selectInterpolatorFrame(
+			props,
+			isInGestureMode || !!nextInterpolator,
+		);
 		const currentResult = runInterpolator({
 			interpolator: currentInterpolator,
 			props,
-			progress: selectedProgress,
-			next: selectedNext,
+			selectedFrame: currentSelectedFrame,
 			bounds: boundsAccessor,
 			transition,
 		});
 
+		const initialDestinationStyleGate = resolveInitialDestinationStyleGate({
+			shouldPrepareStyles: shouldPrepareInitialDestinationStyles,
+			isVisibilityBlocked: visibilityBlocked.get(),
+			stylesReady: !!initialDestinationStylesReady.get(),
+		});
+
+		if (initialDestinationStyleGate.shouldWithholdStyles) {
+			return NO_STYLE_LAYERS;
+		}
+
 		if (interpolatorOptionsOwner === "current") {
 			syncSelectedInterpolatorOptions(
 				selectedInterpolatorOptions,
@@ -255,18 +293,22 @@ export const useInterpolatedStylesMap = () => {
 			);
 			syncScreenOptionsOverrides(currentResult?.rawStyleMap, screenOptions);
 
-			if (!currentResult) {
-				return NO_STYLE_LAYERS;
-			}
+			const handoff = resolveInterpolatorStyleHandoff({
+				currentOwnsInterpolator: true,
+				currentStylesMap: currentResult?.stylesMap,
+				nextStylesMap: undefined,
+			});
 
-			return [currentResult.stylesMap];
+			return handoff.localStylesMaps.length
+				? handoff.localStylesMaps
+				: NO_STYLE_LAYERS;
 		}
 
+		const nextSelectedFrame = selectInterpolatorFrame(props, false);
 		const nextResult = runInterpolator({
 			interpolator: nextInterpolator,
 			props,
-			progress: selectedProgress,
-			next: selectedNext,
+			selectedFrame: nextSelectedFrame,
 			bounds: boundsAccessor,
 			transition,
 		});
@@ -278,16 +320,15 @@ export const useInterpolatedStylesMap = () => {
 		);
 		syncScreenOptionsOverrides(undefined, screenOptions);
 
-		const layers: LocalStyleLayers = [];
-
-		appendLayer(layers, currentResult);
-		appendLayer(layers, nextResult);
-
-		if (layers.length === 0) {
-			return NO_STYLE_LAYERS;
-		}
+		const handoff = resolveInterpolatorStyleHandoff({
+			currentOwnsInterpolator: false,
+			currentStylesMap: currentResult?.stylesMap,
+			nextStylesMap: nextResult?.stylesMap,
+		});
 
-		return layers;
+		return handoff.localStylesMaps.length
+			? handoff.localStylesMaps
+			: NO_STYLE_LAYERS;
 	});
 
 	return {

package/src/shared/providers/screen/styles/hooks/use-maybe-block-visibility.tsx

@@ -8,13 +8,15 @@ import {
 import { AnimationStore } from "../../../../stores/animation.store";
 import { SystemStore } from "../../../../stores/system.store";
 import { getVisibilityBlockOffset } from "../../../../utils/visibility-block-offset";
-import { useDescriptorDerivations } from "../../descriptors";
+import { useDescriptorsStore } from "../../descriptors";
 import { hasCloseTransitionFinished } from "../helpers/transition-visual-state";
 import { resolveScreenVisibilityGate } from "../helpers/visibility-gate";
 
 export const useMaybeBlockVisibility = (isFloatingOverlay?: boolean) => {
 	const { height } = useWindowDimensions();
-	const { currentScreenKey } = useDescriptorDerivations();
+	const currentScreenKey = useDescriptorsStore(
+		(store) => store.derivations.currentScreenKey,
+	);
 	const { closing, entering } = AnimationStore.getBag(currentScreenKey);
 	const {
 		animationProgress,

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

@@ -7,7 +7,6 @@ export {
 } from "./hooks/slot-resolvers";
 
 export {
-	ScreenSlotContext,
 	type ScreenSlotName,
 	ScreenSlotProvider,
 	useScreenSlots,

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

@@ -1,4 +1,4 @@
-import { type ReactNode, useContext, useLayoutEffect, useMemo } from "react";
+import { type ReactNode, useLayoutEffect, useMemo } from "react";
 import { StyleSheet } from "react-native";
 import Animated, { type SharedValue } from "react-native-reanimated";
 import type {
@@ -37,58 +37,72 @@ export type ScreenSlotContextValue = {
 	visibilityBlocked: SharedValue<boolean>;
 };
 
-export const {
-	ScreenSlotProvider,
-	ScreenSlotContext,
-	useScreenSlotContext: useScreenSlots,
-} = createProvider("ScreenSlot", {
-	guarded: true,
-})<Props, ScreenSlotContextValue>(({ children, isFloatingOverlay }) => {
-	const parentContext = useContext(ScreenSlotContext);
-	const currentScreenKey = useDescriptorsStore(
-		(s) => s.derivations.currentScreenKey,
-	);
+export const { ScreenSlotProvider, useScreenSlotStore: useScreenSlots } =
+	createProvider("ScreenSlot", {
+		guarded: true,
+	})<Props, ScreenSlotContextValue>(
+		({ children, isFloatingOverlay }, { useParentStore }) => {
+			const parentContext = useParentStore();
+			const currentScreenKey = useDescriptorsStore(
+				(s) => s.derivations.currentScreenKey,
+			);
 
-	const { localStylesMaps, nextInterpolatorReady } = useInterpolatedStylesMap();
+			const { animatedStyle, animatedProps, shouldBlockVisibility } =
+				useMaybeBlockVisibility(isFloatingOverlay);
 
-	const slotsMap = useResolvedStylesMap({
-		localStylesMaps,
-		ancestorStylesMap: parentContext?.slotsMap,
-	});
-	const { animatedStyle, animatedProps, shouldBlockVisibility } =
-		useMaybeBlockVisibility(isFloatingOverlay);
-	const value = useMemo(
-		() => ({
-			localStylesMaps,
-			nextInterpolatorReady,
-			slotsMap,
-			visibilityBlocked: shouldBlockVisibility,
-		}),
-		[localStylesMaps, nextInterpolatorReady, shouldBlockVisibility, slotsMap],
-	);
+			const { localStylesMaps, nextInterpolatorReady } =
+				useInterpolatedStylesMap({
+					enabled: !isFloatingOverlay,
+					visibilityBlocked: shouldBlockVisibility,
+				});
 
-	useLayoutEffect(() => {
-		registerScreenSlots(currentScreenKey, value);
+			const slotsMap = useResolvedStylesMap({
+				localStylesMaps,
+				ancestorStylesMap: parentContext?.slotsMap,
+			});
+			const value = useMemo(
+				() => ({
+					localStylesMaps,
+					nextInterpolatorReady,
+					slotsMap,
+					visibilityBlocked: shouldBlockVisibility,
+				}),
+				[
+					localStylesMaps,
+					nextInterpolatorReady,
+					shouldBlockVisibility,
+					slotsMap,
+				],
+			);
 
-		return () => {
-			unregisterScreenSlots(currentScreenKey, value);
-		};
-	}, [currentScreenKey, value]);
+			useLayoutEffect(() => {
+				registerScreenSlots(currentScreenKey, value);
 
-	return {
-		value,
-		children: (
-			<FloatingOverlayLayer enabled={isFloatingOverlay}>
-				<Animated.View
-					style={[styles.container, animatedStyle]}
-					animatedProps={animatedProps}
-				>
-					{children}
-				</Animated.View>
-			</FloatingOverlayLayer>
-		),
-	};
-});
+				return () => {
+					unregisterScreenSlots(currentScreenKey, value);
+				};
+			}, [currentScreenKey, value]);
+
+			const content = useMemo(
+				() => (
+					<FloatingOverlayLayer enabled={isFloatingOverlay}>
+						<Animated.View
+							style={[styles.container, animatedStyle]}
+							animatedProps={animatedProps}
+						>
+							{children}
+						</Animated.View>
+					</FloatingOverlayLayer>
+				),
+				[children, animatedStyle, isFloatingOverlay, animatedProps],
+			);
+
+			return {
+				value,
+				children: content,
+			};
+		},
+	);
 
 const styles = StyleSheet.create({
 	container: { flex: 1 },

package/src/shared/providers/stack/blank-stack-state/helpers/build-blank-stack-state.ts

@@ -138,20 +138,6 @@ const getSceneActivityWindow = <
 	};
 };
 
-const withDescriptorActivityState = <TDescriptor extends BaseStackDescriptor>(
-	descriptor: StackDescriptorSource<TDescriptor>,
-	activity: StackSceneActivity,
-): TDescriptor => {
-	if (descriptor.activity === activity) {
-		return descriptor as TDescriptor;
-	}
-
-	return {
-		...descriptor,
-		activity,
-	} as TDescriptor;
-};
-
 const buildBaseScenes = <
 	TDescriptor extends BaseStackDescriptor,
 	TNavigation extends BaseStackNavigation,
@@ -207,10 +193,9 @@ const buildBaseScenes = <
 			childStateUnchanged &&
 			previousDescriptor.route === sourceDescriptor.route &&
 			previousDescriptor.navigation === sourceDescriptor.navigation &&
-			previousDescriptor.options === sourceDescriptor.options &&
-			previousDescriptor.activity === activity
+			previousDescriptor.options === sourceDescriptor.options
 				? previousDescriptor
-				: withDescriptorActivityState(sourceDescriptor, activity);
+				: (sourceDescriptor as TDescriptor);
 
 		routeKeys.push(route.key);
 		routeChildStates[route.key] = routeChildState;
@@ -222,6 +207,7 @@ const buildBaseScenes = <
 		}
 
 		scenes.push({
+			activity,
 			route: descriptor.route,
 			descriptor,
 		});
@@ -289,6 +275,7 @@ const withSceneRelationships = <TDescriptor extends BaseStackDescriptor>({
 
 		if (
 			previousScene &&
+			previousScene.activity === nextScene.activity &&
 			previousScene.route === nextScene.route &&
 			previousScene.descriptor === nextScene.descriptor &&
 			previousScene.previousDescriptor === nextScene.previousDescriptor &&