react-native-screen-transitions 3.0.0-beta.1 → 3.0.0-beta.10

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

@@ -1,32 +1,14 @@
 /**
- * Credits to
- * https://github.com/heroui-inc/heroui-native/blob/beta/src/helpers/utils/create-context.ts
+ * THANK YOU @MatiPl01
+ * https://github.com/MatiPl01/react-native-sortables/blob/main/packages/react-native-sortables/src/providers/utils/createProvider.tsx
+ * SUPER COOL AMAZING UTILITY
  */
-import * as React from "react";
-export interface CreateContextOptions {
-    /**
-     * If `true`, React will throw if context is `null` or `undefined`
-     * In some cases, you might want to support nested context, so you can set it to `false`
-     */
-    strict?: boolean;
-    /**
-     * Error message to throw if the context is `undefined`
-     */
-    errorMessage?: string;
-    /**
-     * The display name of the context
-     */
-    name?: string;
-}
-export type CreateContextReturn<T> = [
-    React.Provider<T>,
-    () => T,
-    React.Context<T>
-];
-/**
- * Creates a named context, provider, and hook.
- *
- * @param options create context options
- */
-export declare function createContext<ContextType>(options?: CreateContextOptions): CreateContextReturn<ContextType>;
+import { type PropsWithChildren, type ReactNode } from "react";
+export default function createProvider<ProviderName extends string, Guarded extends boolean = true>(name: ProviderName, options?: {
+    guarded?: Guarded;
+}): <ProviderProps extends PropsWithChildren<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; };
 //# sourceMappingURL=create-provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"create-provider.d.ts","sourceRoot":"","sources":["../../../../../src/shared/providers/utils/create-provider.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,WAAW,oBAAoB;IACpC;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IACpC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjB,MAAM,CAAC;IACP,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;CAChB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,WAAW,EAAE,OAAO,GAAE,oBAAyB,GA6BvE,mBAAmB,CAAC,WAAW,CAAC,CACrC"}
+{"version":3,"file":"create-provider.d.ts","sourceRoot":"","sources":["../../../../../src/shared/providers/utils/create-provider.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAEN,KAAK,iBAAiB,EACtB,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,iBAAiB,CAAC,MAAM,CAAC,EAAE,YAAY,EACpE,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"}

package/lib/typescript/shared/stores/animation-store.d.ts

@@ -5,13 +5,15 @@ export type AnimationStoreMap = {
     closing: SharedValue<number>;
     animating: SharedValue<number>;
 };
-export declare function getAnimation(key: ScreenKey, type: "progress" | "closing" | "animating"): SharedValue<number>;
-export declare function getAll(key: ScreenKey): AnimationStoreMap;
+declare function getAnimation(key: ScreenKey, type: "progress" | "closing" | "animating"): SharedValue<number>;
+declare function getAll(key: ScreenKey): AnimationStoreMap;
 declare function clear(routeKey: ScreenKey): void;
+declare function debugStoreSize(): void;
 export declare const AnimationStore: {
     getAnimation: typeof getAnimation;
     clear: typeof clear;
     getAll: typeof getAll;
+    debugStoreSize: typeof debugStoreSize;
 };
 export {};
 //# sourceMappingURL=animation-store.d.ts.map

package/lib/typescript/shared/stores/animation-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"animation-store.d.ts","sourceRoot":"","sources":["../../../../src/shared/stores/animation-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAiBF,wBAAgB,YAAY,CAC3B,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,WAAW,GACxC,WAAW,CAAC,MAAM,CAAC,CAErB;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,SAAS,qBAEpC;AAED,iBAAS,KAAK,CAAC,QAAQ,EAAE,SAAS,QAGjC;AAED,eAAO,MAAM,cAAc;;;;CAI1B,CAAC"}
+{"version":3,"file":"animation-store.d.ts","sourceRoot":"","sources":["../../../../src/shared/stores/animation-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,KAAK,WAAW,EAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAiBF,iBAAS,YAAY,CACpB,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,UAAU,GAAG,SAAS,GAAG,WAAW,GACxC,WAAW,CAAC,MAAM,CAAC,CAErB;AAED,iBAAS,MAAM,CAAC,GAAG,EAAE,SAAS,qBAE7B;AAED,iBAAS,KAAK,CAAC,QAAQ,EAAE,SAAS,QASjC;AAED,iBAAS,cAAc,SAGtB;AAED,eAAO,MAAM,cAAc;;;;;CAK1B,CAAC"}

package/lib/typescript/shared/stores/bound-store/index.d.ts

@@ -9,6 +9,7 @@ declare function getBounds(screenId: string): Record<string, {
 declare function setRouteActive(routeKey: string, boundId: string): void;
 declare function getRouteActive(routeKey: string): string;
 declare function clear(routeKey: ScreenKey): void;
+declare function debugBoundStore(): void;
 declare function getActiveBound(current: ScreenTransitionState, next: ScreenTransitionState | undefined, previous: ScreenTransitionState | undefined): string;
 export declare const BoundStore: {
     setBounds: typeof setBounds;
@@ -17,6 +18,7 @@ export declare const BoundStore: {
     getRouteActive: typeof getRouteActive;
     clear: typeof clear;
     getActiveBound: typeof getActiveBound;
+    debugBoundStore: typeof debugBoundStore;
 };
 export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/shared/stores/bound-store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/shared/stores/bound-store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,kBAAkB,EAEvB,KAAK,UAAU,EACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAalD,iBAAS,SAAS,CACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,kBAAkB,GAAG,IAAW,EACxC,MAAM,GAAE,UAAe,QAYvB;AAED,iBAAS,SAAS,CAAC,QAAQ,EAAE,MAAM;YAzBT,kBAAkB;YAAU,UAAU;GA4B/D;AAED,iBAAS,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAOxD;AAED,iBAAS,cAAc,CAAC,QAAQ,EAAE,MAAM,UAGvC;AAoBD,iBAAS,KAAK,CAAC,QAAQ,EAAE,SAAS,QAyBjC;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,qBAAqB,EAC9B,IAAI,EAAE,qBAAqB,GAAG,SAAS,EACvC,QAAQ,EAAE,qBAAqB,GAAG,SAAS,UAW3C;AAED,eAAO,MAAM,UAAU;;;;;;;CAOtB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/shared/stores/bound-store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,kBAAkB,EAEvB,KAAK,UAAU,EACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAalD,iBAAS,SAAS,CACjB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,kBAAkB,GAAG,IAAW,EACxC,MAAM,GAAE,UAAe,QAYvB;AAED,iBAAS,SAAS,CAAC,QAAQ,EAAE,MAAM;YAzBT,kBAAkB;YAAU,UAAU;GA4B/D;AAED,iBAAS,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAOxD;AAED,iBAAS,cAAc,CAAC,QAAQ,EAAE,MAAM,UAGvC;AAoBD,iBAAS,KAAK,CAAC,QAAQ,EAAE,SAAS,QAyBjC;AAED,iBAAS,eAAe,SAoBvB;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,qBAAqB,EAC9B,IAAI,EAAE,qBAAqB,GAAG,SAAS,EACvC,QAAQ,EAAE,qBAAqB,GAAG,SAAS,UAW3C;AAED,eAAO,MAAM,UAAU;;;;;;;;CAQtB,CAAC"}

package/lib/typescript/shared/stores/gesture-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gesture-store.d.ts","sourceRoot":"","sources":["../../../../src/shared/stores/gesture-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,MAAM,UAAU,GACnB,GAAG,GACH,GAAG,GACH,aAAa,GACb,aAAa,GACb,cAAc,GACd,YAAY,CAAC;AAEhB,MAAM,MAAM,eAAe,GAAG;IAC7B,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,IAAI,CAAC,CAAC;CACvE,CAAC;AAuBF,iBAAS,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,uBAE9D;AAED,iBAAS,gBAAgB,CAAC,QAAQ,EAAE,SAAS,mBAE5C;AAED,iBAAS,KAAK,CAAC,QAAQ,EAAE,SAAS,QAEjC;AAED,eAAO,MAAM,YAAY;;;;CAIxB,CAAC"}
+{"version":3,"file":"gesture-store.d.ts","sourceRoot":"","sources":["../../../../src/shared/stores/gesture-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,KAAK,WAAW,EAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,MAAM,UAAU,GACnB,GAAG,GACH,GAAG,GACH,aAAa,GACb,aAAa,GACb,cAAc,GACd,YAAY,CAAC;AAEhB,MAAM,MAAM,eAAe,GAAG;IAC7B,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,IAAI,CAAC,CAAC;CACvE,CAAC;AAuBF,iBAAS,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,uBAE9D;AAED,iBAAS,gBAAgB,CAAC,QAAQ,EAAE,SAAS,mBAE5C;AAED,iBAAS,KAAK,CAAC,QAAQ,EAAE,SAAS,QAYjC;AAED,eAAO,MAAM,YAAY;;;;CAIxB,CAAC"}

package/package.json

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

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

@@ -5,6 +5,7 @@ import {
 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";
 import { useOverlayAnimation } from "../hooks/use-overlay-animation";
 import type {
@@ -13,7 +14,6 @@ import type {
 	BlankStackScene,
 } from "../types";
 import { useStackNavigationContext } from "../utils/with-stack-navigation";
-import { useScreenAnimation } from "../../shared/hooks/animation/use-screen-animation";
 
 type OverlayHostProps = {
 	scene: BlankStackScene;
@@ -43,13 +43,33 @@ const getActiveFloatOverlay = (scenes: BlankStackScene[], index: number) => {
 	return null;
 };
 
-
 const OverlayHost = ({ scene, isFloating }: OverlayHostProps) => {
 	const insets = useSafeAreaInsets();
 
 	const OverlayComponent = scene.descriptor.options.overlay;
 
 	const { overlayAnimation, optimisticActiveIndex } = useOverlayAnimation();
+	const { scenes } = useStackNavigationContext();
+
+	const overlaySceneIndex = useMemo(() => {
+		return scenes.findIndex(
+			(stackScene) => stackScene.route.key === scene.route.key,
+		);
+	}, [scenes, scene.route.key]);
+
+	const focusedRoute = useMemo(() => {
+		if (overlaySceneIndex === -1) {
+			return scene.route;
+		}
+
+		const maxOffset = Math.max(scenes.length - overlaySceneIndex - 1, 0);
+		const normalizedIndex = Math.min(
+			Math.max(optimisticActiveIndex, 0),
+			maxOffset,
+		);
+
+		return scenes[overlaySceneIndex + normalizedIndex]?.route ?? scene.route;
+	}, [overlaySceneIndex, optimisticActiveIndex, scenes, scene.route]);
 
 	const screenAnimation = useScreenAnimation();
 
@@ -59,6 +79,7 @@ const OverlayHost = ({ scene, isFloating }: OverlayHostProps) => {
 
 	const overlayProps: BlankStackOverlayProps = {
 		route: scene.route,
+		focusedRoute,
 		navigation: scene.descriptor.navigation,
 		overlayAnimation,
 		screenAnimation,
@@ -71,7 +92,7 @@ const OverlayHost = ({ scene, isFloating }: OverlayHostProps) => {
 			pointerEvents="box-none"
 			style={[
 				styles.container,
-				isFloating ? styles.floating : null,
+				isFloating ? styles.floating : { zIndex: 1 },
 				styles.absolute,
 			]}
 		>
@@ -112,7 +133,6 @@ const FloatOverlay = () => {
 };
 
 const ScreenOverlay = () => {
-	const { focusedIndex } = useStackNavigationContext();
 	const { current } = useKeys<BlankStackDescriptor>();
 
 	const options = current.options;

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

@@ -13,7 +13,7 @@ import { AnimationStore } from "../../shared/stores/animation-store";
 interface ScreenProps {
 	routeKey: string;
 	index: number;
-	routes: NavigationRoute<ParamListBase, string>[];
+	routesLength: number;
 	isPreloaded: boolean;
 	children: React.ReactNode;
 	freezeOnBlur?: boolean;
@@ -32,7 +32,7 @@ const AnimatedScreen = Animated.createAnimatedComponent(RNSScreen);
 export const Screen = ({
 	routeKey,
 	index,
-	routes,
+	routesLength,
 	isPreloaded,
 	activeScreensLimit,
 	children,
@@ -48,13 +48,13 @@ export const Screen = ({
 			return;
 		}
 
-		if (index < routes.length - activeScreensLimit - 1 || isPreloaded) {
+		if (index < routesLength - activeScreensLimit - 1 || isPreloaded) {
 			screenActivity.value = STATE_INACTIVE;
 		} else {
 			const outputValue =
-				index === routes.length - 1
+				index === routesLength - 1
 					? STATE_ON_TOP
-					: index >= routes.length - activeScreensLimit
+					: index >= routesLength - activeScreensLimit
 						? STATE_TRANSITIONING_OR_BELOW_TOP
 						: STATE_INACTIVE;
 

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

@@ -3,9 +3,12 @@ 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 { BlankStackStateProvider } from "../providers/blank-stack-state";
 import { ScreenTransitionProvider } from "../../shared/providers/screen-transition-provider";
 import type { BlankStackDescriptor } from "../types";
 import { withStackNavigationProvider } from "../utils/with-stack-navigation";
@@ -22,7 +25,7 @@ type SceneViewProps = {
 	sceneIndex: number;
 };
 
-const SceneView = ({ descriptor }: SceneViewProps) => {
+const SceneView = React.memo(({ descriptor }: SceneViewProps) => {
 	const { route, navigation, render } = descriptor;
 
 	return (
@@ -33,7 +36,7 @@ const SceneView = ({ descriptor }: SceneViewProps) => {
 			</NavigationRouteContext.Provider>
 		</NavigationContext.Provider>
 	);
-};
+});
 
 export const StackView = withStackNavigationProvider(
 	({
@@ -47,56 +50,62 @@ export const StackView = withStackNavigationProvider(
 		return (
 			<GestureHandlerRootView>
 				<SafeAreaProviderCompat>
-					{shouldShowFloatOverlay ? <Overlay.Float /> : null}
-					<ScreenContainer style={{ flex: 1 }}>
-						{scenes.map((scene, sceneIndex) => {
-							const descriptor = scene.descriptor;
-							const route = scene.route;
-							const isFocused = focusedIndex === sceneIndex;
-							const isBelowFocused = focusedIndex - 1 === sceneIndex;
+					<BlankStackStateProvider>
+						{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 previousDescriptor =
+									scenes[sceneIndex - 1]?.descriptor ?? undefined;
+								const nextDescriptor =
+									scenes[sceneIndex + 1]?.descriptor ?? undefined;
 
-							const isPreloaded = descriptors[route.key] === 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}
-									routes={routes}
-									shouldFreeze={shouldFreeze}
-									freezeOnBlur={descriptor.options.freezeOnBlur}
-								>
-									<ScreenTransitionProvider
-										previous={previousDescriptor}
-										current={descriptor}
-										next={nextDescriptor}
-										LifecycleController={BlankStackScreenLifecycleController}
+								// 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}
 									>
-										<SceneView
-											key={route.key}
-											isFocused={isFocused}
-											sceneIndex={sceneIndex}
-											descriptor={descriptor}
-										/>
-									</ScreenTransitionProvider>
-								</Screen>
-							);
-						})}
-					</ScreenContainer>
+										<ScreenTransitionProvider
+											previous={previousDescriptor}
+											current={descriptor}
+											next={nextDescriptor}
+											LifecycleController={BlankStackScreenLifecycleController}
+										>
+											<SceneView
+												key={route.key}
+												isFocused={isFocused}
+												sceneIndex={sceneIndex}
+												descriptor={descriptor}
+											/>
+										</ScreenTransitionProvider>
+									</Screen>
+								);
+							})}
+						</ScreenContainer>
+					</BlankStackStateProvider>
 				</SafeAreaProviderCompat>
 			</GestureHandlerRootView>
 		);
 	},
 );
+
+const styles = StyleSheet.create({
+	container: { flex: 1 },
+});

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

@@ -1,19 +1,10 @@
 import { useMemo } from "react";
 import { useWindowDimensions } from "react-native";
-import {
-	type DerivedValue,
-	type SharedValue,
-	useDerivedValue,
-	useSharedValue,
-} from "react-native-reanimated";
+import { type DerivedValue, useDerivedValue } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useSharedValueState } from "../../shared/hooks/use-shared-value-state";
 import { useKeys } from "../../shared/providers/keys";
-import {
-	AnimationStore,
-	type AnimationStoreMap,
-} from "../../shared/stores/animation-store";
-import { GestureStore } from "../../shared/stores/gesture-store";
+import { AnimationStore } from "../../shared/stores/animation-store";
 import type { OverlayInterpolationProps } from "../../shared/types/animation";
 import { useStackNavigationContext } from "../utils/with-stack-navigation";
 
@@ -27,15 +18,9 @@ export const useOverlayAnimation = (): {
 	optimisticActiveIndex: number;
 } => {
 	const { current } = useKeys();
-	const { scenes, focusedIndex } = useStackNavigationContext();
+	const { scenes } = useStackNavigationContext();
 	const routeKey = current?.route?.key;
 
-	const gestureState = routeKey
-		? GestureStore.getRouteGestures(routeKey)
-		: null;
-
-	const fallbackIsDismissing = useSharedValue(0);
-
 	const progressValues = useMemo(() => {
 		if (!routeKey) {
 			return [];

package/src/blank-stack/index.ts

@@ -1,3 +1,4 @@
+export { useOverlayAnimation } from "../blank-stack/hooks/use-overlay-animation";
 export { createBlankStackNavigator } from "../blank-stack/navigators/createBlankStackNavigator";
 export type {
 	BlankStackNavigationEventMap,
@@ -8,3 +9,4 @@ export type {
 	BlankStackOverlayProps,
 	BlankStackScreenProps,
 } from "../blank-stack/types";
+export { useBlankStackState } from "./providers/blank-stack-state";

package/src/blank-stack/providers/blank-stack-state.tsx

@@ -0,0 +1,90 @@
+import type { NavigationRoute, ParamListBase } from "@react-navigation/native";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { useDerivedValue } from "react-native-reanimated";
+import { useSharedValueState } from "../../shared/hooks/use-shared-value-state";
+import createProvider from "../../shared/providers/utils/create-provider";
+import { AnimationStore } from "../../shared/stores/animation-store";
+import { useStackNavigationContext } from "../utils/with-stack-navigation";
+
+interface BlankStackStateProviderProps {
+	children: React.ReactNode;
+}
+
+type BlankStackStateProviderContext = {
+	parentIndex: number;
+	parentRoutes: NavigationRoute<ParamListBase, string>[];
+	index: number;
+	routes: NavigationRoute<ParamListBase, string>[];
+};
+
+const {
+	useBlankStackStateContext: useBlankStackState,
+	BlankStackStateProvider,
+} = createProvider("BlankStackState", { guarded: false })<
+	BlankStackStateProviderProps,
+	BlankStackStateProviderContext
+>(() => {
+	const { focusedIndex, routes: stackRoutes } = useStackNavigationContext();
+	const [index, setIndex] = useState(0);
+	const [routes, setRoutes] = useState<
+		NavigationRoute<ParamListBase, string>[]
+	>([]);
+
+	const progressValues = useMemo(
+		() => stackRoutes.map((route) => AnimationStore.getAll(route.key)),
+		[stackRoutes],
+	);
+
+	const parentIndex = useDerivedValue(() => {
+		"worklet";
+
+		const activeIndex = progressValues.length - 1;
+		const isOneDismissing = Number(
+			progressValues.some((value) => value.closing.value > 0),
+		);
+
+		const optimisticIndex = activeIndex - isOneDismissing;
+
+		return optimisticIndex;
+	}, [focusedIndex, progressValues]);
+
+	const parentIndexValue = useSharedValueState(parentIndex);
+
+	const _registerNested = useCallback(
+		(
+			nestedIndex: number,
+			nestedRoutes: NavigationRoute<ParamListBase, string>[],
+		) => {
+			if (nestedIndex !== index) {
+				setIndex(nestedIndex);
+			}
+			if (nestedRoutes.length !== routes.length) {
+				setRoutes(nestedRoutes);
+			}
+		},
+		[routes.length, index],
+	);
+
+	const context = useBlankStackState();
+
+	useEffect(() => {
+		//@ts-expect-error Internally used
+		if (context?._registerNested) {
+			//@ts-expect-error Internally used
+			context._registerNested(parentIndexValue, stackRoutes);
+		}
+		//@ts-expect-error Internally used
+	}, [parentIndexValue, context?._registerNested, stackRoutes]);
+
+	return {
+		value: {
+			parentIndex: parentIndexValue,
+			parentRoutes: stackRoutes,
+			index,
+			routes,
+			_registerNested,
+		},
+	};
+});
+
+export { useBlankStackState, BlankStackStateProvider };

package/src/blank-stack/types.ts

@@ -107,6 +107,10 @@ export type BlankStackOverlayProps = {
 	 * Route object for the current screen.
 	 */
 	route: Route<string>;
+	/**
+	 * Route object for the currently focused screen in the stack.
+	 */
+	focusedRoute: Route<string>;
 	/**
 	 * Navigation prop for the overlay.
 	 */

package/src/native-stack/views/NativeStackView.native.tsx

@@ -513,11 +513,13 @@ export function NativeStackView({
 			return acc;
 		}, {});
 
+	const routes = state.routes.concat(state.preloadedRoutes);
+
 	return (
 		<GestureHandlerRootView>
 			<SafeAreaProviderCompat>
 				<ScreenStack style={styles.container}>
-					{state.routes.concat(state.preloadedRoutes).map((route, index) => {
+					{routes.map((route, index) => {
 						const descriptor =
 							descriptors[route.key] ?? preloadedDescriptors[route.key];
 						const isFocused = state.index === index;

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

@@ -4,10 +4,11 @@ import type { BlankStackDescriptor } from "../../../blank-stack/types";
 import { useStackNavigationContext } from "../../../blank-stack/utils/with-stack-navigation";
 import type { NativeStackDescriptor } from "../../../native-stack/types";
 import { useParentGestureRegistry } from "../../hooks/gestures/use-parent-gesture-registry";
+import { useDerivedValueState } from "../../hooks/use-derived-value-state";
 import useStableCallback from "../../hooks/use-stable-callback";
+import { useGestureContext } from "../../providers/gestures";
 import { useKeys } from "../../providers/keys";
 import { AnimationStore } from "../../stores/animation-store";
-import { NavigatorDismissState } from "../../stores/navigator-dismiss-state";
 import { resetStoresForScreen } from "../../stores/utils/reset-stores-for-screen";
 import { startScreenTransition } from "../../utils/animation/start-screen-transition";
 
@@ -22,19 +23,22 @@ export const NativeStackScreenLifecycleController = ({
 	children,
 }: ScreenLifecycleProps) => {
 	const { current } = useKeys<NativeStackDescriptor>();
+	const { parentContext } = useGestureContext();
+
+	const isParentDismissingViaGesture = useDerivedValueState(() => {
+		"worklet";
+		return parentContext?.gestureAnimationValues.isDismissing?.value ?? false;
+	});
 
 	const animations = AnimationStore.getAll(current.route.key);
 
 	const handleBeforeRemove = useStableCallback((e: any) => {
-		const key = current.navigation.getParent()?.getState().key;
-		const requestedDismissOnNavigator = NavigatorDismissState.get(key);
-
 		const isEnabled = current.options.enableTransitions;
-		const isRequestedDismissOnNavigator = requestedDismissOnNavigator;
+
 		const isFirstScreen = current.navigation.getState().index === 0;
 
 		// If transitions are disabled, or the dismissal was on the local root, or this is the first screen of the stack, reset the stores
-		if (!isEnabled || isRequestedDismissOnNavigator || isFirstScreen) {
+		if (!isEnabled || isParentDismissingViaGesture || isFirstScreen) {
 			resetStoresForScreen(current);
 			return;
 		}
@@ -105,6 +109,10 @@ export const BlankStackScreenLifecycleController = ({
 		});
 	});
 
+	const handleCleanup = useStableCallback(() => {
+		resetStoresForScreen(current);
+	});
+
 	const handleCloseEnd = useStableCallback((finished: boolean) => {
 		if (!finished) {
 			return;
@@ -130,7 +138,12 @@ export const BlankStackScreenLifecycleController = ({
 		},
 	);
 
-	useLayoutEffect(handleInitialize);
+	useLayoutEffect(() => {
+		handleInitialize();
+		return () => {
+			handleCleanup();
+		};
+	}, [handleInitialize, handleCleanup]);
 
 	// important for t.a scrollviews inside nested navigators.
 	useParentGestureRegistry();

package/src/shared/hooks/animation/use-screen-animation.tsx

@@ -9,6 +9,7 @@ import {
 	NO_BOUNDS_MAP,
 } from "../../constants";
 import { type TransitionDescriptor, useKeys } from "../../providers/keys";
+
 import { AnimationStore } from "../../stores/animation-store";
 import { BoundStore } from "../../stores/bound-store";
 import { GestureStore, type GestureStoreMap } from "../../stores/gesture-store";
@@ -121,7 +122,6 @@ export function _useScreenAnimation() {
 			focused,
 			activeBoundId,
 			progress,
-
 			active,
 			isActiveTransitioning,
 			isDismissing,

package/src/shared/hooks/bounds/use-bound-registry.tsx

@@ -1,4 +1,11 @@
-import { createContext, Fragment, useContext, useMemo } from "react";
+import {
+	createContext,
+	Fragment,
+	useContext,
+	useLayoutEffect,
+	useMemo,
+	useRef,
+} from "react";
 import type { View } from "react-native";
 import {
 	type AnimatedRef,
@@ -132,6 +139,30 @@ export const useBoundsRegistry = ({
 		);
 	}, [IS_ROOT, sharedBoundTag, ROOT_SIGNAL]);
 
+	const prevNextRef = useRef(next);
+	/**
+	 * Measure non-pressable elements when the screen goes from focused to blurred
+	 * (or when a new `next` descriptor appears) so we capture final bounds
+	 * right before the transition starts.
+	 */
+	useLayoutEffect(() => {
+		if (!sharedBoundTag || onPress) return;
+
+		const hadNext = !!prevNextRef.current;
+		const hasNext = !!next;
+
+		if (!hadNext && hasNext) {
+			runOnUI(maybeMeasureAndStore)({});
+		}
+
+		prevNextRef.current = next;
+	}, [next, sharedBoundTag, onPress, maybeMeasureAndStore]);
+
+	/**
+	 * Signal child shared elements (nested under this provider) to refresh their
+	 * measurements when the root updates, while preventing them from marking
+	 * themselves active during that sync.
+	 */
 	useAnimatedReaction(
 		() => ROOT_MEASUREMENT_SIGNAL?.updateSignal.value,
 		(current) => {