react-native-screen-transitions 3.6.0 → 3.7.0-alpha.0

package/lib/module/shared/providers/stack/managed.provider.js

@@ -2,11 +2,10 @@
 
 import * as React from "react";
 import { useMemo } from "react";
-import { StackContext } from "../../hooks/navigation/use-stack";
+import { StackProvider } from "../../hooks/navigation/use-stack";
+import { AnimationStore } from "../../stores/animation.store";
 import { useStackCoreContext } from "./core.provider";
-import { useClosingRouteMap } from "./helpers/use-closing-route-map";
-import { useLocalRoutes } from "./helpers/use-local-routes";
-import { useProcessedRoutes } from "./helpers/use-processed-routes";
+import { useManagedStackState } from "./helpers/managed-stack-state";
 import { useStackDerived } from "./helpers/use-stack-derived";
 import { jsx as _jsx } from "react/jsx-runtime";
 const ManagedStackContext = /*#__PURE__*/React.createContext(null);
@@ -25,42 +24,32 @@ function useManagedStackValue(props) {
   const {
     state,
     handleCloseRoute,
-    closingRouteKeys
-  } = useLocalRoutes(props);
+    requestDismiss
+  } = useManagedStackState(props);
   const navigatorKey = props.state.key;
-  const processed = useProcessedRoutes(state.routes, state.descriptors);
+  const animationMaps = useMemo(() => state.routeKeys.map(routeKey => AnimationStore.getBag(routeKey)), [state.routeKeys]);
   const {
     optimisticFocusedIndex
-  } = useStackDerived(processed.animationMaps);
-  const closingRouteMap = useClosingRouteMap(processed.routeKeys, processed.animationMaps);
+  } = useStackDerived(animationMaps);
   const focusedIndex = props.state.index;
-
-  // Common stack context (consumed by useStack())
   const stackContextValue = useMemo(() => ({
     flags,
     navigatorKey,
-    routeKeys: processed.routeKeys,
+    routeKeys: state.routeKeys,
     routes: state.routes,
-    scenes: processed.scenes,
-    optimisticFocusedIndex
-  }), [flags, navigatorKey, processed.routeKeys, state.routes, processed.scenes, optimisticFocusedIndex]);
-
-  // Managed-specific context (consumed by useManagedStackContext())
+    scenes: state.scenes,
+    optimisticFocusedIndex,
+    focusedIndex,
+    requestDismiss
+  }), [flags, navigatorKey, state.routeKeys, state.routes, state.scenes, optimisticFocusedIndex, focusedIndex, requestDismiss]);
   const managedContextValue = useMemo(() => ({
-    activeScreensLimit: processed.activeScreensLimit,
-    closingRouteKeysShared: closingRouteKeys.shared,
-    handleCloseRoute,
-    backdropBehaviors: processed.backdropBehaviors
-  }), [processed.activeScreensLimit, closingRouteKeys.shared, handleCloseRoute, processed.backdropBehaviors]);
-
-  // Combined props for render children (stack-view components)
+    handleCloseRoute
+  }), [handleCloseRoute]);
   const renderProps = useMemo(() => ({
-    descriptors: state.descriptors,
-    scenes: processed.scenes,
+    scenes: state.scenes,
     focusedIndex,
-    closingRouteMap,
-    shouldShowFloatOverlay: processed.shouldShowFloatOverlay
-  }), [state.descriptors, processed.scenes, focusedIndex, closingRouteMap, processed.shouldShowFloatOverlay]);
+    shouldShowFloatOverlay: state.shouldShowFloatOverlay
+  }), [state.scenes, focusedIndex, state.shouldShowFloatOverlay]);
   return {
     stackContextValue,
     managedContextValue,
@@ -74,7 +63,7 @@ function withManagedStack(Component) {
       managedContextValue,
       renderProps
     } = useManagedStackValue(props);
-    return /*#__PURE__*/_jsx(StackContext.Provider, {
+    return /*#__PURE__*/_jsx(StackProvider, {
       value: stackContextValue,
       children: /*#__PURE__*/_jsx(ManagedStackContext.Provider, {
         value: managedContextValue,

package/lib/module/shared/providers/stack/managed.provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","StackContext","useStackCoreContext","useClosingRouteMap","useLocalRoutes","useProcessedRoutes","useStackDerived","jsx","_jsx","ManagedStackContext","createContext","displayName","useManagedStackContext","context","useContext","Error","useManagedStackValue","props","flags","state","handleCloseRoute","closingRouteKeys","navigatorKey","key","processed","routes","descriptors","optimisticFocusedIndex","animationMaps","closingRouteMap","routeKeys","focusedIndex","index","stackContextValue","scenes","managedContextValue","activeScreensLimit","closingRouteKeysShared","shared","backdropBehaviors","renderProps","shouldShowFloatOverlay","withManagedStack","Component","ManagedStackProvider","Provider","value","children"],"sourceRoot":"../../../../../src","sources":["shared/providers/stack/managed.provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","StackProvider","AnimationStore","useStackCoreContext","useManagedStackState","useStackDerived","jsx","_jsx","ManagedStackContext","createContext","displayName","useManagedStackContext","context","useContext","Error","useManagedStackValue","props","flags","state","handleCloseRoute","requestDismiss","navigatorKey","key","animationMaps","routeKeys","map","routeKey","getBag","optimisticFocusedIndex","focusedIndex","index","stackContextValue","routes","scenes","managedContextValue","renderProps","shouldShowFloatOverlay","withManagedStack","Component","ManagedStackProvider","value","children","Provider"],"sourceRoot":"../../../../../src","sources":["shared/providers/stack/managed.provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/types/stack.types.js.map

@@ -1 +1 @@
-{"version":3,"names":["StackType"],"sourceRoot":"../../../../src","sources":["shared/types/stack.types.ts"],"mappings":";;AAEA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;;AAOA,WAAYA,SAAS,0BAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}
+{"version":3,"names":["StackType"],"sourceRoot":"../../../../src","sources":["shared/types/stack.types.ts"],"mappings":";;AAEA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;;AAmBA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;;AAOA,WAAYA,SAAS,0BAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}

package/lib/module/shared/utils/create-provider.js

@@ -5,15 +5,48 @@
  * https://github.com/MatiPl01/react-native-sortables/blob/main/packages/react-native-sortables/src/providers/utils/createProvider.tsx
  * SUPER COOL AMAZING UTILITY
  */
-import { createContext, useContext, useMemo, useRef } from "react";
+import { createContext, useCallback, useContext, useLayoutEffect, useMemo, useRef, useSyncExternalStore } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
+const NullProviderStore = {
+  getSnapshot: () => null,
+  subscribe: () => () => {}
+};
+const createProviderStore = initialSnapshot => {
+  let snapshot = initialSnapshot;
+  const listeners = new Set();
+  return {
+    getSnapshot: () => snapshot,
+    notify: () => {
+      for (const listener of listeners) {
+        listener();
+      }
+    },
+    setSnapshot: nextSnapshot => {
+      if (Object.is(snapshot, nextSnapshot)) {
+        return false;
+      }
+      snapshot = nextSnapshot;
+      return true;
+    },
+    subscribe: listener => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    }
+  };
+};
 export default function createProvider(name, options) {
   return factory => {
     const {
       guarded = true
     } = options ?? {};
+    const providerDisplayName = `${name}Provider`;
+    const innerProviderDisplayName = `${name}InnerProvider`;
     const Context = /*#__PURE__*/createContext(null);
     Context.displayName = name;
+    const StoreContext = /*#__PURE__*/createContext(null);
+    StoreContext.displayName = `${name}Store`;
     const Provider = props => {
       const {
         children = props.children,
@@ -24,27 +57,52 @@ export default function createProvider(name, options) {
         throw new Error(`${name}Context value must be provided. You likely forgot to return it from the factory function.`);
       }
       const memoValue = useMemo(() => enabled ? value : null, [enabled, value]);
+      const storeRef = useRef(null);
+      const pendingNotifyRef = useRef(false);
+      if (storeRef.current === null) {
+        storeRef.current = createProviderStore(memoValue);
+      }
+      const store = storeRef.current;
+      pendingNotifyRef.current = store.setSnapshot(memoValue) || pendingNotifyRef.current;
+      useLayoutEffect(() => {
+        if (!pendingNotifyRef.current) {
+          return;
+        }
+        pendingNotifyRef.current = false;
+        store.notify();
+      });
 
       // Per-instance ref ensures InnerProvider reads latest value while keeping
       // a stable component reference.
       const valueRef = useRef(memoValue);
       valueRef.current = memoValue;
-      const InnerProvider = useMemo(() => ({
-        children
-      }) => /*#__PURE__*/_jsx(Context.Provider, {
-        value: valueRef.current,
-        children: children
-      }), []);
+      const InnerProvider = useMemo(() => {
+        const NamedInnerProvider = ({
+          children
+        }) => /*#__PURE__*/_jsx(StoreContext.Provider, {
+          value: store,
+          children: /*#__PURE__*/_jsx(Context.Provider, {
+            value: valueRef.current,
+            children: children
+          })
+        });
+        NamedInnerProvider.displayName = innerProviderDisplayName;
+        return NamedInnerProvider;
+      }, [store]);
       if (typeof children === "function") {
         return children({
           [`${name}Provider`]: InnerProvider
         });
       }
-      return /*#__PURE__*/_jsx(Context.Provider, {
-        value: memoValue,
-        children: children
+      return /*#__PURE__*/_jsx(StoreContext.Provider, {
+        value: store,
+        children: /*#__PURE__*/_jsx(Context.Provider, {
+          value: memoValue,
+          children: children
+        })
       });
     };
+    Provider.displayName = providerDisplayName;
     const useEnhancedContext = () => {
       const context = useContext(Context);
       if (guarded && context === null) {
@@ -52,10 +110,41 @@ export default function createProvider(name, options) {
       }
       return context;
     };
+    const useStoreSelector = selector => {
+      const store = useContext(StoreContext);
+      const resolvedStore = store ?? NullProviderStore;
+      const selectorRef = useRef(selector);
+      selectorRef.current = selector;
+      const getSelectedSnapshot = useCallback(() => {
+        if (guarded && store === null) {
+          throw new Error(`${name} store must be used within a ${name}Provider`);
+        }
+        const snapshot = resolvedStore.getSnapshot();
+        if (guarded && snapshot === null) {
+          throw new Error(`${name} store must be used within an enabled ${name}Provider`);
+        }
+        return selectorRef.current ? selectorRef.current(snapshot) : snapshot;
+      }, [resolvedStore, store]);
+      return useSyncExternalStore(resolvedStore.subscribe, getSelectedSnapshot, getSelectedSnapshot);
+    };
+    const useOptionalStoreSelector = selector => {
+      const store = useContext(StoreContext);
+      const resolvedStore = store ?? NullProviderStore;
+      const selectorRef = useRef(selector);
+      selectorRef.current = selector;
+      const getSelectedSnapshot = useCallback(() => {
+        const snapshot = resolvedStore.getSnapshot();
+        return selectorRef.current ? selectorRef.current(snapshot) : snapshot;
+      }, [resolvedStore]);
+      return useSyncExternalStore(resolvedStore.subscribe, getSelectedSnapshot, getSelectedSnapshot);
+    };
     return {
       [`${name}Context`]: Context,
+      [`${name}StoreContext`]: StoreContext,
       [`${name}Provider`]: Provider,
-      [`use${name}Context`]: useEnhancedContext
+      [`use${name}Context`]: useEnhancedContext,
+      [`use${name}Store`]: useStoreSelector,
+      [`use${name}OptionalStore`]: useOptionalStoreSelector
     };
   };
 }

package/lib/module/shared/utils/create-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useMemo","useRef","jsx","_jsx","createProvider","name","options","factory","guarded","Context","displayName","Provider","props","children","enabled","value","Error","memoValue","valueRef","current","InnerProvider","useEnhancedContext","context"],"sourceRoot":"../../../../src","sources":["shared/utils/create-provider.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA,SACCA,aAAa,EAEbC,UAAU,EACVC,OAAO,EACPC,MAAM,QACA,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAIf,eAAe,SAASC,cAAcA,CAGpCC,IAAkB,EAAEC,OAA+B,EAAE;EACtD,OACCC,OAUC,IACG;IACJ,MAAM;MAAEC,OAAO,GAAG;IAAK,CAAC,GAAGF,OAAO,IAAI,CAAC,CAAC;IAExC,MAAMG,OAAO,gBAAGX,aAAa,CAAsB,IAAI,CAAC;IACxDW,OAAO,CAACC,WAAW,GAAGL,IAAI;IAE1B,MAAMM,QAAiC,GAAIC,KAAK,IAAK;MACpD,MAAM;QACLC,QAAQ,GAAID,KAAK,CAA8BC,QAAQ;QACvDC,OAAO,GAAG,IAAI;QACdC;MACD,CAAC,GAAGR,OAAO,CAACK,KAAK,CAAC;MAElB,IAAI,CAACG,KAAK,EAAE;QACX,MAAM,IAAIC,KAAK,CACd,GAAGX,IAAI,2FACR,CAAC;MACF;MAEA,MAAMY,SAAS,GAAGjB,OAAO,CACxB,MAAOc,OAAO,GAAGC,KAAK,GAAG,IAAK,EAC9B,CAACD,OAAO,EAAEC,KAAK,CAChB,CAAC;;MAED;MACA;MACA,MAAMG,QAAQ,GAAGjB,MAAM,CAAsBgB,SAAS,CAAC;MACvDC,QAAQ,CAACC,OAAO,GAAGF,SAAS;MAE5B,MAAMG,aAAa,GAAGpB,OAAO,CAC5B,MACC,CAAC;QAAEa;MAAS,CAAC,kBACZV,IAAA,CAACM,OAAO,CAACE,QAAQ;QAACI,KAAK,EAAEG,QAAQ,CAACC,OAAQ;QAAAN,QAAA,EACxCA;MAAQ,CACQ,CAClB,EACF,EACD,CAAC;MAED,IAAI,OAAOA,QAAQ,KAAK,UAAU,EAAE;QACnC,OAAOA,QAAQ,CAAC;UACf,CAAC,GAAGR,IAAI,UAAU,GAAGe;QACtB,CAAsE,CAAC;MACxE;MAEA,oBAAOjB,IAAA,CAACM,OAAO,CAACE,QAAQ;QAACI,KAAK,EAAEE,SAAU;QAAAJ,QAAA,EAAEA;MAAQ,CAAmB,CAAC;IACzE,CAAC;IAED,MAAMQ,kBAAkB,GAAGA,CAAA,KAA2B;MACrD,MAAMC,OAAO,GAAGvB,UAAU,CAACU,OAAO,CAAC;MAEnC,IAAID,OAAO,IAAIc,OAAO,KAAK,IAAI,EAAE;QAChC,MAAM,IAAIN,KAAK,CACd,GAAGX,IAAI,kCAAkCA,IAAI,UAC9C,CAAC;MACF;MAEA,OAAOiB,OAAO;IACf,CAAC;IAED,OAAO;MACN,CAAC,GAAGjB,IAAI,SAAS,GAAGI,OAAO;MAC3B,CAAC,GAAGJ,IAAI,UAAU,GAAGM,QAAQ;MAC7B,CAAC,MAAMN,IAAI,SAAS,GAAGgB;IACxB,CAAC;EASF,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["createContext","useCallback","useContext","useLayoutEffect","useMemo","useRef","useSyncExternalStore","jsx","_jsx","NullProviderStore","getSnapshot","subscribe","createProviderStore","initialSnapshot","snapshot","listeners","Set","notify","listener","setSnapshot","nextSnapshot","Object","is","add","delete","createProvider","name","options","factory","guarded","providerDisplayName","innerProviderDisplayName","Context","displayName","StoreContext","Provider","props","children","enabled","value","Error","memoValue","storeRef","pendingNotifyRef","current","store","valueRef","InnerProvider","NamedInnerProvider","useEnhancedContext","context","useStoreSelector","selector","resolvedStore","selectorRef","getSelectedSnapshot","useOptionalStoreSelector"],"sourceRoot":"../../../../src","sources":["shared/utils/create-provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/utils/navigation/resolve-scene-neighbors.js

@@ -28,7 +28,7 @@ const findPreviousDescriptor = (scenes, sceneIndex, isRouteClosing) => {
  * - If there is no non-closing neighbor above/below, we fall back to the first
  *   closing neighbor (needed for normal back transitions).
  */
-export function resolveSceneNeighbors(scenes, sceneIndex, isRouteClosing) {
+export function resolveSceneNeighbors(scenes, sceneIndex, isRouteClosing, getRouteClosingOrder) {
   const current = scenes[sceneIndex];
   if (!current) {
     return {
@@ -43,7 +43,8 @@ export function resolveSceneNeighbors(scenes, sceneIndex, isRouteClosing) {
     };
   }
   let nextDescriptor;
-  let firstClosingAbove;
+  let latestClosingAbove;
+  let latestClosingAboveOrder = Number.NEGATIVE_INFINITY;
   for (let i = sceneIndex + 1; i < scenes.length; i++) {
     const candidate = scenes[i];
     if (!candidate) continue;
@@ -51,12 +52,14 @@ export function resolveSceneNeighbors(scenes, sceneIndex, isRouteClosing) {
       nextDescriptor = candidate.descriptor;
       break;
     }
-    if (firstClosingAbove === undefined) {
-      firstClosingAbove = candidate.descriptor;
+    const closeOrder = getRouteClosingOrder?.(candidate.route.key) ?? i;
+    if (closeOrder >= latestClosingAboveOrder) {
+      latestClosingAbove = candidate.descriptor;
+      latestClosingAboveOrder = closeOrder;
     }
   }
   if (nextDescriptor === undefined) {
-    nextDescriptor = firstClosingAbove;
+    nextDescriptor = latestClosingAbove;
   }
   const previousDescriptor = findPreviousDescriptor(scenes, sceneIndex, isRouteClosing);
   return {

package/lib/module/shared/utils/navigation/resolve-scene-neighbors.js.map

@@ -1 +1 @@
-{"version":3,"names":["findPreviousDescriptor","scenes","sceneIndex","isRouteClosing","firstClosingBelow","i","candidate","route","key","descriptor","undefined","resolveSceneNeighbors","current","previousDescriptor","nextDescriptor","firstClosingAbove","length"],"sourceRoot":"../../../../../src","sources":["shared/utils/navigation/resolve-scene-neighbors.ts"],"mappings":";;AAOA,MAAMA,sBAAsB,GAAGA,CAC9BC,MAAW,EACXC,UAAkB,EAClBC,cAA8B,KACG;EACjC,IAAIC,iBAA8C;EAElD,KAAK,IAAIC,CAAC,GAAGH,UAAU,GAAG,CAAC,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACzC,MAAMC,SAAS,GAAGL,MAAM,CAACI,CAAC,CAAC;IAC3B,IAAI,CAACC,SAAS,EAAE;IAEhB,IAAI,CAACH,cAAc,CAACG,SAAS,CAACC,KAAK,CAACC,GAAG,CAAC,EAAE;MACzC,OAAOF,SAAS,CAACG,UAAU;IAC5B;IAEA,IAAIL,iBAAiB,KAAKM,SAAS,EAAE;MACpCN,iBAAiB,GAAGE,SAAS,CAACG,UAAU;IACzC;EACD;EAEA,OAAOL,iBAAiB;AACzB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASO,qBAAqBA,CACpCV,MAAW,EACXC,UAAkB,EAClBC,cAA8B,EAI7B;EACD,MAAMS,OAAO,GAAGX,MAAM,CAACC,UAAU,CAAC;EAClC,IAAI,CAACU,OAAO,EAAE;IACb,OAAO;MACNC,kBAAkB,EAAEH,SAAS;MAC7BI,cAAc,EAAEJ;IACjB,CAAC;EACF;EAEA,IAAIP,cAAc,CAACS,OAAO,CAACL,KAAK,CAACC,GAAG,CAAC,EAAE;IACtC,OAAO;MACNK,kBAAkB,EAAEb,sBAAsB,CACzCC,MAAM,EACNC,UAAU,EACVC,cACD,CAAC;MACDW,cAAc,EAAEJ;IACjB,CAAC;EACF;EAEA,IAAII,cAA2C;EAC/C,IAAIC,iBAA8C;EAElD,KAAK,IAAIV,CAAC,GAAGH,UAAU,GAAG,CAAC,EAAEG,CAAC,GAAGJ,MAAM,CAACe,MAAM,EAAEX,CAAC,EAAE,EAAE;IACpD,MAAMC,SAAS,GAAGL,MAAM,CAACI,CAAC,CAAC;IAC3B,IAAI,CAACC,SAAS,EAAE;IAEhB,IAAI,CAACH,cAAc,CAACG,SAAS,CAACC,KAAK,CAACC,GAAG,CAAC,EAAE;MACzCM,cAAc,GAAGR,SAAS,CAACG,UAAU;MACrC;IACD;IAEA,IAAIM,iBAAiB,KAAKL,SAAS,EAAE;MACpCK,iBAAiB,GAAGT,SAAS,CAACG,UAAU;IACzC;EACD;EAEA,IAAIK,cAAc,KAAKJ,SAAS,EAAE;IACjCI,cAAc,GAAGC,iBAAiB;EACnC;EAEA,MAAMF,kBAAkB,GAAGb,sBAAsB,CAChDC,MAAM,EACNC,UAAU,EACVC,cACD,CAAC;EAED,OAAO;IACNU,kBAAkB;IAClBC;EACD,CAAC;AACF","ignoreList":[]}
+{"version":3,"names":["findPreviousDescriptor","scenes","sceneIndex","isRouteClosing","firstClosingBelow","i","candidate","route","key","descriptor","undefined","resolveSceneNeighbors","getRouteClosingOrder","current","previousDescriptor","nextDescriptor","latestClosingAbove","latestClosingAboveOrder","Number","NEGATIVE_INFINITY","length","closeOrder"],"sourceRoot":"../../../../../src","sources":["shared/utils/navigation/resolve-scene-neighbors.ts"],"mappings":";;AAQA,MAAMA,sBAAsB,GAAGA,CAC9BC,MAAW,EACXC,UAAkB,EAClBC,cAA8B,KACG;EACjC,IAAIC,iBAA8C;EAElD,KAAK,IAAIC,CAAC,GAAGH,UAAU,GAAG,CAAC,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;IACzC,MAAMC,SAAS,GAAGL,MAAM,CAACI,CAAC,CAAC;IAC3B,IAAI,CAACC,SAAS,EAAE;IAEhB,IAAI,CAACH,cAAc,CAACG,SAAS,CAACC,KAAK,CAACC,GAAG,CAAC,EAAE;MACzC,OAAOF,SAAS,CAACG,UAAU;IAC5B;IAEA,IAAIL,iBAAiB,KAAKM,SAAS,EAAE;MACpCN,iBAAiB,GAAGE,SAAS,CAACG,UAAU;IACzC;EACD;EAEA,OAAOL,iBAAiB;AACzB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASO,qBAAqBA,CACpCV,MAAW,EACXC,UAAkB,EAClBC,cAA8B,EAC9BS,oBAA2C,EAI1C;EACD,MAAMC,OAAO,GAAGZ,MAAM,CAACC,UAAU,CAAC;EAClC,IAAI,CAACW,OAAO,EAAE;IACb,OAAO;MACNC,kBAAkB,EAAEJ,SAAS;MAC7BK,cAAc,EAAEL;IACjB,CAAC;EACF;EAEA,IAAIP,cAAc,CAACU,OAAO,CAACN,KAAK,CAACC,GAAG,CAAC,EAAE;IACtC,OAAO;MACNM,kBAAkB,EAAEd,sBAAsB,CACzCC,MAAM,EACNC,UAAU,EACVC,cACD,CAAC;MACDY,cAAc,EAAEL;IACjB,CAAC;EACF;EAEA,IAAIK,cAA2C;EAC/C,IAAIC,kBAA+C;EACnD,IAAIC,uBAAuB,GAAGC,MAAM,CAACC,iBAAiB;EAEtD,KAAK,IAAId,CAAC,GAAGH,UAAU,GAAG,CAAC,EAAEG,CAAC,GAAGJ,MAAM,CAACmB,MAAM,EAAEf,CAAC,EAAE,EAAE;IACpD,MAAMC,SAAS,GAAGL,MAAM,CAACI,CAAC,CAAC;IAC3B,IAAI,CAACC,SAAS,EAAE;IAEhB,IAAI,CAACH,cAAc,CAACG,SAAS,CAACC,KAAK,CAACC,GAAG,CAAC,EAAE;MACzCO,cAAc,GAAGT,SAAS,CAACG,UAAU;MACrC;IACD;IAEA,MAAMY,UAAU,GAAGT,oBAAoB,GAAGN,SAAS,CAACC,KAAK,CAACC,GAAG,CAAC,IAAIH,CAAC;IACnE,IAAIgB,UAAU,IAAIJ,uBAAuB,EAAE;MAC1CD,kBAAkB,GAAGV,SAAS,CAACG,UAAU;MACzCQ,uBAAuB,GAAGI,UAAU;IACrC;EACD;EAEA,IAAIN,cAAc,KAAKL,SAAS,EAAE;IACjCK,cAAc,GAAGC,kBAAkB;EACpC;EAEA,MAAMF,kBAAkB,GAAGd,sBAAsB,CAChDC,MAAM,EACNC,UAAU,EACVC,cACD,CAAC;EAED,OAAO;IACNW,kBAAkB;IAClBC;EACD,CAAC;AACF","ignoreList":[]}

package/lib/module/shared/utils/navigation/sync-routes-with-removed.js

@@ -1,6 +1,23 @@
 "use strict";
 
 import { composeDescriptors } from "./compose-descriptors";
+const addClosingRouteKey = (closingRouteKeys, key) => {
+  closingRouteKeys.add(key);
+};
+const deleteClosingRouteKey = (closingRouteKeys, key) => {
+  if (closingRouteKeys instanceof Set) {
+    closingRouteKeys.delete(key);
+    return;
+  }
+  closingRouteKeys.remove(key);
+};
+const getClosingRouteKeyValues = closingRouteKeys => {
+  if (closingRouteKeys instanceof Set) {
+    return closingRouteKeys;
+  }
+  return closingRouteKeys.ref.current;
+};
+
 /**
  * Synchronizes routes while handling removed routes that may still be animating out.
  * This manages the complex logic of keeping closing routes visible during transitions.
@@ -33,28 +50,28 @@ export const syncRoutesWithRemoved = ({
     const previousRouteStillPresent = nextRoutes.some(route => route.key === previousFocusedRoute.key);
     if (nextRouteWasPresent && !previousRouteStillPresent) {
       // Previous route was removed, mark as closing
-      closingRouteKeys.add(previousFocusedRoute.key);
+      addClosingRouteKey(closingRouteKeys, previousFocusedRoute.key);
       derivedRoutes.push(previousFocusedRoute);
     } else {
       // Next route is now active, not closing
-      closingRouteKeys.remove(nextFocusedRoute.key);
+      deleteClosingRouteKey(closingRouteKeys, nextFocusedRoute.key);
       if (!previousRouteStillPresent) {
         // Previous route needs to be inserted for transition
-        closingRouteKeys.remove(previousFocusedRoute.key);
+        deleteClosingRouteKey(closingRouteKeys, previousFocusedRoute.key);
         const insertIndex = Math.max(derivedRoutes.length - 1, 0);
         derivedRoutes.splice(insertIndex, 0, previousFocusedRoute);
       }
     }
   } else if (nextFocusedRoute) {
     // Same focused route, ensure it's not marked as closing
-    closingRouteKeys.remove(nextFocusedRoute.key);
+    deleteClosingRouteKey(closingRouteKeys, nextFocusedRoute.key);
   }
 
   // Clean up closing keys that are no longer in the route list
   const activeKeys = new Set(derivedRoutes.map(route => route.key));
-  for (const key of Array.from(closingRouteKeys.ref.current)) {
+  for (const key of Array.from(getClosingRouteKeyValues(closingRouteKeys))) {
     if (!activeKeys.has(key)) {
-      closingRouteKeys.remove(key);
+      deleteClosingRouteKey(closingRouteKeys, key);
     }
   }
   return {

package/lib/module/shared/utils/navigation/sync-routes-with-removed.js.map

@@ -1 +1 @@
-{"version":3,"names":["composeDescriptors","syncRoutesWithRemoved","prevRoutes","prevDescriptors","nextRoutes","nextDescriptors","closingRouteKeys","length","clear","routes","descriptors","derivedRoutes","slice","previousFocusedRoute","nextFocusedRoute","key","nextRouteWasPresent","some","route","previousRouteStillPresent","add","push","remove","insertIndex","Math","max","splice","activeKeys","Set","map","Array","from","ref","current","has"],"sourceRoot":"../../../../../src","sources":["shared/utils/navigation/sync-routes-with-removed.ts"],"mappings":";;AAEA,SAASA,kBAAkB,QAAQ,uBAAuB;AAa1D;AACA;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAGA,CAGnC;EACDC,UAAU;EACVC,eAAe;EACfC,UAAU;EACVC,eAAe;EACfC;AACkD,CAAC,KAG/C;EACJ,IAAIF,UAAU,CAACG,MAAM,KAAK,CAAC,EAAE;IAC5BD,gBAAgB,CAACE,KAAK,CAAC,CAAC;IACxB,OAAO;MACNC,MAAM,EAAEL,UAAU;MAClBM,WAAW,EAAE,CAAC;IACf,CAAC;EACF;;EAEA;EACA,MAAMC,aAAsB,GAAGP,UAAU,CAACQ,KAAK,CAAC,CAAC;;EAEjD;EACA,MAAMC,oBAAoB,GAAGX,UAAU,CAACA,UAAU,CAACK,MAAM,GAAG,CAAC,CAAC;EAC9D,MAAMO,gBAAgB,GAAGV,UAAU,CAACA,UAAU,CAACG,MAAM,GAAG,CAAC,CAAC;;EAE1D;EACA,IACCM,oBAAoB,IACpBC,gBAAgB,IAChBD,oBAAoB,CAACE,GAAG,KAAKD,gBAAgB,CAACC,GAAG,EAChD;IACD,MAAMC,mBAAmB,GAAGd,UAAU,CAACe,IAAI,CACzCC,KAAK,IAAKA,KAAK,CAACH,GAAG,KAAKD,gBAAgB,CAACC,GAC3C,CAAC;IACD,MAAMI,yBAAyB,GAAGf,UAAU,CAACa,IAAI,CAC/CC,KAAK,IAAKA,KAAK,CAACH,GAAG,KAAKF,oBAAoB,CAACE,GAC/C,CAAC;IAED,IAAIC,mBAAmB,IAAI,CAACG,yBAAyB,EAAE;MACtD;MACAb,gBAAgB,CAACc,GAAG,CAACP,oBAAoB,CAACE,GAAG,CAAC;MAE9CJ,aAAa,CAACU,IAAI,CAACR,oBAAoB,CAAC;IACzC,CAAC,MAAM;MACN;MACAP,gBAAgB,CAACgB,MAAM,CAACR,gBAAgB,CAACC,GAAG,CAAC;MAE7C,IAAI,CAACI,yBAAyB,EAAE;QAC/B;QACAb,gBAAgB,CAACgB,MAAM,CAACT,oBAAoB,CAACE,GAAG,CAAC;QAEjD,MAAMQ,WAAW,GAAGC,IAAI,CAACC,GAAG,CAACd,aAAa,CAACJ,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;QACzDI,aAAa,CAACe,MAAM,CAACH,WAAW,EAAE,CAAC,EAAEV,oBAAoB,CAAC;MAC3D;IACD;EACD,CAAC,MAAM,IAAIC,gBAAgB,EAAE;IAC5B;IACAR,gBAAgB,CAACgB,MAAM,CAACR,gBAAgB,CAACC,GAAG,CAAC;EAC9C;;EAEA;EACA,MAAMY,UAAU,GAAG,IAAIC,GAAG,CAACjB,aAAa,CAACkB,GAAG,CAAEX,KAAK,IAAKA,KAAK,CAACH,GAAG,CAAC,CAAC;EACnE,KAAK,MAAMA,GAAG,IAAIe,KAAK,CAACC,IAAI,CAACzB,gBAAgB,CAAC0B,GAAG,CAACC,OAAO,CAAC,EAAE;IAC3D,IAAI,CAACN,UAAU,CAACO,GAAG,CAACnB,GAAG,CAAC,EAAE;MACzBT,gBAAgB,CAACgB,MAAM,CAACP,GAAG,CAAC;IAC7B;EACD;EAEA,OAAO;IACNN,MAAM,EAAEE,aAAa;IACrBD,WAAW,EAAEV,kBAAkB,CAC9BW,aAAa,EACbN,eAAe,EACfF,eACD;EACD,CAAC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["composeDescriptors","addClosingRouteKey","closingRouteKeys","key","add","deleteClosingRouteKey","Set","delete","remove","getClosingRouteKeyValues","ref","current","syncRoutesWithRemoved","prevRoutes","prevDescriptors","nextRoutes","nextDescriptors","length","clear","routes","descriptors","derivedRoutes","slice","previousFocusedRoute","nextFocusedRoute","nextRouteWasPresent","some","route","previousRouteStillPresent","push","insertIndex","Math","max","splice","activeKeys","map","Array","from","has"],"sourceRoot":"../../../../../src","sources":["shared/utils/navigation/sync-routes-with-removed.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/shared/utils/visibility-block-offset.js

@@ -0,0 +1,8 @@
+"use strict";
+
+export const getVisibilityBlockOffset = viewportHeight => {
+  "worklet";
+
+  return viewportHeight * 2 + 1;
+};
+//# sourceMappingURL=visibility-block-offset.js.map

package/lib/module/shared/utils/visibility-block-offset.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getVisibilityBlockOffset","viewportHeight"],"sourceRoot":"../../../../src","sources":["shared/utils/visibility-block-offset.ts"],"mappings":";;AAAA,OAAO,MAAMA,wBAAwB,GAAIC,cAAsB,IAAa;EAC3E,SAAS;;EACT,OAAOA,cAAc,GAAG,CAAC,GAAG,CAAC;AAC9B,CAAC","ignoreList":[]}

package/lib/typescript/blank-stack/components/stack-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stack-view.d.ts","sourceRoot":"","sources":["../../../../src/blank-stack/components/stack-view.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACX,oBAAoB,EACpB,2BAA2B,EAC3B,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,SAAS,4NA0DrB,CAAC"}
+{"version":3,"file":"stack-view.d.ts","sourceRoot":"","sources":["../../../../src/blank-stack/components/stack-view.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACX,oBAAoB,EACpB,2BAA2B,EAC3B,MAAM,UAAU,CAAC;AAoClB,eAAO,MAAM,SAAS,4NA0BrB,CAAC"}

package/lib/typescript/blank-stack/index.d.ts

@@ -1,3 +1,3 @@
 export { createBlankStackNavigator } from "../blank-stack/navigators/create-blank-stack-navigator";
-export type { BlankStackFactoryOptions, BlankStackNavigationEventMap, BlankStackNavigationOptions, BlankStackNavigationProp, BlankStackNavigatorProps, BlankStackOptionsArgs, BlankStackOverlayProps, BlankStackScreenProps, } from "../blank-stack/types";
+export type { BlankStackFactoryOptions, BlankStackNavigationEventMap, BlankStackNavigationOptions, BlankStackNavigationProp, BlankStackNavigatorProps, BlankStackOptionsArgs, BlankStackOverlayProps, BlankStackScreenProps, InactiveBehavior, } from "../blank-stack/types";
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/blank-stack/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/blank-stack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wDAAwD,CAAC;AACnG,YAAY,EACX,wBAAwB,EACxB,4BAA4B,EAC5B,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,GACrB,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/blank-stack/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wDAAwD,CAAC;AACnG,YAAY,EACX,wBAAwB,EACxB,4BAA4B,EAC5B,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,GAChB,MAAM,sBAAsB,CAAC"}

package/lib/typescript/blank-stack/navigators/create-blank-stack-navigator.d.ts

@@ -1,6 +1,6 @@
 import { type NavigatorTypeBagBase, type ParamListBase, type StackNavigationState, type StaticConfig, type TypedNavigator } from "@react-navigation/native";
 import type { BlankStackNavigationEventMap, BlankStackNavigationOptions, BlankStackNavigationProp, BlankStackNavigatorProps } from "../types";
-declare function BlankStackNavigator({ independent, enableNativeScreens, ...rest }: BlankStackNavigatorProps): import("react/jsx-runtime").JSX.Element;
+declare function BlankStackNavigator({ enableNativeScreens, independent, nativeScreens, ...rest }: BlankStackNavigatorProps): import("react/jsx-runtime").JSX.Element;
 declare namespace BlankStackNavigator {
     var displayName: string;
 }
@@ -19,14 +19,12 @@ type BlankStackTypeBag<ParamList extends ParamListBase, NavigatorID extends stri
  * Creates a blank stack navigator with gesture-driven transitions.
  *
  * By default, blank stack behaves like the existing top-level blank stack:
- * it participates in the current navigation tree and uses native screen
- * primitives on supported native platforms.
+ * it participates in the current navigation tree and renders screens with
+ * react-native-screens.
  *
  * Blank stack also accepts navigator-specific props for embedded-flow behavior:
+ * - `nativeScreens: false` renders blank-stack screens as regular React Native views
  * - `independent: true` creates an isolated navigator for nested flows
- * - `enableNativeScreens: false` renders the stack with regular views instead
- *   of `react-native-screens`
- *
  * In the dynamic API, pass these to `<Stack.Navigator />`.
  * In the static API, pass them in the same config object as `screens`.
  */

package/lib/typescript/blank-stack/navigators/create-blank-stack-navigator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-blank-stack-navigator.d.ts","sourceRoot":"","sources":["../../../../src/blank-stack/navigators/create-blank-stack-navigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIN,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAElB,KAAK,oBAAoB,EAGzB,KAAK,YAAY,EACjB,KAAK,cAAc,EAEnB,MAAM,0BAA0B,CAAC;AAIlC,OAAO,KAAK,EAEX,4BAA4B,EAC5B,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,MAAM,UAAU,CAAC;AA2DlB,iBAAS,mBAAmB,CAAC,EAC5B,WAAmB,EACnB,mBAA0B,EAC1B,GAAG,IAAI,EACP,EAAE,wBAAwB,2CA0B1B;kBA9BQ,mBAAmB;;;AAkC5B,KAAK,iBAAiB,CACrB,SAAS,SAAS,aAAa,EAC/B,WAAW,SAAS,MAAM,GAAG,SAAS,IACnC;IACH,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACvC,aAAa,EAAE,2BAA2B,CAAC;IAC3C,QAAQ,EAAE,4BAA4B,CAAC;IACvC,cAAc,EAAE;SACd,SAAS,IAAI,MAAM,SAAS,GAAG,wBAAwB,CACvD,SAAS,EACT,SAAS,EACT,WAAW,CACX;KACD,CAAC;IACF,SAAS,EAAE,OAAO,mBAAmB,CAAC;CACtC,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,CACxC,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,EACxD,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG,iBAAiB,CAC7D,SAAS,EACT,WAAW,CACX,EACD,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EACjE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD"}
+{"version":3,"file":"create-blank-stack-navigator.d.ts","sourceRoot":"","sources":["../../../../src/blank-stack/navigators/create-blank-stack-navigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIN,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAElB,KAAK,oBAAoB,EAGzB,KAAK,YAAY,EACjB,KAAK,cAAc,EAEnB,MAAM,0BAA0B,CAAC;AAIlC,OAAO,KAAK,EAEX,4BAA4B,EAC5B,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,MAAM,UAAU,CAAC;AAsDlB,iBAAS,mBAAmB,CAAC,EAC5B,mBAAmB,EACnB,WAAmB,EACnB,aAAa,EACb,GAAG,IAAI,EACP,EAAE,wBAAwB,2CAwB1B;kBA7BQ,mBAAmB;;;AAiC5B,KAAK,iBAAiB,CACrB,SAAS,SAAS,aAAa,EAC/B,WAAW,SAAS,MAAM,GAAG,SAAS,IACnC;IACH,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACvC,aAAa,EAAE,2BAA2B,CAAC;IAC3C,QAAQ,EAAE,4BAA4B,CAAC;IACvC,cAAc,EAAE;SACd,SAAS,IAAI,MAAM,SAAS,GAAG,wBAAwB,CACvD,SAAS,EACT,SAAS,EACT,WAAW,CACX;KACD,CAAC;IACF,SAAS,EAAE,OAAO,mBAAmB,CAAC;CACtC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACxC,KAAK,CAAC,SAAS,SAAS,aAAa,EACrC,KAAK,CAAC,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,EACxD,KAAK,CAAC,OAAO,SAAS,oBAAoB,GAAG,iBAAiB,CAC7D,SAAS,EACT,WAAW,CACX,EACD,KAAK,CAAC,MAAM,SAAS,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,EACjE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAElD"}

package/lib/typescript/blank-stack/types.d.ts

@@ -1,6 +1,8 @@
 import type { DefaultNavigatorOptions, Descriptor, NavigationHelpers, NavigationProp, ParamListBase, RouteProp, StackActionHelpers, StackNavigationState, StackRouterOptions, Theme } from "@react-navigation/native";
-import type { ScreenTransitionConfig } from "../shared";
+import type { InactiveBehavior, ScreenTransitionConfig } from "../shared";
 import type { OverlayProps } from "../shared/types/overlay.types";
+import type { StackSceneActivity } from "../shared/types/stack.types";
+export type { InactiveBehavior } from "../shared";
 export type BlankStackNavigationEventMap = {};
 export type BlankStackNavigationProp<ParamList extends ParamListBase, RouteName extends keyof ParamList = string, NavigatorID extends string | undefined = undefined> = NavigationProp<ParamList, RouteName, NavigatorID, StackNavigationState<ParamList>, BlankStackNavigationOptions, BlankStackNavigationEventMap> & StackActionHelpers<ParamList>;
 export type BlankStackScreenProps<ParamList extends ParamListBase, RouteName extends keyof ParamList = string, NavigatorID extends string | undefined = undefined> = {
@@ -20,6 +22,22 @@ export type BlankStackNavigationHelpers = NavigationHelpers<ParamListBase, Blank
  * The exported name is kept for backward compatibility.
  */
 export interface BlankStackFactoryOptions {
+    /**
+     * Controls whether blank-stack screens are rendered with react-native-screens.
+     *
+     * When enabled, inactive presentation state is backed by
+     * `ScreenContainer`/`Screen.activityState`. Set this to `false` to render
+     * screens as regular React Native views.
+     *
+     * @default true
+     */
+    nativeScreens?: boolean;
+    /**
+     * Enables react-native-screens for blank-stack screen retention.
+     *
+     * @deprecated Use `nativeScreens` instead.
+     */
+    enableNativeScreens?: boolean;
     /**
      * Creates an isolated navigation tree for embedded flows.
      *
@@ -28,47 +46,41 @@ export interface BlankStackFactoryOptions {
      *
      * When enabled, the navigator:
      * - wraps itself in `NavigationIndependentTree` + `NavigationContainer`
-     * - skips the shared native `ScreenContainer`
      *
      * Leave this disabled for normal top-level app stacks.
      */
     independent?: boolean;
-    /**
-     * Enables native screen primitives on supported native platforms.
-     *
-     * Use this when you want the embedded blank stack to keep `react-native-screens`
-     * behavior such as native activity state and freezing.
-     *
-     * Set this to `false` when you want the blank stack to render with regular
-     * views instead of native screen primitives. This is useful for embedded
-     * flows where plain views are a better fit than native screen layering.
-     */
-    enableNativeScreens?: boolean;
 }
 /**
  * Props passed to overlay components in blank-stack.
  * Uses the shared OverlayProps type with blank-stack's navigation type.
  */
 export type BlankStackOverlayProps = OverlayProps<BlankStackNavigationProp<ParamListBase>>;
-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.
-     * Only applicable if `detachInactiveScreens` isn't set to `false`.
-     */
-    detachPreviousScreen?: boolean;
-};
-export type BlankStackNavigationOptions = BlankStackScreenTransitionConfig & {
+export type BlankStackNavigationOptions = ScreenTransitionConfig & {
     /**
-     * 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.
-     * Requires `react-native-screens` version >=3.16.0.
+     * Controls how inactive blank-stack screens are retained after they are no
+     * longer active.
+     *
+     * For a stack shaped as A(inactive), B(inert), C(active):
+     *
+     * - `keep`: keeps A mounted, attached, visible, and non-interactive.
+     * - `freeze`: keeps A's last painted UI visible and asks the platform to
+     *   stop or suspend inactive work where possible.
+     * - `detach`: removes A from native/view presentation after the screen that
+     *   exposes it has safely painted.
+     * - `unmount`: removes A's React subtree after safe paint when the route has
+     *   no nested navigation state.
      *
-     * Only supported on iOS and Android.
+     * On web, or when native screens are disabled, `keep`, `freeze`, and
+     * `detach` currently have no meaningful retention effect. This will change
+     * once the implementation can use React 19.2's Activity component.
+     *
+     * @default "detach" on native, "unmount" on web
      */
-    freezeOnBlur?: boolean;
+    inactiveBehavior?: InactiveBehavior;
 };
 export type BlankStackNavigatorProps = DefaultNavigatorOptions<ParamListBase, string | undefined, StackNavigationState<ParamListBase>, BlankStackNavigationOptions, BlankStackNavigationEventMap, BlankStackNavigationProp<ParamListBase>> & StackRouterOptions & BlankStackFactoryOptions;
-export type BlankStackDescriptor = Descriptor<BlankStackNavigationOptions, BlankStackNavigationProp<ParamListBase>, RouteProp<ParamListBase>>;
-export {};
+export type BlankStackDescriptor = Descriptor<BlankStackNavigationOptions, BlankStackNavigationProp<ParamListBase>, RouteProp<ParamListBase>> & {
+    activity: StackSceneActivity;
+};
 //# sourceMappingURL=types.d.ts.map

package/lib/typescript/blank-stack/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/blank-stack/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,uBAAuB,EACvB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,EACL,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,MAAM,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAE9C,MAAM,MAAM,wBAAwB,CACnC,SAAS,SAAS,aAAa,EAC/B,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,EAC1C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,IAC/C,cAAc,CACjB,SAAS,EACT,SAAS,EACT,WAAW,EACX,oBAAoB,CAAC,SAAS,CAAC,EAC/B,2BAA2B,EAC3B,4BAA4B,CAC5B,GACA,kBAAkB,CAAC,SAAS,CAAC,CAAC;AAE/B,MAAM,MAAM,qBAAqB,CAChC,SAAS,SAAS,aAAa,EAC/B,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,EAC1C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,IAC/C;IACH,UAAU,EAAE,wBAAwB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IACxE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAChC,SAAS,SAAS,aAAa,EAC/B,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,SAAS,EACnD,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,IAC/C,qBAAqB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG;IAC9D,KAAK,EAAE,KAAK,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,iBAAiB,CAC1D,aAAa,EACb,4BAA4B,CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB;IACxC;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAChD,wBAAwB,CAAC,aAAa,CAAC,CACvC,CAAC;AAEF,KAAK,gCAAgC,GAAG,sBAAsB,GAAG;IAChE;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,gCAAgC,GAAG;IAC5E;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,uBAAuB,CAC7D,aAAa,EACb,MAAM,GAAG,SAAS,EAClB,oBAAoB,CAAC,aAAa,CAAC,EACnC,2BAA2B,EAC3B,4BAA4B,EAC5B,wBAAwB,CAAC,aAAa,CAAC,CACvC,GACA,kBAAkB,GAClB,wBAAwB,CAAC;AAE1B,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAC5C,2BAA2B,EAC3B,wBAAwB,CAAC,aAAa,CAAC,EACvC,SAAS,CAAC,aAAa,CAAC,CACxB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/blank-stack/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,uBAAuB,EACvB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,EACL,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,YAAY,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElD,MAAM,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAE9C,MAAM,MAAM,wBAAwB,CACnC,SAAS,SAAS,aAAa,EAC/B,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,EAC1C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,IAC/C,cAAc,CACjB,SAAS,EACT,SAAS,EACT,WAAW,EACX,oBAAoB,CAAC,SAAS,CAAC,EAC/B,2BAA2B,EAC3B,4BAA4B,CAC5B,GACA,kBAAkB,CAAC,SAAS,CAAC,CAAC;AAE/B,MAAM,MAAM,qBAAqB,CAChC,SAAS,SAAS,aAAa,EAC/B,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,EAC1C,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,IAC/C;IACH,UAAU,EAAE,wBAAwB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IACxE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAChC,SAAS,SAAS,aAAa,EAC/B,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,SAAS,EACnD,WAAW,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,IAC/C,qBAAqB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG;IAC9D,KAAK,EAAE,KAAK,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,iBAAiB,CAC1D,aAAa,EACb,4BAA4B,CAC5B,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB;IACxC;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAChD,wBAAwB,CAAC,aAAa,CAAC,CACvC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,sBAAsB,GAAG;IAClE;;;;;;;;;;;;;;;;;;;OAmBG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,uBAAuB,CAC7D,aAAa,EACb,MAAM,GAAG,SAAS,EAClB,oBAAoB,CAAC,aAAa,CAAC,EACnC,2BAA2B,EAC3B,4BAA4B,EAC5B,wBAAwB,CAAC,aAAa,CAAC,CACvC,GACA,kBAAkB,GAClB,wBAAwB,CAAC;AAE1B,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAC5C,2BAA2B,EAC3B,wBAAwB,CAAC,aAAa,CAAC,EACvC,SAAS,CAAC,aAAa,CAAC,CACxB,GAAG;IACH,QAAQ,EAAE,kBAAkB,CAAC;CAC7B,CAAC"}

package/lib/typescript/component-stack/components/stack-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stack-view.d.ts","sourceRoot":"","sources":["../../../../src/component-stack/components/stack-view.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACX,wBAAwB,EACxB,+BAA+B,EAC/B,MAAM,UAAU,CAAC;AAGlB,eAAO,MAAM,SAAS,oOAkCrB,CAAC"}
+{"version":3,"file":"stack-view.d.ts","sourceRoot":"","sources":["../../../../src/component-stack/components/stack-view.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACX,wBAAwB,EACxB,+BAA+B,EAC/B,MAAM,UAAU,CAAC;AAGlB,eAAO,MAAM,SAAS,oOA4BrB,CAAC"}

package/lib/typescript/component-stack/navigators/create-component-stack-navigator.d.ts

@@ -12,7 +12,7 @@ declare function IsolatedComponentStackNavigator(props: ComponentStackNavigatorP
  * @deprecated Component stack was originally introduced for independent,
  * embedded navigation flows. Blank stack now supports that use case directly
  * via navigator props such as `<BlankStack.Navigator independent />`, with
- * `enableNativeScreens` available when you need to switch between native
+ * `nativeScreens` available when you need to switch between native
  * screens and regular views. Prefer blank stack for new work; component stack
  * will be removed in a future release.
  */