react-native-screen-transitions 3.0.0-rc.1 → 3.0.0-rc.3

package/lib/typescript/shared/utils/create-provider.d.ts

@@ -3,12 +3,12 @@
  * https://github.com/MatiPl01/react-native-sortables/blob/main/packages/react-native-sortables/src/providers/utils/createProvider.tsx
  * SUPER COOL AMAZING UTILITY
  */
-import { type ReactNode } from "react";
+import { type ComponentType, type ReactNode } from "react";
 export default function createProvider<ProviderName extends string, Guarded extends boolean = true>(name: ProviderName, options?: {
     guarded?: Guarded;
 }): <ProviderProps extends object, ContextValue>(factory: (props: ProviderProps) => {
     value?: ContextValue;
     enabled?: boolean;
     children?: ReactNode;
-}) => { [P in ProviderName as `${P}Context`]: React.Context<ContextValue>; } & { [P in ProviderName as `${P}Provider`]: React.FC<ProviderProps>; } & { [P in ProviderName as `use${P}Context`]: () => Guarded extends true ? ContextValue : ContextValue | null; };
+}) => { [P in ProviderName as `${P}Context`]: React.Context<ContextValue>; } & { [P in ProviderName as `${P}Provider`]: React.FC<ProviderProps>; } & { [P in ProviderName as `use${P}Context`]: () => Guarded extends true ? ContextValue : ContextValue | null; } & { [P in ProviderName as `with${P}Provider`]: (Component: ComponentType<ContextValue>) => React.FC<ProviderProps>; };
 //# sourceMappingURL=create-provider.d.ts.map

package/lib/typescript/shared/utils/create-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-provider.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/create-provider.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAiB,KAAK,SAAS,EAAuB,MAAM,OAAO,CAAC;AAE3E,MAAM,CAAC,OAAO,UAAU,cAAc,CACrC,YAAY,SAAS,MAAM,EAC3B,OAAO,SAAS,OAAO,GAAG,IAAI,EAC7B,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,IAC5C,aAAa,SAAS,MAAM,EAAE,YAAY,EACjD,SAAS,CAAC,KAAK,EAAE,aAAa,KAAK;IAClC,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACrB,KA4CI,GACH,CAAC,IAAI,YAAY,IAAI,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,GACjE,GAAG,GACF,CAAC,IAAI,YAAY,IAAI,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,GAC9D,GAAG,GACF,CAAC,IAAI,YAAY,IAAI,MAAM,CAAC,SAAS,GAAG,MAAM,OAAO,SAAS,IAAI,GAChE,YAAY,GACZ,YAAY,GAAG,IAAI,GACtB,CAEF"}
+{"version":3,"file":"create-provider.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/create-provider.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EACN,KAAK,aAAa,EAElB,KAAK,SAAS,EAGd,MAAM,OAAO,CAAC;AAEf,MAAM,CAAC,OAAO,UAAU,cAAc,CACrC,YAAY,SAAS,MAAM,EAC3B,OAAO,SAAS,OAAO,GAAG,IAAI,EAC7B,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,IAC5C,aAAa,SAAS,MAAM,EAAE,YAAY,EACjD,SAAS,CAAC,KAAK,EAAE,aAAa,KAAK;IAClC,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACrB,KAoEI,GACH,CAAC,IAAI,YAAY,IAAI,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,GACjE,GAAG,GACF,CAAC,IAAI,YAAY,IAAI,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,GAC9D,GAAG,GACF,CAAC,IAAI,YAAY,IAAI,MAAM,CAAC,SAAS,GAAG,MAAM,OAAO,SAAS,IAAI,GAChE,YAAY,GACZ,YAAY,GAAG,IAAI,GACtB,GAAG,GACF,CAAC,IAAI,YAAY,IAAI,OAAO,CAAC,UAAU,GAAG,CAC1C,SAAS,EAAE,aAAa,CAAC,YAAY,CAAC,KAClC,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,GAC5B,CAEF"}

package/lib/typescript/shared/utils/reset-stores-for-screen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reset-stores-for-screen.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/reset-stores-for-screen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAIvE;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,oBAAoB,SAGjE,CAAC"}
+{"version":3,"file":"reset-stores-for-screen.d.ts","sourceRoot":"","sources":["../../../../src/shared/utils/reset-stores-for-screen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAKvE;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,oBAAoB,SAIjE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screen-transitions",
-  "version": "3.0.0-rc.1",
+  "version": "3.0.0-rc.3",
   "description": "Easy screen transitions for React Native and Expo",
   "author": "Ed",
   "license": "MIT",
@@ -36,6 +36,7 @@
   "scripts": {
     "build": "bob build",
     "lint": "biome check ./src",
+    "typecheck": "tsc --noEmit",
     "prepublishOnly": "bun run build"
   },
   "keywords": [

package/src/blank-stack/components/{Overlay.tsx → overlay.tsx}

@@ -4,7 +4,6 @@ import {
 } from "@react-navigation/native";
 import { useMemo } from "react";
 import { Animated, StyleSheet, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useScreenAnimation } from "../../shared/hooks/animation/use-screen-animation";
 import { KeysProvider, useKeys } from "../../shared/providers/keys.provider";
 import { TransitionStylesProvider } from "../../shared/providers/transition-styles.provider";
@@ -45,12 +44,10 @@ const getActiveFloatOverlay = (scenes: BlankStackScene[], index: number) => {
 };
 
 const OverlayHost = ({ scene, isFloating }: OverlayHostProps) => {
-	const insets = useSafeAreaInsets();
-
 	const OverlayComponent = scene.descriptor.options.overlay;
 
 	const { overlayAnimation, optimisticActiveIndex } = useOverlayAnimation();
-	const { scenes } = useStackNavigationContext();
+	const { scenes, routes } = useStackNavigationContext();
 
 	const overlaySceneIndex = useMemo(() => {
 		return scenes.findIndex(
@@ -58,9 +55,9 @@ const OverlayHost = ({ scene, isFloating }: OverlayHostProps) => {
 		);
 	}, [scenes, scene.route.key]);
 
-	const focusedRoute = useMemo(() => {
+	const focusedScene = useMemo(() => {
 		if (overlaySceneIndex === -1) {
-			return scene.route;
+			return scene;
 		}
 
 		const maxOffset = Math.max(scenes.length - overlaySceneIndex - 1, 0);
@@ -69,8 +66,8 @@ const OverlayHost = ({ scene, isFloating }: OverlayHostProps) => {
 			maxOffset,
 		);
 
-		return scenes[overlaySceneIndex + normalizedIndex]?.route ?? scene.route;
-	}, [overlaySceneIndex, optimisticActiveIndex, scenes, scene.route]);
+		return scenes[overlaySceneIndex + normalizedIndex] ?? scene;
+	}, [overlaySceneIndex, optimisticActiveIndex, scenes, scene]);
 
 	const screenAnimation = useScreenAnimation();
 
@@ -79,13 +76,13 @@ const OverlayHost = ({ scene, isFloating }: OverlayHostProps) => {
 	}
 
 	const overlayProps: BlankStackOverlayProps = {
-		route: scene.route,
-		focusedRoute,
-		navigation: scene.descriptor.navigation,
+		routes,
 		overlayAnimation,
 		screenAnimation,
+		focusedRoute: focusedScene.route,
 		focusedIndex: optimisticActiveIndex,
-		insets,
+		overlayOptions: focusedScene.descriptor.options.overlayOptions,
+		navigation: scene.descriptor.navigation,
 	};
 
 	return (

package/src/blank-stack/components/{Screens.tsx → screens.tsx}

@@ -1,4 +1,3 @@
-import type { NavigationRoute, ParamListBase } from "@react-navigation/native";
 import type * as React from "react";
 import { StyleSheet } from "react-native";
 import Animated, {
@@ -44,12 +43,12 @@ export const Screen = ({
 
 	useDerivedValue(() => {
 		if (!sceneProgress) {
-			screenActivity.value = STATE_TRANSITIONING_OR_BELOW_TOP;
+			screenActivity.set(STATE_TRANSITIONING_OR_BELOW_TOP);
 			return;
 		}
 
 		if (index < routesLength - activeScreensLimit - 1 || isPreloaded) {
-			screenActivity.value = STATE_INACTIVE;
+			screenActivity.set(STATE_INACTIVE);
 		} else {
 			const outputValue =
 				index === routesLength - 1
@@ -59,7 +58,7 @@ export const Screen = ({
 						: STATE_INACTIVE;
 
 			const v = interpolate(
-				sceneProgress.value,
+				sceneProgress.get(),
 				[0, 1 - EPSILON, 1],
 				[1, 1, outputValue],
 				"clamp",
@@ -68,17 +67,16 @@ export const Screen = ({
 			const next =
 				(Math.trunc(v) as 0 | 1 | 2) ?? STATE_TRANSITIONING_OR_BELOW_TOP;
 
-			// avoid spamming JS thread
-			if (next !== screenActivity.value) {
-				screenActivity.value = next;
+			if (next !== screenActivity.get()) {
+				screenActivity.set(next);
 			}
 		}
 	});
 
 	const animatedProps = useAnimatedProps(() => {
 		return {
-			activityState: screenActivity.value,
-			shouldFreeze: screenActivity.value === STATE_INACTIVE && shouldFreeze,
+			activityState: screenActivity.get(),
+			shouldFreeze: screenActivity.get() === STATE_INACTIVE && shouldFreeze,
 		};
 	});
 

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

@@ -0,0 +1,104 @@
+import { SafeAreaProviderCompat } from "@react-navigation/elements";
+import {
+	NavigationContext,
+	NavigationRouteContext,
+} from "@react-navigation/native";
+import * as React from "react";
+import { StyleSheet } from "react-native";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
+import { ScreenContainer } from "react-native-screens";
+import { BlankStackScreenLifecycleController } from "../../shared/components/controllers/screen-lifecycle";
+import { FlagsProvider } from "../../shared/providers/flags.provider";
+import { ScreenTransitionProvider } from "../../shared/providers/screen-transition.provider";
+import type { BlankStackDescriptor } from "../types";
+import { withStackNavigationProvider } from "../utils/with-stack-navigation";
+import { Overlay } from "./overlay";
+import { Screen } from "./screens";
+
+function isFabric() {
+	return "nativeFabricUIManager" in global;
+}
+
+type SceneViewProps = {
+	descriptor: BlankStackDescriptor;
+};
+
+const SceneView = React.memo(({ descriptor }: SceneViewProps) => {
+	const { route, navigation, render } = descriptor;
+
+	return (
+		<NavigationContext.Provider value={navigation}>
+			<NavigationRouteContext.Provider value={route}>
+				{descriptor.options.overlayMode === "screen" && <Overlay.Screen />}
+				{render()}
+			</NavigationRouteContext.Provider>
+		</NavigationContext.Provider>
+	);
+});
+
+export const StackView = withStackNavigationProvider(
+	({
+		activeScreensLimit,
+		descriptors,
+		focusedIndex,
+		routes,
+		scenes,
+		shouldShowFloatOverlay,
+	}) => {
+		return (
+			<FlagsProvider TRANSITIONS_ALWAYS_ON>
+				<GestureHandlerRootView>
+					<SafeAreaProviderCompat>
+						{shouldShowFloatOverlay ? <Overlay.Float /> : null}
+						<ScreenContainer style={styles.container}>
+							{scenes.map((scene, sceneIndex) => {
+								const descriptor = scene.descriptor;
+								const route = scene.route;
+								const isFocused = focusedIndex === sceneIndex;
+								const isBelowFocused = focusedIndex - 1 === sceneIndex;
+
+								const previousDescriptor =
+									scenes[sceneIndex - 1]?.descriptor ?? undefined;
+								const nextDescriptor =
+									scenes[sceneIndex + 1]?.descriptor ?? undefined;
+
+								const isPreloaded = descriptors[route.key] === undefined;
+
+								// On Fabric, when screen is frozen, animated and reanimated values are not updated
+								// due to component being unmounted. To avoid this, we don't freeze the previous screen there
+								const shouldFreeze = isFabric()
+									? !isPreloaded && !isFocused && !isBelowFocused
+									: !isPreloaded && !isFocused;
+								return (
+									<Screen
+										key={route.key}
+										isPreloaded={isPreloaded}
+										index={sceneIndex}
+										activeScreensLimit={activeScreensLimit}
+										routeKey={route.key}
+										routesLength={routes.length}
+										shouldFreeze={shouldFreeze}
+										freezeOnBlur={descriptor.options.freezeOnBlur}
+									>
+										<ScreenTransitionProvider
+											previous={previousDescriptor}
+											current={descriptor}
+											next={nextDescriptor}
+											LifecycleController={BlankStackScreenLifecycleController}
+										>
+											<SceneView key={route.key} descriptor={descriptor} />
+										</ScreenTransitionProvider>
+									</Screen>
+								);
+							})}
+						</ScreenContainer>
+					</SafeAreaProviderCompat>
+				</GestureHandlerRootView>
+			</FlagsProvider>
+		);
+	},
+);
+
+const styles = StyleSheet.create({
+	container: { flex: 1 },
+});

package/src/blank-stack/hooks/use-overlay-animation.tsx

@@ -51,21 +51,21 @@ export const useOverlayAnimation = (): {
 		return total;
 	}, [progressValues]);
 
-	const optimisticActiveIndexValue = useDerivedValue(() => {
-		"worklet";
-
-		const activeIndex = progressValues.length - 1;
+	const optimisticActiveIndex = useSharedValueState(
+		useDerivedValue(() => {
+			"worklet";
 
-		const isOneDismissing = Number(
-			progressValues.some((value) => value.closing.value > 0),
-		);
+			const activeIndex = progressValues.length - 1;
 
-		const optimisticIndex = activeIndex - isOneDismissing;
+			const isOneDismissing = Number(
+				progressValues.some((value) => value.closing.value > 0),
+			);
 
-		return optimisticIndex;
-	});
+			const optimisticIndex = activeIndex - isOneDismissing;
 
-	const optimisticActiveIndex = useSharedValueState(optimisticActiveIndexValue);
+			return optimisticIndex;
+		}),
+	);
 
 	const screen = useWindowDimensions();
 

package/src/blank-stack/index.ts

@@ -1,5 +1,4 @@
-export { useOverlayAnimation } from "../blank-stack/hooks/use-overlay-animation";
-export { createBlankStackNavigator } from "../blank-stack/navigators/createBlankStackNavigator";
+export { createBlankStackNavigator } from "../blank-stack/navigators/create-blank-stack-navigator";
 export type {
 	BlankStackNavigationEventMap,
 	BlankStackNavigationOptions,

package/src/blank-stack/navigators/{createBlankStackNavigator.tsx → create-blank-stack-navigator.tsx}

@@ -13,7 +13,7 @@ import {
 	useNavigationBuilder,
 } from "@react-navigation/native";
 import * as React from "react";
-import { StackView } from "../components/StackView";
+import { StackView } from "../components/stack-view";
 import type {
 	BlankStackNavigationEventMap,
 	BlankStackNavigationOptions,

package/src/blank-stack/types.ts

@@ -12,18 +12,11 @@ import type {
 	Theme,
 } from "@react-navigation/native";
 import type { DerivedValue } from "react-native-reanimated";
-import type { EdgeInsets } from "react-native-safe-area-context";
-import type { ScreenProps } from "react-native-screens";
+import type { ScreenTransitionConfig } from "../shared";
 import type {
 	OverlayInterpolationProps,
 	ScreenInterpolationProps,
-	ScreenStyleInterpolator,
-	TransitionSpec,
 } from "../shared/types/animation.types";
-import type {
-	GestureActivationArea,
-	GestureDirection,
-} from "../shared/types/gesture.types";
 
 export type BlankStackNavigationEventMap = {
 	/**
@@ -95,65 +88,46 @@ export type BlankStackNavigationConfig = {};
 
 export type BlankStackOverlayProps = {
 	/**
-	 * Options for the back button.
+	 * Route of the currently focused screen in the stack.
 	 */
-	back?: {
-		/**
-		 * Title of the previous screen.
-		 */
-		title: string;
-	};
+	focusedRoute: Route<string>;
+
 	/**
-	 * Route object for the current screen.
+	 * Index of the focused route in the stack.
 	 */
-	route: Route<string>;
+	focusedIndex: number;
+
 	/**
-	 * Route object for the currently focused screen in the stack.
+	 * All routes currently in the stack.
 	 */
-	focusedRoute: Route<string>;
+	routes: Route<string>[];
+
 	/**
-	 * Navigation prop for the overlay.
+	 * Options passed to the overlay component.
 	 */
-	navigation: BlankStackNavigationProp<ParamListBase>;
+	overlayOptions?: {
+		title?: string;
+		subtitle?: string;
+		[key: string]: unknown;
+	};
+
 	/**
-	 * Safe area insets for the screen.
+	 * Navigation prop for the overlay.
 	 */
-	insets: EdgeInsets;
+	navigation: BlankStackNavigationProp<ParamListBase>;
+
 	/**
 	 * Animation values for the overlay.
 	 */
 	overlayAnimation: DerivedValue<OverlayInterpolationProps>;
+
 	/**
 	 * Animation values for the screen.
 	 */
 	screenAnimation: DerivedValue<ScreenInterpolationProps>;
-	/**
-	 * Index of the active route
-	 */
-	focusedIndex: number;
 };
 
-export type BlankStackScreenTransitionConfig = {
-	/**
-	 * The user-provided function to calculate styles based on animation progress.
-	 */
-	screenStyleInterpolator?: ScreenStyleInterpolator;
-	/**
-	 * The Reanimated animation config for opening and closing transitions.
-	 */
-	transitionSpec?: TransitionSpec;
-	/**
-	 * Whether the gesture is enabled.
-	 */
-	gestureEnabled?: boolean;
-	/**
-	 * The direction of the swipe gesture used to dismiss the screen.
-	 */
-	gestureDirection?: GestureDirection | GestureDirection[];
-	/**
-	 * How much the gesture's final velocity impacts the dismiss decision.
-	 */
-	gestureVelocityImpact?: number;
+export type BlankStackScreenTransitionConfig = ScreenTransitionConfig & {
 	/**
 	 * Whether to detach the previous screen from the view hierarchy to save memory.
 	 * Set it to `false` if you need the previous screen to be seen through the active screen.
@@ -161,18 +135,6 @@ export type BlankStackScreenTransitionConfig = {
 	 * Defaults to `false` for the last screen for modals, otherwise `true`.
 	 */
 	detachPreviousScreen?: boolean;
-	/**
-	 * Distance threshold for gesture recognition throughout the screen.
-	 */
-	gestureResponseDistance?: number;
-	/**
-	 * Whether the gesture drives the progress.
-	 */
-	gestureDrivesProgress?: boolean;
-	/**
-	 * The area of the screen where the gesture is activated.
-	 */
-	gestureActivationArea?: GestureActivationArea;
 };
 
 export type BlankStackNavigationOptions = BlankStackScreenTransitionConfig & {
@@ -180,6 +142,7 @@ export type BlankStackNavigationOptions = BlankStackScreenTransitionConfig & {
 	 * Function that given `OverlayProps` returns a React Element to display as a overlay.
 	 */
 	overlay?: (props: BlankStackOverlayProps) => React.ReactNode;
+
 	/**
 	 * Layout: How the Overlay is positioned
 	 * - 'float': Single persistent overlay above all screens (like iOS)
@@ -187,6 +150,7 @@ export type BlankStackNavigationOptions = BlankStackScreenTransitionConfig & {
 	 * @default 'screen'
 	 */
 	overlayMode?: "float" | "screen";
+
 	/**
 	 * Whether to show the overlay. The overlay is shown by default.
 	 * Setting this to `false` hides the overlay.
@@ -194,56 +158,14 @@ export type BlankStackNavigationOptions = BlankStackScreenTransitionConfig & {
 	overlayShown?: boolean;
 
 	/**
-	 * Whether the home indicator should prefer to stay hidden on this screen. Defaults to `false`.
-	 *
-	 * @platform ios
-	 */
-	autoHideHomeIndicator?: boolean;
-	/**
-	 * Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`.
-	 *
-	 * @platform ios
-	 */
-	keyboardHandlingEnabled?: boolean;
-	/**
-	 * Sets the visibility of the navigation bar. Defaults to `false`.
-	 *
-	 * @platform android
-	 */
-	navigationBarHidden?: boolean;
-	/**
-	 * Sets the status bar animation (similar to the `StatusBar` component).
-	 * On Android, setting either `fade` or `slide` will set the transition of status bar color. On iOS, this option applies to appereance animation of the status bar.
-	 * Requires setting `View controller-based status bar appearance -> YES` (or removing the config) in your `Info.plist` file.
-	 *
-	 * Defaults to `fade` on iOS and `none` on Android.
-	 *
-	 * Only supported on Android and iOS.
-	 *
-	 * @platform android, ios
-	 */
-	statusBarAnimation?: ScreenProps["statusBarAnimation"];
-	/**
-	 * Whether the status bar should be hidden on this screen.
-	 * Requires setting `View controller-based status bar appearance -> YES` in your Info.plist file.
-	 *
-	 * Only supported on Android and iOS.
-	 *
-	 * @platform android, ios
+	 * Options passed to the overlay component.
 	 */
-	statusBarHidden?: boolean;
-	/**
-	 * Sets the status bar color (similar to the `StatusBar` component).
-	 * Requires setting `View controller-based status bar appearance -> YES` (or removing the config) in your `Info.plist` file.
-	 * `auto` and `inverted` are supported only on iOS. On Android, they will fallback to `light`.
-	 *
-	 * Defaults to `auto` on iOS and `light` on Android.
-	 *
-	 * Only supported on Android and iOS.
-	 *
-	 * @platform android, ios
-	 */
-	statusBarStyle?: ScreenProps["statusBarStyle"];
+	overlayOptions?: {
+		title?: string;
+		subtitle?: string;
+		[key: string]: unknown;
+	};
+
 	/**
 	 * Whether inactive screens should be suspended from re-rendering. Defaults to `false`.
 	 * Defaults to `true` when `enableFreeze()` is run at the top of the application.

package/src/blank-stack/utils/with-stack-navigation/{_utils → helpers}/compose-descriptors.ts

@@ -9,15 +9,8 @@ export const composeDescriptors = (
 	const composed: BlankStackDescriptorMap = {};
 
 	for (const route of routes) {
-		const adjusted =
+		composed[route.key] =
 			nextDescriptors[route.key] ?? currentDescriptors[route.key];
-
-		// useScreenAnimation depends on this, however with blank-stack, this should be enabled by default
-		const withEnableTransitions = {
-			...adjusted,
-			options: { ...adjusted.options, enableTransitions: true },
-		};
-		composed[route.key] = withEnableTransitions;
 	}
 
 	return composed;

package/src/blank-stack/utils/with-stack-navigation/{_hooks → hooks}/use-closing-route-keys.tsx

@@ -4,7 +4,6 @@ import useStableCallback from "../../../../shared/hooks/use-stable-callback";
 
 export const useClosingRouteKeys = () => {
 	const keysRef = useRef<Set<string>>(new Set());
-	const finishedRef = useRef<Set<string>>(new Set());
 	const shared = useSharedValue<string[]>([]);
 
 	const add = useStableCallback((key: string) => {
@@ -13,7 +12,6 @@ export const useClosingRouteKeys = () => {
 			return;
 		}
 
-		finishedRef.current.delete(key);
 		keys.add(key);
 		shared.modify((prev) => {
 			"worklet";
@@ -26,12 +24,8 @@ export const useClosingRouteKeys = () => {
 
 	const remove = useStableCallback((key: string) => {
 		const keys = keysRef.current;
-		if (!keys.delete(key)) {
-			finishedRef.current.delete(key);
-			return;
-		}
+		keys.delete(key);
 
-		finishedRef.current.delete(key);
 		shared.modify((prev) => {
 			"worklet";
 			const index = prev.indexOf(key);
@@ -44,13 +38,8 @@ export const useClosingRouteKeys = () => {
 
 	const clear = useStableCallback(() => {
 		const keys = keysRef.current;
-		if (!keys.size) {
-			finishedRef.current.clear();
-			return;
-		}
 
 		keys.clear();
-		finishedRef.current.clear();
 		shared.modify((prev) => {
 			"worklet";
 			prev.length = 0;

package/src/blank-stack/utils/with-stack-navigation/{_hooks → hooks}/use-stack-navigation-state.tsx

@@ -2,11 +2,11 @@ import { type Route, StackActions } from "@react-navigation/native";
 import { useLayoutEffect, useState } from "react";
 import useStableCallback from "../../../../shared/hooks/use-stable-callback";
 import type { BlankStackDescriptorMap } from "../../../types";
-import type { StackNavigationContextProps } from "../_types";
-import { areDescriptorsEqual } from "../_utils/are-descriptors-equal";
-import { composeDescriptors } from "../_utils/compose-descriptors";
-import { haveSameRouteKeys } from "../_utils/have-same-route-keys";
-import { routesAreIdentical } from "../_utils/routes-are-identical";
+import { areDescriptorsEqual } from "../helpers/are-descriptors-equal";
+import { composeDescriptors } from "../helpers/compose-descriptors";
+import { haveSameRouteKeys } from "../helpers/have-same-route-keys";
+import { routesAreIdentical } from "../helpers/routes-are-identical";
+import type { StackNavigationContextProps } from "../types";
 import { useClosingRouteKeys } from "./use-closing-route-keys";
 import { usePrevious } from "./use-previous";