react-native-screen-transitions 4.0.0-alpha.6 → 4.0.0-alpha.8

package/src/providers/stack/core.provider.tsx

@@ -6,14 +6,10 @@ import {
 	SafeAreaInsetsContext,
 	SafeAreaProvider,
 } from "react-native-safe-area-context";
-import { StackType } from "../../types/stack.types";
 import createProvider from "../../utils/create-provider";
 
 export interface StackCoreConfig {
 	TRANSITIONS_ALWAYS_ON?: boolean;
-	STACK_TYPE?: StackType;
-	DISABLE_NATIVE_SCREENS?: boolean;
-	DISABLE_NATIVE_SCREEN_CONTAINER?: boolean;
 }
 
 interface StackCoreProviderProps {
@@ -24,9 +20,6 @@ interface StackCoreProviderProps {
 export interface StackCoreContextValue {
 	flags: {
 		TRANSITIONS_ALWAYS_ON: boolean;
-		STACK_TYPE?: StackType;
-		DISABLE_NATIVE_SCREENS: boolean;
-		DISABLE_NATIVE_SCREEN_CONTAINER: boolean;
 	};
 }
 
@@ -63,16 +56,11 @@ const StackSafeAreaProvider = memo(function StackSafeAreaProvider({
 
 const StackCoreRoot = memo(function StackCoreRoot({
 	children,
-	stackType,
 }: {
 	children: ReactNode;
-	stackType: StackType;
 }) {
 	return (
-		<GestureHandlerRootView
-			style={styles.container}
-			pointerEvents={stackType === StackType.COMPONENT ? "box-none" : undefined}
-		>
+		<GestureHandlerRootView style={styles.container}>
 			<StackSafeAreaProvider>{children}</StackSafeAreaProvider>
 		</GestureHandlerRootView>
 	);
@@ -80,33 +68,19 @@ const StackCoreRoot = memo(function StackCoreRoot({
 
 export const { StackCoreProvider, useStackCoreStore } = createProvider(
 	"StackCore",
-	{ guarded: true },
 )<StackCoreProviderProps, StackCoreContextValue>(({ config, children }) => {
-	const {
-		TRANSITIONS_ALWAYS_ON = false,
-		DISABLE_NATIVE_SCREENS = false,
-		DISABLE_NATIVE_SCREEN_CONTAINER = false,
-		STACK_TYPE = StackType.BLANK,
-	} = config;
+	const { TRANSITIONS_ALWAYS_ON = false } = config;
 
 	const flags = useMemo(
 		() => ({
 			TRANSITIONS_ALWAYS_ON,
-			STACK_TYPE,
-			DISABLE_NATIVE_SCREENS,
-			DISABLE_NATIVE_SCREEN_CONTAINER,
 		}),
-		[
-			TRANSITIONS_ALWAYS_ON,
-			STACK_TYPE,
-			DISABLE_NATIVE_SCREENS,
-			DISABLE_NATIVE_SCREEN_CONTAINER,
-		],
+		[TRANSITIONS_ALWAYS_ON],
 	);
 
 	return {
 		value: { flags },
-		children: <StackCoreRoot stackType={STACK_TYPE}>{children}</StackCoreRoot>,
+		children: <StackCoreRoot>{children}</StackCoreRoot>,
 	};
 });
 

package/src/stores/animation.store.ts

@@ -10,7 +10,6 @@ import { createStore } from "../utils/create-store";
 export type AnimationStoreMap = {
 	transitionProgress: SharedValue<number>;
 	visualProgress: SharedValue<number>;
-	stackProgress: SharedValue<number>;
 	willAnimate: SharedValue<number>;
 	progressAnimating: SharedValue<number>;
 	progressSettled: SharedValue<number>;
@@ -39,7 +38,6 @@ function createAnimationBag(): AnimationStoreMap {
 	return {
 		transitionProgress: makeMutable(0),
 		visualProgress: makeMutable(0),
-		stackProgress: makeMutable(0),
 		willAnimate: makeMutable(0),
 		closing: makeMutable(0),
 		progressAnimating: makeMutable(0),
@@ -58,7 +56,6 @@ export const AnimationStore = createStore<AnimationStoreMap>({
 	disposeBag: (bag) => {
 		cancelAnimation(bag.transitionProgress);
 		cancelAnimation(bag.visualProgress);
-		cancelAnimation(bag.stackProgress);
 		cancelAnimation(bag.willAnimate);
 		cancelAnimation(bag.progressAnimating);
 		cancelAnimation(bag.progressSettled);

package/src/stores/bounds/internals/links.ts

@@ -242,7 +242,7 @@ const writeDestination = (
 
 	writePairLink(state, pairKey, linkKey, link);
 
-	if (link.group) {
+	if (link.group && !state[pairKey]?.groups?.[link.group]) {
 		writeGroup(state, pairKey, link.group, linkKey);
 	}
 };
@@ -411,16 +411,24 @@ function getPairKeyForSource(
 	"worklet";
 	const state = pairs.get();
 	const linkKey = getLinkKeyFromTag(tag);
+	let latestPairKey: ScreenPairKey | null = null;
+	let latestPairAwaitingSource: ScreenPairKey | null = null;
+
 	for (const pairKey in state) {
 		if (getSourceScreenKeyFromPairKey(pairKey) !== screenKey) continue;
-		if (
-			getResolvedLink(pairKey, tag).link?.destination ||
-			state[pairKey]?.sourceRequests?.[linkKey]
-		) {
-			return pairKey;
+
+		const link = getResolvedLink(pairKey, tag).link;
+		const hasSourceRequest = state[pairKey]?.sourceRequests?.[linkKey];
+
+		if (!link?.destination && !hasSourceRequest) continue;
+
+		latestPairKey = pairKey;
+		if (!link?.source) {
+			latestPairAwaitingSource = pairKey;
 		}
 	}
-	return null;
+
+	return latestPairAwaitingSource ?? latestPairKey;
 }
 
 function getPairKeyForDestination(

package/src/stores/gesture.store.ts

@@ -3,10 +3,7 @@ import {
 	makeMutable,
 	type SharedValue,
 } from "react-native-reanimated";
-import type {
-	ActiveGesture,
-	ResolvedPanGestureDirection,
-} from "../types/gesture.types";
+import type { ActiveGesture } from "../types/gesture.types";
 import { createStore } from "../utils/create-store";
 
 type GestureRawStoreMap = {
@@ -34,7 +31,6 @@ type GestureSnapshotStoreMap = {
 	rotation: SharedValue<number>;
 	raw: GestureRawStoreMap;
 	active: SharedValue<ActiveGesture | null>;
-	direction: SharedValue<ResolvedPanGestureDirection | null>;
 };
 
 type GestureInternalStoreMap = {
@@ -63,26 +59,7 @@ export type GestureStoreMap = {
 	dismissing: SharedValue<number>;
 	dragging: SharedValue<number>;
 	settling: SharedValue<number>;
-	active: SharedValue<ActiveGesture | null>;
-	/** @deprecated Use `active` instead. */
-	direction: SharedValue<ResolvedPanGestureDirection | null>;
-
-	/**
-	 * @deprecated Use `normX` instead.
-	 */
-	normalizedX: SharedValue<number>;
-	/**
-	 * @deprecated Use `normY` instead.
-	 */
-	normalizedY: SharedValue<number>;
-	/**
-	 * @deprecated Use `dismissing` instead.
-	 */
-	isDismissing: SharedValue<number>;
-	/**
-	 * @deprecated Use `dragging` instead.
-	 */
-	isDragging: SharedValue<number>;
+	initiator: SharedValue<ActiveGesture | null>;
 };
 
 function createGestureBag(): GestureStoreMap {
@@ -97,7 +74,7 @@ function createGestureBag(): GestureStoreMap {
 	const dismissing = makeMutable(0);
 	const dragging = makeMutable(0);
 	const settling = makeMutable(0);
-	const active = makeMutable<ActiveGesture | null>(null);
+	const initiator = makeMutable<ActiveGesture | null>(null);
 
 	return {
 		x: makeMutable(0),
@@ -149,20 +126,12 @@ function createGestureBag(): GestureStoreMap {
 					rotation: makeMutable(0),
 				},
 				active: makeMutable<ActiveGesture | null>(null),
-				direction: makeMutable<ResolvedPanGestureDirection | null>(null),
 			},
 		},
 		dismissing,
 		dragging,
 		settling,
-		active,
-		direction: makeMutable<ResolvedPanGestureDirection | null>(null),
-
-		// Deprecated aliases (same underlying SharedValue)
-		normalizedX: normX,
-		normalizedY: normY,
-		isDismissing: dismissing,
-		isDragging: dragging,
+		initiator,
 	};
 }
 
@@ -219,11 +188,9 @@ export const GestureStore = createStore<GestureStoreMap>({
 		cancelAnimation(bag.internal.snapshot.raw.normScale);
 		cancelAnimation(bag.internal.snapshot.raw.rotation);
 		cancelAnimation(bag.internal.snapshot.active);
-		cancelAnimation(bag.internal.snapshot.direction);
 		cancelAnimation(bag.dismissing);
 		cancelAnimation(bag.dragging);
 		cancelAnimation(bag.settling);
-		cancelAnimation(bag.active);
-		cancelAnimation(bag.direction);
+		cancelAnimation(bag.initiator);
 	},
 });

package/src/stores/system.store.ts

@@ -9,8 +9,7 @@ import { createStore } from "../utils/create-store";
 export enum LifecycleTransitionRequestKind {
 	None = 0,
 	Open = 1,
-	BlankStackClose = 2,
-	NativeClose = 3,
+	Close = 2,
 }
 
 type SystemStoreState = {

package/src/types/animation.types.ts

@@ -28,10 +28,6 @@ export type ScreenTransitionOptions = Pick<
 	| "gestureVelocityImpact"
 	| "gestureSnapVelocityImpact"
 	| "gestureReleaseVelocityScale"
-	| "gestureResponseDistance"
-	| "gestureProgressMode"
-	| "gestureDrivesProgress"
-	| "gestureActivationArea"
 	| "gestureSnapLocked"
 	| "sheetScrollGestureBehavior"
 	| "backdropBehavior"
@@ -105,13 +101,6 @@ export type ScreenTransitionState = {
 	 */
 	settled: number;
 
-	/**
-	 * Deprecated alias for `settled`.
-	 *
-	 * @deprecated Use `settled` instead.
-	 */
-	logicallySettled: number;
-
 	/**
 	 * Live gesture values for this screen.
 	 * Contains translation (x, y), normalized values (-1 to 1),
@@ -242,15 +231,6 @@ export interface ScreenInterpolationProps {
 	 */
 	stackProgress: number;
 
-	/**
-	 * Whether the active transition is visually close enough to its target to be
-	 * treated as complete, even if the animation is still physically settling.
-	 *
-	 * @deprecated Use `active.settled` instead. Screen settlement state
-	 * belongs on the screen state object.
-	 */
-	logicallySettled: number;
-
 	/**
 	 * Function that provides access to bounds helpers for shared screen transitions.
 	 */
@@ -384,6 +364,14 @@ export type TransitionInterpolatedStyle = {
 	 * This reserved key is stripped before style slot normalization.
 	 */
 	options?: TransitionInterpolatorOptions;
+	/**
+	 * Animated style and props for the route-owned floating overlay.
+	 *
+	 * Visible overlays form their own adjacency chain. A route that returns this
+	 * slot controls the previous visible overlay and, when it owns an overlay,
+	 * its entering overlay.
+	 */
+	overlay?: TransitionSlotStyle;
 	/** Animated style and props for the main screen content view. */
 	content?: TransitionSlotStyle;
 	/** Animated style and props for the backdrop layer between screens. */

package/src/types/blank-stack.types.ts

@@ -60,24 +60,6 @@ export type BlankStackNavigationHelpers = NavigationHelpers<
  * they are also supported as top-level keys in static navigator config.
  */
 export interface BlankStackFactoryOptions {
-	/**
-	 * Controls whether blank-stack screens are rendered with react-native-screens.
-	 *
-	 * When enabled, inactive presentation state is backed by
-	 * `ScreenContainer`/`Screen.activityState`. Set this to `false` to render
-	 * screens as regular React Native views.
-	 *
-	 * @default true
-	 */
-	nativeScreens?: boolean;
-
-	/**
-	 * Enables react-native-screens for blank-stack screen retention.
-	 *
-	 * @deprecated Use `nativeScreens` instead.
-	 */
-	enableNativeScreens?: boolean;
-
 	/**
 	 * Creates an isolated navigation tree for embedded flows.
 	 *
@@ -96,8 +78,14 @@ export interface BlankStackFactoryOptions {
  * Props passed to overlay components in blank-stack.
  * Uses the shared OverlayProps type with blank-stack's navigation type.
  */
-export type BlankStackOverlayProps = OverlayProps<
-	BlankStackNavigationProp<ParamListBase>
+export type BlankStackOverlayProps<
+	ParamList extends ParamListBase = ParamListBase,
+	RouteName extends keyof ParamList = keyof ParamList,
+	NavigatorID extends string | undefined = undefined,
+> = OverlayProps<
+	BlankStackNavigationProp<ParamList, RouteName, NavigatorID>,
+	ParamList,
+	RouteName
 >;
 
 export type BlankStackNavigationOptions = ScreenTransitionConfig & {

package/src/types/bounds.types.ts

@@ -18,7 +18,6 @@ import type {
 	TransitionInterpolatedStyle,
 	TransitionSlotStyle,
 } from "./animation.types";
-import type { GestureProgressMode } from "./gesture.types";
 
 export type { BoundsLink, BoundsLinkStatus } from "../stores/bounds/types";
 
@@ -65,28 +64,6 @@ export type BoundsNavigationZoomDragOptions = {
 	scale?: BoundsNavigationZoomAxisResponse;
 };
 
-/**
- * Legacy zoom opacity interpolation tuple.
- *
- * @deprecated Zoom opacity ownership now follows the native preset.
- */
-export type BoundsNavigationZoomOpacityRange = readonly [
-	inputStart: number,
-	inputEnd: number,
-	outputStart?: number,
-	outputEnd?: number,
-];
-
-/**
- * Legacy opening and closing zoom opacity ranges.
- *
- * @deprecated Zoom opacity ownership now follows the native preset.
- */
-export type BoundsNavigationZoomOpacityRanges = {
-	open?: BoundsNavigationZoomOpacityRange;
-	close?: BoundsNavigationZoomOpacityRange;
-};
-
 export type BoundsNavigationZoomOptions = {
 	/**
 	 * Geometry that the zoomed content should resolve against.
@@ -139,67 +116,6 @@ export type BoundsNavigationZoomOptions = {
 	 * Native drag-response intensity controls.
 	 */
 	drag?: BoundsNavigationZoomDragOptions;
-	/**
-	 * @deprecated Ignored. Zoom no longer exposes a transition-specific debug
-	 * overlay.
-	 */
-	debug?: boolean;
-	/**
-	 * @deprecated Ignored. Zoom opacity ownership now follows the native preset.
-	 */
-	focusedElementOpacity?: BoundsNavigationZoomOpacityRanges;
-	/**
-	 * @deprecated Ignored. Zoom opacity ownership now follows the native preset.
-	 */
-	unfocusedElementOpacity?: BoundsNavigationZoomOpacityRanges;
-	/**
-	 * @deprecated Ignored. Zoom now owns its gesture sensitivity curve.
-	 */
-	maxSensitivity?: number;
-	/**
-	 * @deprecated Ignored. Zoom now owns its velocity-depth behavior.
-	 */
-	velocityDepth?: number;
-	/**
-	 * @deprecated Ignored. Gesture movement always contributes to `progress`.
-	 */
-	gestureProgressMode?: GestureProgressMode;
-	/**
-	 * @deprecated Ignored. Use `drag.scale.horizontal` to adjust response
-	 * intensity without replacing the native curve.
-	 */
-	horizontalDragScale?: readonly [
-		shrinkMin: number,
-		growMax: number,
-		exponent?: number,
-	];
-	/**
-	 * @deprecated Ignored. Use `drag.scale.vertical` to adjust response intensity
-	 * without replacing the native curve.
-	 */
-	verticalDragScale?: readonly [
-		shrinkMin: number,
-		growMax: number,
-		exponent?: number,
-	];
-	/**
-	 * @deprecated Ignored. Use `drag.translation.horizontal` to adjust response
-	 * intensity without replacing the native curve.
-	 */
-	horizontalDragTranslation?: readonly [
-		negativeMax: number,
-		positiveMax: number,
-		exponent?: number,
-	];
-	/**
-	 * @deprecated Ignored. Use `drag.translation.vertical` to adjust response
-	 * intensity without replacing the native curve.
-	 */
-	verticalDragTranslation?: readonly [
-		negativeMax: number,
-		positiveMax: number,
-		exponent?: number,
-	];
 };
 
 export type BoundsNavigationZoomStyle = TransitionInterpolatedStyle & {
@@ -242,16 +158,6 @@ export type BoundsNavigationRevealOptions = {
 	 * @default 0.5
 	 */
 	velocityDepth?: number;
-	/**
-	 * Deprecated compatibility option.
-	 *
-	 * Gesture movement now always contributes to `progress`; use `transitionProgress`
-	 * when a recipe needs transition progress without live gesture contribution.
-	 * The reveal helper no longer reads this option.
-	 *
-	 * @deprecated Use `transitionProgress` from interpolation state instead.
-	 */
-	gestureProgressMode?: GestureProgressMode;
 	/**
 	 * Scale applied to the unfocused background content while the reveal runs
 	 * above it.
@@ -316,12 +222,6 @@ export type BoundsScopedAccessor = BoundsBoundNavigationAccessor & {
 	values: <T extends BoundsComputeOptions = BoundsComputeOptions>(
 		options?: T,
 	) => BoundsValuesResult<T>;
-	/**
-	 * @deprecated Use {@linkcode values}.
-	 */
-	math: <T extends BoundsComputeOptions = BoundsComputeOptions>(
-		options?: T,
-	) => BoundsValuesResult<T>;
 	link: (id?: BoundsIdentityInput) => BoundsLink | null;
 };
 

package/src/types/gesture.types.ts

@@ -16,8 +16,6 @@ export type GestureDirection = PanGestureDirection | PinchGestureDirection;
 
 export type ActiveGesture = ResolvedPanGestureDirection | PinchGestureDirection;
 
-export type GestureProgressMode = "progress-driven" | "freeform";
-
 export type SnapPanAxis = "horizontal" | "vertical";
 
 /**
@@ -158,12 +156,6 @@ export type GestureHandoffValues = {
 	 * The gesture associated with the handoff values.
 	 */
 	active: ActiveGesture | null;
-	/**
-	 * The pan direction associated with the handoff values.
-	 *
-	 * @deprecated Use `active` instead.
-	 */
-	direction: ResolvedPanGestureDirection | null;
 };
 
 export type GestureValues = {
@@ -220,22 +212,10 @@ export type GestureValues = {
 	 * Physical gesture values before `gestureSensitivity` is applied.
 	 */
 	raw: RawGestureValues;
-	/**
-	 * The gesture that is currently active.
-	 *
-	 * @deprecated Use `initiator` for the accepted activation identity.
-	 */
-	active: ActiveGesture | null;
 	/**
 	 * The accepted activation identity for the current gesture attempt.
 	 */
 	initiator: ActiveGesture | "none";
-	/**
-	 * The initial pan direction that activated the gesture.
-	 *
-	 * @deprecated Use `active` instead.
-	 */
-	direction: ResolvedPanGestureDirection | null;
 	/**
 	 * Gesture values latched at the release boundary for animation handoff.
 	 *
@@ -245,10 +225,10 @@ export type GestureValues = {
 	 */
 	handoff: GestureHandoffValues;
 	/**
-	 * A flag indicating if the screen is in the process of dismissing (0 or 1).
+	 * Whether a released gesture is completing a dismissal (0 or 1).
 	 *
-	 * @deprecated Use `closing` for public screen lifecycle state. Release handoff
-	 * details do not have a public replacement.
+	 * Use `closing` for screen lifecycle state. This value specifically describes
+	 * the gesture release handoff.
 	 */
 	dismissing: number;
 	/**
@@ -256,17 +236,7 @@ export type GestureValues = {
 	 */
 	dragging: number;
 	/**
-	 * A flag indicating if released gesture values are animating back to neutral.
-	 *
-	 * @deprecated Use `animating` or `settled` for public motion state.
+	 * Whether released gesture values are animating back to neutral (0 or 1).
 	 */
 	settling: number;
-	/** @deprecated Use `normX` instead. */
-	normalizedX: number;
-	/** @deprecated Use `normY` instead. */
-	normalizedY: number;
-	/** @deprecated Use `dismissing` instead. */
-	isDismissing: number;
-	/** @deprecated Use `dragging` instead. */
-	isDragging: number;
 };

package/src/types/index.ts

@@ -27,8 +27,6 @@ export type {
 	BoundsNavigationRevealStyle,
 	BoundsNavigationZoomAxisResponse,
 	BoundsNavigationZoomDragOptions,
-	BoundsNavigationZoomOpacityRange,
-	BoundsNavigationZoomOpacityRanges,
 	BoundsNavigationZoomOptions,
 	BoundsNavigationZoomStyle,
 } from "./bounds.types";
@@ -51,7 +49,7 @@ export type {
 	ScrollMetadataState,
 	SideActivation,
 } from "./gesture.types";
-export type { OverlayProps } from "./overlay.types";
+export type { OverlayComponent, OverlayProps } from "./overlay.types";
 export type {
 	GestureTracking,
 	InactiveBehavior,
@@ -71,7 +69,6 @@ export type {
 	BaseStackRoute,
 	BaseStackScene,
 	BaseStackState,
-	DescriptorMap,
-	StackDescriptorSource,
 	StackSceneActivity,
+	StackTransitionOptions,
 } from "./stack.types";

package/src/types/overlay.types.ts

@@ -1,28 +1,44 @@
-import type { Route } from "@react-navigation/native";
+import type {
+	ParamListBase,
+	ParamListRoute,
+	RouteProp,
+} from "@react-navigation/native";
+import type { ReactNode } from "react";
 import type { DerivedValue } from "react-native-reanimated";
 import type { ScreenTransitionConfig } from "./screen.types";
 
 /**
- * Props passed to overlay components.
- * Generic over the navigation type since different stacks have different navigation props.
+ * Overlay state without the animated progress value.
  */
+export type OverlayScreenState<
+	TNavigation = unknown,
+	TParamList extends ParamListBase = ParamListBase,
+	TOwnerRouteName extends keyof TParamList = keyof TParamList,
+> = Omit<OverlayProps<TNavigation, TParamList, TOwnerRouteName>, "progress"> & {
+	snapTo: (index: number) => void;
+};
+
 /**
- * Overlay screen state passed to overlay host for rendering.
- * Generic over navigation type — defaults to `unknown` for flexibility.
+ * Props passed to a floating overlay component.
+ *
+ * `route` and `index` identify the screen that owns the overlay. Focused
+ * values may describe a later screen while that overlay remains visible.
  */
-export type OverlayScreenState<TNavigation = unknown> = Omit<
-	OverlayProps<TNavigation>,
-	"progress"
-> & {
+export type OverlayProps<
+	TNavigation = unknown,
+	TParamList extends ParamListBase = ParamListBase,
+	TOwnerRouteName extends keyof TParamList = keyof TParamList,
+> = {
+	/** Route that declared this overlay. */
+	route: RouteProp<TParamList, TOwnerRouteName>;
+
+	/** Index of the route that declared this overlay. */
 	index: number;
-	snapTo: (index: number) => void;
-};
 
-export type OverlayProps<TNavigation = unknown> = {
 	/**
 	 * Route of the currently focused screen in the stack.
 	 */
-	focusedRoute: Route<string>;
+	focusedRoute: ParamListRoute<TParamList>;
 
 	/**
 	 * Index of the focused route in the stack.
@@ -32,7 +48,7 @@ export type OverlayProps<TNavigation = unknown> = {
 	/**
 	 * All routes currently in the stack.
 	 */
-	routes: Route<string>[];
+	routes: ParamListRoute<TParamList>[];
 
 	/**
 	 * Custom metadata from the focused screen's options.
@@ -55,3 +71,14 @@ export type OverlayProps<TNavigation = unknown> = {
 	 */
 	progress: DerivedValue<number>;
 };
+
+/**
+ * Component rendered for a floating screen overlay.
+ *
+ * The callback is bivariant because React Navigation stores overlay components
+ * in navigator-wide screen options while applications annotate them for one
+ * specific route.
+ */
+export type OverlayComponent = {
+	bivarianceHack(props: OverlayProps): ReactNode;
+}["bivarianceHack"];