react-native-screen-transitions 3.2.0-beta.2 → 3.2.0-beta.3

package/lib/typescript/shared/types/screen.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screen.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/screen.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EACX,uBAAuB,EACvB,cAAc,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEjE,MAAM,MAAM,MAAM,GAAG;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;IACvE;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;;;;;;OAcG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAElD;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IAEzD;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAE9C;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE/B;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,KAAK,CAAC,SAAS,CAAC;IAEnD;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;;;;;;OASG;IACH,kCAAkC,CAAC,EAAE,OAAO,CAAC;CAC7C,CAAC"}
+{"version":3,"file":"screen.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/screen.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EACX,uBAAuB,EACvB,cAAc,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEjE,MAAM,MAAM,MAAM,GAAG;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;IACvE;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;;;;;;OAcG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAElD;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IAEzD;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAE9C;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE/B;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,KAAK,CAAC,SAAS,CAAC;IAEnD;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;;;;;;OASG;IACH,kCAAkC,CAAC,EAAE,OAAO,CAAC;CAC7C,CAAC"}

package/lib/typescript/shared/types/stack.types.d.ts

@@ -18,8 +18,10 @@ export interface BaseStackNavigation {
             key: string;
         }>;
         key: string;
+        index: number;
     };
     dispatch: (action: any) => void;
+    addListener?: (event: any, callback: any) => () => void;
 }
 /**
  * Base descriptor interface - generic over route, navigation, and options.
@@ -48,6 +50,13 @@ export interface BaseStackState<TRoute extends BaseStackRoute = BaseStackRoute>
     index: number;
     key: string;
 }
+/**
+ * Generic descriptor map - keyed by route key.
+ * Use this instead of defining stack-specific DescriptorMap types.
+ */
+export type DescriptorMap<TDescriptor extends BaseStackDescriptor = BaseStackDescriptor> = {
+    [key: string]: TDescriptor;
+};
 export declare enum StackType {
     NATIVE = "native",
     BLANK = "blank",

package/lib/typescript/shared/types/stack.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stack.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/stack.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IACnC,QAAQ,EAAE,MAAM;QAAE,MAAM,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB,CACnC,MAAM,SAAS,cAAc,GAAG,cAAc,EAC9C,WAAW,SAAS,mBAAmB,GAAG,mBAAmB,EAC7D,QAAQ,SAAS,sBAAsB,GAAG,sBAAsB;IAEhE,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc,CAC9B,WAAW,SAAS,mBAAmB,GAAG,mBAAmB;IAE7D,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,UAAU,EAAE,WAAW,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc,CAC9B,MAAM,SAAS,cAAc,GAAG,cAAc;IAE9C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACZ;AAED,oBAAY,SAAS;IACpB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,SAAS,cAAc;CACvB"}
+{"version":3,"file":"stack.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/stack.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IACnC,QAAQ,EAAE,MAAM;QACf,MAAM,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAC/B,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACd,CAAC;IACF,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,KAAK,MAAM,IAAI,CAAC;CACxD;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB,CACnC,MAAM,SAAS,cAAc,GAAG,cAAc,EAC9C,WAAW,SAAS,mBAAmB,GAAG,mBAAmB,EAC7D,QAAQ,SAAS,sBAAsB,GAAG,sBAAsB;IAEhE,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc,CAC9B,WAAW,SAAS,mBAAmB,GAAG,mBAAmB;IAE7D,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,UAAU,EAAE,WAAW,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc,CAC9B,MAAM,SAAS,cAAc,GAAG,cAAc;IAE9C,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACZ;AAED;;;GAGG;AACH,MAAM,MAAM,aAAa,CACxB,WAAW,SAAS,mBAAmB,GAAG,mBAAmB,IAC1D;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;CAC3B,CAAC;AAEF,oBAAY,SAAS;IACpB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,SAAS,cAAc;CACvB"}

package/lib/typescript/shared/utils/animation/start-screen-transition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-screen-transition.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/animation/start-screen-transition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAIlE,UAAU,0BAA0B;IACnC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,iBAAiB,CAAC;IAC9B,iFAAiF;IACjF,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,qBAAqB,GAAI,mEAMnC,0BAA0B,SA0C5B,CAAC"}
+{"version":3,"file":"start-screen-transition.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/animation/start-screen-transition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE,UAAU,0BAA0B;IACnC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,iBAAiB,CAAC;IAC9B,iFAAiF;IACjF,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,qBAAqB,GAAI,mEAMnC,0BAA0B,SA0C5B,CAAC"}

package/lib/typescript/shared/utils/bounds/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/bounds/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACX,wBAAwB,EAExB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,0BAA0B,CAAC;AAkK3E,eAAO,MAAM,YAAY,GACxB,OAAO,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,KAC7C,cA0EF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/shared/utils/bounds/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACX,wBAAwB,EAExB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,0BAA0B,CAAC;AAkK3E,eAAO,MAAM,YAAY,GACxB,OAAO,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,KAC7C,cA+EF,CAAC"}

package/package.json

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

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

@@ -5,7 +5,6 @@ import {
 import * as React from "react";
 import { Fragment } from "react";
 import { Overlay } from "../../shared/components/overlay";
-import { ManagedLifecycle } from "../../shared/controller/managed-lifecycle";
 import { ScreenComposer } from "../../shared/providers/screen/screen-composer";
 import { withStackCore } from "../../shared/providers/stack/core.provider";
 import { withManagedStack } from "../../shared/providers/stack/managed.provider";
@@ -79,7 +78,6 @@ export const StackView = withStackCore(
 										previous={previousDescriptor}
 										current={descriptor}
 										next={nextDescriptor}
-										LifecycleController={ManagedLifecycle}
 									>
 										<SceneView key={route.key} descriptor={descriptor} />
 									</ScreenComposer>

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

@@ -5,7 +5,6 @@ import {
 import * as React from "react";
 import { Fragment } from "react";
 import { Overlay } from "../../shared/components/overlay";
-import { ManagedLifecycle } from "../../shared/controller/managed-lifecycle";
 import { ScreenComposer } from "../../shared/providers/screen/screen-composer";
 import { withStackCore } from "../../shared/providers/stack/core.provider";
 import { withManagedStack } from "../../shared/providers/stack/managed.provider";
@@ -79,7 +78,6 @@ export const StackView = withStackCore(
 										previous={previousDescriptor}
 										current={descriptor}
 										next={nextDescriptor}
-										LifecycleController={ManagedLifecycle}
 									>
 										<SceneView key={route.key} descriptor={descriptor} />
 									</ScreenComposer>

package/src/blank-stack/types.ts

@@ -4,7 +4,6 @@ import type {
 	NavigationHelpers,
 	NavigationProp,
 	ParamListBase,
-	Route,
 	RouteProp,
 	StackActionHelpers,
 	StackNavigationState,
@@ -13,6 +12,10 @@ import type {
 } from "@react-navigation/native";
 import type { ScreenTransitionConfig } from "../shared";
 import type { OverlayProps } from "../shared/types/overlay.types";
+import type {
+	BaseStackScene,
+	DescriptorMap,
+} from "../shared/types/stack.types";
 
 export type BlankStackNavigationEventMap = {};
 
@@ -52,10 +55,7 @@ export type BlankStackNavigationHelpers = NavigationHelpers<
 	BlankStackNavigationEventMap
 >;
 
-export type BlankStackScene = {
-	route: Route<string>;
-	descriptor: BlankStackDescriptor;
-};
+export type BlankStackScene = BaseStackScene<BlankStackDescriptor>;
 
 type BlankStackNavigationConfig = {
 	DISABLE_NATIVE_SCREENS?: boolean;
@@ -106,6 +106,4 @@ export type BlankStackDescriptor = Descriptor<
 	RouteProp<ParamListBase>
 >;
 
-export type BlankStackDescriptorMap = {
-	[key: string]: BlankStackDescriptor;
-};
+export type BlankStackDescriptorMap = DescriptorMap<BlankStackDescriptor>;

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

@@ -5,7 +5,6 @@ import {
 import * as React from "react";
 import { Fragment } from "react";
 import { Overlay } from "../../shared/components/overlay";
-import { ManagedLifecycle } from "../../shared/controller/managed-lifecycle";
 import { ScreenComposer } from "../../shared/providers/screen/screen-composer";
 import { withStackCore } from "../../shared/providers/stack/core.provider";
 import { withManagedStack } from "../../shared/providers/stack/managed.provider";
@@ -43,30 +42,27 @@ export const StackView = withStackCore(
 				<Fragment>
 					{shouldShowFloatOverlay ? <Overlay.Float /> : null}
 
-					<Fragment>
-						{scenes.map((scene, sceneIndex) => {
-							const descriptor = scene.descriptor;
-							const route = scene.route;
+					{scenes.map((scene, sceneIndex) => {
+						const descriptor = scene.descriptor;
+						const route = scene.route;
 
-							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;
 
-							return (
-								<ComponentScreen key={route.key} routeKey={route.key}>
-									<ScreenComposer
-										previous={previousDescriptor}
-										current={descriptor}
-										next={nextDescriptor}
-										LifecycleController={ManagedLifecycle}
-									>
-										<SceneView key={route.key} descriptor={descriptor} />
-									</ScreenComposer>
-								</ComponentScreen>
-							);
-						})}
-					</Fragment>
+						return (
+							<ComponentScreen key={route.key} routeKey={route.key}>
+								<ScreenComposer
+									previous={previousDescriptor}
+									current={descriptor}
+									next={nextDescriptor}
+								>
+									<SceneView key={route.key} descriptor={descriptor} />
+								</ScreenComposer>
+							</ComponentScreen>
+						);
+					})}
 				</Fragment>
 			);
 		},

package/src/component-stack/types.ts

@@ -4,7 +4,6 @@ import type {
 	NavigationHelpers,
 	NavigationProp,
 	ParamListBase,
-	Route,
 	RouteProp,
 	StackActionHelpers,
 	StackNavigationState,
@@ -13,6 +12,10 @@ import type {
 } from "@react-navigation/native";
 import type { ScreenTransitionConfig } from "../shared";
 import type { OverlayProps } from "../shared/types/overlay.types";
+import type {
+	BaseStackScene,
+	DescriptorMap,
+} from "../shared/types/stack.types";
 
 export type ComponentStackNavigationEventMap = {};
 
@@ -52,10 +55,7 @@ export type ComponentStackNavigationHelpers = NavigationHelpers<
 	ComponentStackNavigationEventMap
 >;
 
-export type ComponentStackScene = {
-	route: Route<string>;
-	descriptor: ComponentStackDescriptor;
-};
+export type ComponentStackScene = BaseStackScene<ComponentStackDescriptor>;
 
 type ComponentStackNavigationConfig = {};
 
@@ -96,6 +96,5 @@ export type ComponentStackDescriptor = Descriptor<
 	RouteProp<ParamListBase>
 >;
 
-export type ComponentStackDescriptorMap = {
-	[key: string]: ComponentStackDescriptor;
-};
+export type ComponentStackDescriptorMap =
+	DescriptorMap<ComponentStackDescriptor>;

package/src/native-stack/types.ts

@@ -24,6 +24,7 @@ import type {
 } from "react-native-screens";
 import type { OverlayProps } from "../shared/types/overlay.types";
 import type { ScreenTransitionConfig } from "../shared/types/screen.types";
+import type { DescriptorMap } from "../shared/types/stack.types";
 
 export type NativeStackNavigationEventMap = {
 	/**
@@ -717,6 +718,4 @@ export type NativeStackDescriptor = Descriptor<
 	RouteProp<ParamListBase>
 >;
 
-export type NativeStackDescriptorMap = {
-	[key: string]: NativeStackDescriptor;
-};
+export type NativeStackDescriptorMap = DescriptorMap<NativeStackDescriptor>;

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

@@ -35,7 +35,7 @@ import {
 	type DirectStackContextValue,
 	withDirectStack,
 } from "../../shared/providers/stack/direct.provider";
-import { NativeStackScreenLifecycleController } from "../controllers/native-stack-lifecycle";
+import { StackType } from "../../shared/types/stack.types";
 import type { NativeStackDescriptor } from "../types";
 import { debounce } from "../utils/debounce";
 import { getModalRouteKeys } from "../utils/getModalRoutesKeys";
@@ -468,7 +468,6 @@ const SceneView = ({
 										previous={previousDescriptor}
 										current={descriptor}
 										next={nextDescriptor}
-										LifecycleController={NativeStackScreenLifecycleController}
 									>
 										{render()}
 									</ScreenComposer>
@@ -483,7 +482,7 @@ const SceneView = ({
 };
 
 export const NativeStackView = withStackCore(
-	{ TRANSITIONS_ALWAYS_ON: false },
+	{ TRANSITIONS_ALWAYS_ON: false, STACK_TYPE: StackType.NATIVE },
 	withDirectStack(function NativeStackViewContent({
 		state,
 		navigation,

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

@@ -10,7 +10,7 @@ import { OverlayHost } from "./overlay-host";
  * Gets routes and descriptors from stack context.
  */
 export function FloatOverlay() {
-	const { routes, scenes, focusedIndex, flags } = useStack();
+	const { scenes, focusedIndex, flags } = useStack();
 
 	const activeOverlay = useMemo(
 		() =>
@@ -31,13 +31,7 @@ export function FloatOverlay() {
 	return (
 		<KeysProvider current={current} previous={previous} next={next}>
 			<ScreenStylesProvider>
-				<OverlayHost
-					scene={scene}
-					scenes={scenes}
-					routes={routes}
-					overlayIndex={overlayIndex}
-					isFloating
-				/>
+				<OverlayHost scene={scene} />
 			</ScreenStylesProvider>
 		</KeysProvider>
 	);

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

@@ -1,131 +1,65 @@
 import {
 	NavigationContext,
 	NavigationRouteContext,
-	type Route,
 } from "@react-navigation/native";
 import { memo, useMemo } from "react";
 import { Animated, StyleSheet, useWindowDimensions, View } from "react-native";
 import { useDerivedValue } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useScreenAnimation } from "../../../hooks/animation/use-screen-animation";
-import { type StackScene, useStack } from "../../../hooks/navigation/use-stack";
-import { useSharedValueState } from "../../../hooks/reanimated/use-shared-value-state";
+import { useScreenState } from "../../../hooks/navigation/use-screen-state";
+import type { StackScene } from "../../../hooks/navigation/use-stack";
+import type { BaseDescriptor } from "../../../providers/screen/keys.provider";
 import type { OverlayInterpolationProps } from "../../../types/animation.types";
 import type { OverlayProps } from "../../../types/overlay.types";
 
 type OverlayHostProps = {
 	scene: StackScene;
-	scenes: StackScene[];
-	routes: Route<string>[];
-	overlayIndex: number;
-	isFloating?: boolean;
 };
 
 export const OverlayHost = memo(function OverlayHost({
 	scene,
-	scenes,
-	routes,
-	overlayIndex,
-	isFloating,
 }: OverlayHostProps) {
 	const OverlayComponent = scene.descriptor.options.overlay;
 	const screen = useWindowDimensions();
-
-	const { stackProgress, optimisticFocusedIndex, routeKeys } = useStack();
 	const insets = useSafeAreaInsets();
 
+	const screenAnimation = useScreenAnimation();
+	const screenState = useScreenState();
 	const relativeProgress = useDerivedValue(() => {
 		"worklet";
-		return stackProgress.value - overlayIndex;
+		return screenAnimation.value.stackProgress;
 	});
 
-	// For float overlays: global focused index (can be any screen in the stack)
-	// For screen overlays: relative to overlay position (only screens at or after)
-	const optimisticActiveIndex = useSharedValueState(
-		useDerivedValue(() => {
-			"worklet";
-			if (isFloating) {
-				// For float overlays, use global optimistic focused index directly
-				const globalIndex = optimisticFocusedIndex.get();
-				const clampedIndex = Math.max(
-					0,
-					Math.min(globalIndex, routeKeys.length - 1),
-				);
-				return clampedIndex;
-			}
-
-			// For screen overlays, compute relative to overlay position
-			const screensAbove = routeKeys.length - 1 - overlayIndex;
-			const relativeOptimistic = optimisticFocusedIndex.value - overlayIndex;
-			const result = Math.max(0, Math.min(relativeOptimistic, screensAbove));
-
-			return result;
-		}),
-	);
-
 	const overlayAnimation = useDerivedValue<OverlayInterpolationProps>(() => ({
 		progress: relativeProgress.value,
 		layouts: { screen },
 		insets,
 	}));
 
-	const focusedScene = useMemo(() => {
-		if (overlayIndex === -1) {
-			return scene;
-		}
-
-		if (isFloating) {
-			// For float overlays, optimisticActiveIndex is the global focused index
-			return scenes[optimisticActiveIndex] ?? scene;
-		}
-
-		// For screen overlays, optimisticActiveIndex is relative to overlayIndex
-		const maxOffset = Math.max(scenes.length - overlayIndex - 1, 0);
-		const normalizedIndex = Math.min(
-			Math.max(optimisticActiveIndex, 0),
-			maxOffset,
-		);
-
-		return scenes[overlayIndex + normalizedIndex] ?? scene;
-	}, [overlayIndex, optimisticActiveIndex, scenes, scene, isFloating]);
-
-	const screenAnimation = useScreenAnimation();
+	const overlayProps: OverlayProps<BaseDescriptor["navigation"]> = useMemo(
+		() => ({
+			...screenState,
+			progress: relativeProgress,
+			overlayAnimation, //Deprecated
+			screenAnimation, //Deprecated
+		}),
+		[relativeProgress, overlayAnimation, screenAnimation, screenState],
+	);
 
 	if (!OverlayComponent) {
 		return null;
 	}
 
-	const overlayProps: OverlayProps<typeof scene.descriptor.navigation> = {
-		routes,
-		overlayAnimation,
-		screenAnimation,
-		focusedRoute: focusedScene.route,
-		focusedIndex: optimisticActiveIndex,
-		meta: focusedScene.descriptor.options.meta,
-		navigation: scene.descriptor.navigation,
-	};
-
-	// Cast to OverlayProps function - container overlays are handled by ContainerOverlay component
-	const renderOverlay = OverlayComponent as (
-		props: OverlayProps,
-	) => React.ReactNode;
-
 	return (
 		<Animated.View
 			pointerEvents="box-none"
-			style={[
-				styles.container,
-				isFloating ? styles.floating : { zIndex: 1 },
-				styles.absolute,
-			]}
+			style={[styles.container, styles.floating, styles.absolute]}
 		>
-			<NavigationContext.Provider
-				// biome-ignore lint/suspicious/noExplicitAny: navigation type varies by stack
-				value={scene.descriptor.navigation as any}
-			>
+			<NavigationContext.Provider value={scene.descriptor.navigation as any}>
 				<NavigationRouteContext.Provider value={scene.route}>
 					<View pointerEvents="box-none" style={styles.overlay}>
-						{renderOverlay(overlayProps)}
+						<OverlayComponent {...overlayProps} />
 					</View>
 				</NavigationRouteContext.Provider>
 			</NavigationContext.Provider>

package/src/shared/components/overlay/variations/screen-overlay.tsx

@@ -10,10 +10,14 @@ import { OverlayHost } from "./overlay-host";
 /**
  * Screen overlay component that renders per-screen.
  * Gets current descriptor from keys context.
+ *
+ * @deprecated Screen overlays are deprecated. For per-screen overlays, render an
+ * absolute-positioned view directly in your screen component and use `useScreenAnimation()`
+ * to access animation values. This component will be removed in a future version.
  */
 export function ScreenOverlay() {
 	const { current } = useKeys<StackDescriptor>();
-	const { routeKeys, flags } = useStack();
+	const { flags } = useStack();
 
 	const options = current.options;
 
@@ -25,12 +29,6 @@ export function ScreenOverlay() {
 		[current],
 	);
 
-	// Find the index of this screen in the stack
-	const overlayIndex = useMemo(
-		() => routeKeys.indexOf(current.route.key),
-		[routeKeys, current.route.key],
-	);
-
 	// Skip screens without enableTransitions (native-stack only)
 	if (!flags.TRANSITIONS_ALWAYS_ON && !options.enableTransitions) {
 		return null;
@@ -40,12 +38,5 @@ export function ScreenOverlay() {
 		return null;
 	}
 
-	return (
-		<OverlayHost
-			scene={scene}
-			scenes={[scene]}
-			routes={[]}
-			overlayIndex={overlayIndex}
-		/>
-	);
+	return <OverlayHost scene={scene} />;
 }

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

@@ -0,0 +1,168 @@
+import { useLayoutEffect } from "react";
+import {
+	runOnJS,
+	useAnimatedReaction,
+	useDerivedValue,
+} from "react-native-reanimated";
+import { useHighRefreshRate } from "../hooks/animation/use-high-refresh-rate";
+import { useSharedValueState } from "../hooks/reanimated/use-shared-value-state";
+import useStableCallback from "../hooks/use-stable-callback";
+import { useGestureContext } from "../providers/gestures.provider";
+import {
+	type BaseDescriptor,
+	useKeys,
+} from "../providers/screen/keys.provider";
+import { useStackCoreContext } from "../providers/stack/core.provider";
+import { useManagedStackContext } from "../providers/stack/managed.provider";
+import { AnimationStore } from "../stores/animation.store";
+import { StackType } from "../types/stack.types";
+import { startScreenTransition } from "../utils/animation/start-screen-transition";
+import { resetStoresForScreen } from "../utils/reset-stores-for-screen";
+
+interface Props {
+	children: React.ReactNode;
+}
+
+interface CloseHookParams {
+	current: BaseDescriptor;
+	animations: ReturnType<typeof AnimationStore.getAll>;
+	activate: () => void;
+	deactivate: () => void;
+}
+
+/**
+ * Managed close - reacts to closingRouteKeysShared from ManagedStackContext.
+ * Used by blank-stack and component-stack.
+ */
+const useManagedClose = ({
+	current,
+	animations,
+	activate,
+	deactivate,
+}: CloseHookParams) => {
+	const { handleCloseRoute, closingRouteKeysShared } = useManagedStackContext();
+
+	const handleCloseEnd = useStableCallback((finished: boolean) => {
+		if (!finished) return;
+		handleCloseRoute({ route: current.route });
+		requestAnimationFrame(() => {
+			deactivate();
+			resetStoresForScreen(current);
+		});
+	});
+
+	useAnimatedReaction(
+		() => closingRouteKeysShared.value,
+		(keys) => {
+			if (!keys?.includes(current.route.key)) return;
+
+			runOnJS(activate)();
+			startScreenTransition({
+				target: "close",
+				spec: current.options.transitionSpec,
+				animations,
+				onAnimationFinish: handleCloseEnd,
+			});
+		},
+	);
+};
+
+/**
+ * Native stack close - listens to beforeRemove navigation event.
+ */
+const useNativeStackClose = ({
+	current,
+	animations,
+	activate,
+	deactivate,
+}: CloseHookParams) => {
+	const gestureCtx = useGestureContext();
+
+	const isAncestorDismissingViaGesture = useSharedValueState(
+		useDerivedValue(() => {
+			"worklet";
+			return (
+				gestureCtx?.ancestorContext?.gestureAnimationValues.isDismissing
+					?.value ?? false
+			);
+		}),
+	);
+
+	const handleBeforeRemove = useStableCallback((e: any) => {
+		const options = current.options as { enableTransitions?: boolean };
+		const isEnabled = options.enableTransitions;
+		const navigation = current.navigation;
+		const isFirstScreen = navigation.getState().index === 0;
+
+		// If transitions are disabled, ancestor is dismissing, or first screen - let native handle it
+		if (!isEnabled || isAncestorDismissingViaGesture || isFirstScreen) {
+			animations.closing.set(1);
+			resetStoresForScreen(current);
+			return;
+		}
+
+		e.preventDefault();
+		activate();
+
+		startScreenTransition({
+			target: "close",
+			spec: current.options.transitionSpec,
+			animations,
+			onAnimationFinish: (finished: boolean) => {
+				deactivate();
+				if (finished) {
+					navigation.dispatch(e.data.action);
+					requestAnimationFrame(() => {
+						resetStoresForScreen(current);
+					});
+				}
+			},
+		});
+	});
+
+	// biome-ignore lint/correctness/useExhaustiveDependencies: Only re-subscribe when navigation changes
+	useLayoutEffect(() => {
+		return current.navigation.addListener?.("beforeRemove", handleBeforeRemove);
+	}, [current.navigation]);
+};
+
+/**
+ * Unified lifecycle controller for all stack types.
+ */
+export const ScreenLifecycle = ({ children }: Props) => {
+	const { flags } = useStackCoreContext();
+	const { current } = useKeys();
+	const animations = AnimationStore.getAll(current.route.key);
+	const { activateHighRefreshRate, deactivateHighRefreshRate } =
+		useHighRefreshRate(current);
+
+	const isNativeStack = flags.STACK_TYPE === StackType.NATIVE;
+
+	// biome-ignore lint/correctness/useExhaustiveDependencies: Must only run once on mount
+	useLayoutEffect(() => {
+		activateHighRefreshRate();
+		startScreenTransition({
+			target: "open",
+			spec: current.options.transitionSpec,
+			animations,
+			onAnimationFinish: deactivateHighRefreshRate,
+		});
+	}, []);
+
+	const closeParams: CloseHookParams = {
+		current,
+		animations,
+		activate: activateHighRefreshRate,
+		deactivate: deactivateHighRefreshRate,
+	};
+
+	if (isNativeStack) {
+		// biome-ignore lint/correctness/useHookAtTopLevel: STACK_TYPE is stable per screen instance
+		useNativeStackClose(closeParams);
+	} else {
+		// biome-ignore lint/correctness/useHookAtTopLevel: STACK_TYPE is stable per screen instance
+		useManagedClose(closeParams);
+	}
+
+	return children;
+};