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

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

@@ -1,6 +1,12 @@
 import type { Route } from "@react-navigation/native";
 import type { DerivedValue } from "react-native-reanimated";
 import type { OverlayInterpolationProps, ScreenInterpolationProps } from "./animation.types";
+import type { ScreenTransitionConfig } from "./screen.types";
+/**
+ * @deprecated Overlay mode is no longer needed. Overlays now always render as "float" mode.
+ * For per-screen overlays, render an absolute-positioned view directly in your screen component
+ * and use `useScreenAnimation()` to access animation values.
+ */
 export type OverlayMode = "float" | "screen";
 /**
  * Props passed to overlay components.
@@ -27,12 +33,27 @@ export type OverlayProps<TNavigation = unknown> = {
      * Navigation prop for the overlay.
      */
     navigation: TNavigation;
+    /**
+     * Screen options for the currently focused screen.
+     */
+    options: ScreenTransitionConfig;
+    /**
+     * Stack progress relative to the overlay's position.
+     * This is equivalent to `useScreenAnimation().stackProgress`.
+     */
+    progress: DerivedValue<number>;
     /**
      * Animation values for the overlay.
+     *
+     * @deprecated Use `progress` prop or `useScreenAnimation()` instead.
+     * This prop will be removed in a future version.
      */
     overlayAnimation: DerivedValue<OverlayInterpolationProps>;
     /**
      * Animation values for the screen.
+     *
+     * @deprecated Use `useScreenAnimation()` hook directly instead.
+     * This prop will be removed in a future version.
      */
     screenAnimation: DerivedValue<ScreenInterpolationProps>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"overlay.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/overlay.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EACX,yBAAyB,EACzB,wBAAwB,EACxB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE7C;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,WAAW,GAAG,OAAO,IAAI;IACjD;;OAEG;IACH,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE/B;;OAEG;IACH,UAAU,EAAE,WAAW,CAAC;IAExB;;OAEG;IACH,gBAAgB,EAAE,YAAY,CAAC,yBAAyB,CAAC,CAAC;IAE1D;;OAEG;IACH,eAAe,EAAE,YAAY,CAAC,wBAAwB,CAAC,CAAC;CACxD,CAAC"}
+{"version":3,"file":"overlay.types.d.ts","sourceRoot":"","sources":["../../../../src/shared/types/overlay.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EACX,yBAAyB,EACzB,wBAAwB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE7C;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,WAAW,GAAG,OAAO,IAAI;IACjD;;OAEG;IACH,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE/B;;OAEG;IACH,UAAU,EAAE,WAAW,CAAC;IAExB;;OAEG;IACH,OAAO,EAAE,sBAAsB,CAAC;IAEhC;;;OAGG;IACH,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,YAAY,CAAC,yBAAyB,CAAC,CAAC;IAE1D;;;;;OAKG;IACH,eAAe,EAAE,YAAY,CAAC,wBAAwB,CAAC,CAAC;CACxD,CAAC"}

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

@@ -93,10 +93,11 @@ export type ScreenTransitionConfig = {
     overlay?: (props: OverlayProps) => React.ReactNode;
     /**
      * How the overlay is positioned relative to screens.
-     * - 'float': Single persistent overlay above all screens (like iOS tab bar)
-     * - 'screen': Per-screen overlay that transitions with content
-     * - 'container': Wraps all screen content, receives children prop (for MaskedView, custom containers)
-     * @default 'screen'
+     *
+     * @deprecated This option is no longer needed. Overlays now always render as "float" mode
+     * (single persistent overlay above all screens). For per-screen overlays, render an
+     * absolute-positioned view directly in your screen component and use `useScreenAnimation()`
+     * to access animation values.
      */
     overlayMode?: OverlayMode;
     /**

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,8 +50,16 @@ 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"
+    BLANK = "blank",
+    COMPONENT = "component"
 }
 //# sourceMappingURL=stack.types.d.ts.map

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;CACf"}
+{"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.1",
+  "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/component-screen.tsx

@@ -11,6 +11,8 @@ interface ScreenProps {
 	routeKey: string;
 	children: React.ReactNode;
 }
+const POINT_NONE = "none" as const;
+const POINT_BOX_NONE = "box-none" as const;
 
 export const ComponentScreen = ({ routeKey, children }: ScreenProps) => {
 	const sceneClosing = AnimationStore.getAnimation(routeKey, "closing");
@@ -18,9 +20,7 @@ export const ComponentScreen = ({ routeKey, children }: ScreenProps) => {
 
 	const animatedProps = useAnimatedProps(() => {
 		return {
-			pointerEvents: sceneClosing.get()
-				? ("none" as const)
-				: ("box-none" as const),
+			pointerEvents: sceneClosing.get() ? POINT_NONE : POINT_BOX_NONE,
 		};
 	});
 

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

@@ -5,16 +5,15 @@ 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";
+import { StackType } from "../../shared/types/stack.types";
 import type {
 	ComponentStackDescriptor,
 	ComponentStackNavigationHelpers,
 } from "../types";
 import { ComponentScreen } from "./component-screen";
-import { ComponentScreenContainer } from "./component-screen-container";
 
 type SceneViewProps = {
 	descriptor: ComponentStackDescriptor;
@@ -36,37 +35,34 @@ const SceneView = React.memo(function SceneView({
 });
 
 export const StackView = withStackCore(
-	{ TRANSITIONS_ALWAYS_ON: true },
+	{ TRANSITIONS_ALWAYS_ON: true, STACK_TYPE: StackType.COMPONENT },
 	withManagedStack<ComponentStackDescriptor, ComponentStackNavigationHelpers>(
 		({ scenes, shouldShowFloatOverlay }) => {
 			return (
 				<Fragment>
 					{shouldShowFloatOverlay ? <Overlay.Float /> : null}
 
-					<ComponentScreenContainer>
-						{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>
-							);
-						})}
-					</ComponentScreenContainer>
+						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/navigators/create-component-stack-navigator.tsx

@@ -12,6 +12,7 @@ import {
 	type TypedNavigator,
 	useNavigationBuilder,
 } from "@react-navigation/native";
+import * as React from "react";
 import { StackView } from "../components/stack-view";
 import type {
 	ComponentStackNavigationEventMap,
@@ -20,45 +21,75 @@ import type {
 	ComponentStackNavigatorProps,
 } from "../types";
 
-function ComponentStackNavigator({
-	id,
-	initialRouteName,
-	children,
-	layout,
-	screenListeners,
-	screenOptions,
-	screenLayout,
-	...rest
-}: ComponentStackNavigatorProps) {
-	const { state, describe, descriptors, navigation, NavigationContent } =
-		useNavigationBuilder<
-			StackNavigationState<ParamListBase>,
-			StackRouterOptions,
-			StackActionHelpers<ParamListBase>,
-			ComponentStackNavigationOptions,
-			ComponentStackNavigationEventMap
-		>(StackRouter, {
-			id,
-			initialRouteName,
-			children,
-			layout,
-			screenListeners,
-			screenOptions,
-			screenLayout,
-		});
+/**
+ * Context to detect if we're inside a ComponentStack.
+ * Used to avoid double-wrapping nested ComponentStacks in NavigationIndependentTree.
+ */
+const ComponentStackContext = React.createContext<boolean>(false);
+ComponentStackContext.displayName = "ComponentStackContext";
+
+const ComponentStackNavigatorInner = React.memo(
+	function ComponentStackNavigatorInner({
+		id,
+		initialRouteName,
+		children,
+		layout,
+		screenListeners,
+		screenOptions,
+		screenLayout,
+		...rest
+	}: ComponentStackNavigatorProps) {
+		const { state, describe, descriptors, navigation, NavigationContent } =
+			useNavigationBuilder<
+				StackNavigationState<ParamListBase>,
+				StackRouterOptions,
+				StackActionHelpers<ParamListBase>,
+				ComponentStackNavigationOptions,
+				ComponentStackNavigationEventMap
+			>(StackRouter, {
+				id,
+				initialRouteName,
+				children,
+				layout,
+				screenListeners,
+				screenOptions,
+				screenLayout,
+			});
+
+		return (
+			<NavigationContent>
+				<StackView
+					{...rest}
+					state={state}
+					navigation={navigation}
+					descriptors={descriptors}
+					describe={describe}
+				/>
+			</NavigationContent>
+		);
+	},
+);
+
+/**
+ * ComponentStackNavigator conditionally wraps in NavigationIndependentTree.
+ * - If already inside a ComponentStack (nested), just render the inner navigator
+ *   so it participates in the parent's navigation tree and goBack() works.
+ * - If top-level, wrap in NavigationIndependentTree + NavigationContainer
+ *   to isolate from Expo Router / React Navigation.
+ */
+function IsolatedComponentStackNavigator(props: ComponentStackNavigatorProps) {
+	const isNested = React.useContext(ComponentStackContext);
+
+	if (isNested) {
+		return <ComponentStackNavigatorInner {...props} />;
+	}
 
 	return (
 		<NavigationIndependentTree>
 			<NavigationContainer>
-				<NavigationContent>
-					<StackView
-						{...rest}
-						state={state}
-						navigation={navigation}
-						descriptors={descriptors}
-						describe={describe}
-					/>
-				</NavigationContent>
+				<ComponentStackContext.Provider value={true}>
+					<ComponentStackNavigatorInner {...props} />
+				</ComponentStackContext.Provider>
 			</NavigationContainer>
 		</NavigationIndependentTree>
 	);
@@ -80,9 +111,9 @@ export function createComponentStackNavigator<
 				NavigatorID
 			>;
 		};
-		Navigator: typeof ComponentStackNavigator;
+		Navigator: typeof IsolatedComponentStackNavigator;
 	},
 	const Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,
 >(config?: Config): TypedNavigator<TypeBag, Config> {
-	return createNavigatorFactory(ComponentStackNavigator)(config);
+	return createNavigatorFactory(IsolatedComponentStackNavigator)(config);
 }

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>
 	);