@react-navigation/native-stack 8.0.0-alpha.5 → 8.0.0-alpha.51

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createNativeStackNavigator","createNativeStackScreen","NativeStackView","useAnimatedHeaderHeight"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA;AACA;AACA;AACA,SACEA,0BAA0B,EAC1BC,uBAAuB,QAClB,4CAAyC;;AAEhD;AACA;AACA;AACA,SAASC,eAAe,QAAQ,yBAAyB;;AAEzD;AACA;AACA;AACA,SAASC,uBAAuB,QAAQ,oCAAiC;;AAEzE;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["createNativeStackNavigator","createNativeStackScreen","NativeStackView","useAnimatedHeaderHeight"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA;AACA;AACA;AACA,SACEA,0BAA0B,EAC1BC,uBAAuB,QAElB,4CAAyC;;AAEhD;AACA;AACA;AACA,SAASC,eAAe,QAAQ,yBAAyB;;AAEzD;AACA;AACA;AACA,SAASC,uBAAuB,QAAQ,oCAAiC;;AAEzE;AACA;AACA","ignoreList":[]}

package/lib/module/navigators/createNativeStackNavigator.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { createNavigatorFactory, NavigationMetaContext, StackActions, StackRouter, useNavigationBuilder } from '@react-navigation/native';
+import { createNavigatorFactory, createScreenFactory, NavigationMetaContext, StackActions, StackRouter, useNavigationBuilder } from '@react-navigation/native';
 import * as React from 'react';
 import { NativeStackView } from '../views/NativeStackView';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -30,32 +30,39 @@ function NativeStackNavigator({
     screenLayout,
     router
   });
-  const meta = React.useContext(NavigationMetaContext);
+  const meta = React.use(NavigationMetaContext);
   React.useEffect(() => {
     if (meta && 'type' in meta && meta.type === 'native-tabs') {
       // If we're inside native tabs, we don't need to handle popToTop
       // It's handled natively by native tabs
       return;
     }
+    let handle;
 
     // @ts-expect-error: there may not be a tab navigator in parent
-    return navigation?.addListener?.('tabPress', e => {
+    const unsubscribe = navigation.addListener?.('tabPress', e => {
       const isFocused = navigation.isFocused();
+      cancelAnimationFrame(handle);
 
       // Run the operation in the next frame so we're sure all listeners have been run
       // This is necessary to know if preventDefault() has been called
-      requestAnimationFrame(() => {
-        if (state.index > 0 && isFocused && !e.defaultPrevented) {
+      handle = requestAnimationFrame(() => {
+        const currentState = navigation.getState();
+        if (isFocused && (currentState.index > 0 || currentState.routes[0]?.history?.length) && !e.defaultPrevented) {
           // When user taps on already focused tab and we're inside the tab,
           // reset the stack to replicate native behaviour
           navigation.dispatch({
             ...StackActions.popToTop(),
-            target: state.key
+            target: currentState.key
           });
         }
       });
     });
-  }, [meta, navigation, state.index, state.key]);
+    return () => {
+      cancelAnimationFrame(handle);
+      unsubscribe?.();
+    };
+  }, [meta, navigation]);
   return /*#__PURE__*/_jsx(NavigationContent, {
     children: /*#__PURE__*/_jsx(NativeStackView, {
       ...rest,
@@ -65,10 +72,6 @@ function NativeStackNavigator({
     })
   });
 }
-export function createNativeStackNavigator(config) {
-  return createNavigatorFactory(NativeStackNavigator)(config);
-}
-export function createNativeStackScreen(config) {
-  return config;
-}
+export const createNativeStackNavigator = createNavigatorFactory(NativeStackNavigator);
+export const createNativeStackScreen = createScreenFactory();
 //# sourceMappingURL=createNativeStackNavigator.js.map

package/lib/module/navigators/createNativeStackNavigator.js.map

@@ -1 +1 @@
-{"version":3,"names":["createNavigatorFactory","NavigationMetaContext","StackActions","StackRouter","useNavigationBuilder","React","NativeStackView","jsx","_jsx","NativeStackNavigator","initialRouteName","routeNamesChangeBehavior","children","layout","screenListeners","screenOptions","screenLayout","router","rest","state","descriptors","navigation","NavigationContent","meta","useContext","useEffect","type","addListener","e","isFocused","requestAnimationFrame","index","defaultPrevented","dispatch","popToTop","target","key","createNativeStackNavigator","config","createNativeStackScreen"],"sourceRoot":"../../../src","sources":["navigators/createNativeStackNavigator.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EAEtBC,qBAAqB,EAGrBC,YAAY,EAEZC,WAAW,EAQXC,oBAAoB,QACf,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAQ9B,SAASC,eAAe,QAAQ,0BAA0B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE3D,SAASC,oBAAoBA,CAAC;EAC5BC,gBAAgB;EAChBC,wBAAwB;EACxBC,QAAQ;EACRC,MAAM;EACNC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,MAAM;EACN,GAAGC;AACsB,CAAC,EAAE;EAC5B,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GACzDlB,oBAAoB,CAMlBD,WAAW,EAAE;IACbO,gBAAgB;IAChBC,wBAAwB;IACxBC,QAAQ;IACRC,MAAM;IACNC,eAAe;IACfC,aAAa;IACbC,YAAY;IACZC;EACF,CAAC,CAAC;EAEJ,MAAMM,IAAI,GAAGlB,KAAK,CAACmB,UAAU,CAACvB,qBAAqB,CAAC;EAEpDI,KAAK,CAACoB,SAAS,CAAC,MAAM;IACpB,IAAIF,IAAI,IAAI,MAAM,IAAIA,IAAI,IAAIA,IAAI,CAACG,IAAI,KAAK,aAAa,EAAE;MACzD;MACA;MACA;IACF;;IAEA;IACA,OAAOL,UAAU,EAAEM,WAAW,GAAG,UAAU,EAAGC,CAAM,IAAK;MACvD,MAAMC,SAAS,GAAGR,UAAU,CAACQ,SAAS,CAAC,CAAC;;MAExC;MACA;MACAC,qBAAqB,CAAC,MAAM;QAC1B,IACEX,KAAK,CAACY,KAAK,GAAG,CAAC,IACfF,SAAS,IACT,CAAED,CAAC,CAAgCI,gBAAgB,EACnD;UACA;UACA;UACAX,UAAU,CAACY,QAAQ,CAAC;YAClB,GAAG/B,YAAY,CAACgC,QAAQ,CAAC,CAAC;YAC1BC,MAAM,EAAEhB,KAAK,CAACiB;UAChB,CAAC,CAAC;QACJ;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC,EAAE,CAACb,IAAI,EAAEF,UAAU,EAAEF,KAAK,CAACY,KAAK,EAAEZ,KAAK,CAACiB,GAAG,CAAC,CAAC;EAE9C,oBACE5B,IAAA,CAACc,iBAAiB;IAAAV,QAAA,eAChBJ,IAAA,CAACF,eAAe;MAAA,GACVY,IAAI;MACRC,KAAK,EAAEA,KAAM;MACbE,UAAU,EAAEA,UAAW;MACvBD,WAAW,EAAEA;IAAY,CAC1B;EAAC,CACe,CAAC;AAExB;AA2BA,OAAO,SAASiB,0BAA0BA,CAACC,MAAgB,EAAE;EAC3D,OAAOtC,sBAAsB,CAACS,oBAAoB,CAAC,CAAC6B,MAAM,CAAC;AAC7D;AAEA,OAAO,SAASC,uBAAuBA,CAIrCD,MAOC,EACD;EACA,OAAOA,MAAM;AACf","ignoreList":[]}
+{"version":3,"names":["createNavigatorFactory","createScreenFactory","NavigationMetaContext","StackActions","StackRouter","useNavigationBuilder","React","NativeStackView","jsx","_jsx","NativeStackNavigator","initialRouteName","routeNamesChangeBehavior","children","layout","screenListeners","screenOptions","screenLayout","router","rest","state","descriptors","navigation","NavigationContent","meta","use","useEffect","type","handle","unsubscribe","addListener","e","isFocused","cancelAnimationFrame","requestAnimationFrame","currentState","getState","index","routes","history","length","defaultPrevented","dispatch","popToTop","target","key","createNativeStackNavigator","createNativeStackScreen"],"sourceRoot":"../../../src","sources":["navigators/createNativeStackNavigator.tsx"],"mappings":";;AAAA,SACEA,sBAAsB,EACtBC,mBAAmB,EAEnBC,qBAAqB,EAIrBC,YAAY,EAEZC,WAAW,EAEXC,oBAAoB,QACf,0BAA0B;AACjC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAO9B,SAASC,eAAe,QAAQ,0BAA0B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE3D,SAASC,oBAAoBA,CAAC;EAC5BC,gBAAgB;EAChBC,wBAAwB;EACxBC,QAAQ;EACRC,MAAM;EACNC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,MAAM;EACN,GAAGC;AACsB,CAAC,EAAE;EAC5B,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,UAAU;IAAEC;EAAkB,CAAC,GACzDlB,oBAAoB,CAMlBD,WAAW,EAAE;IACbO,gBAAgB;IAChBC,wBAAwB;IACxBC,QAAQ;IACRC,MAAM;IACNC,eAAe;IACfC,aAAa;IACbC,YAAY;IACZC;EACF,CAAC,CAAC;EAEJ,MAAMM,IAAI,GAAGlB,KAAK,CAACmB,GAAG,CAACvB,qBAAqB,CAAC;EAE7CI,KAAK,CAACoB,SAAS,CAAC,MAAM;IACpB,IAAIF,IAAI,IAAI,MAAM,IAAIA,IAAI,IAAIA,IAAI,CAACG,IAAI,KAAK,aAAa,EAAE;MACzD;MACA;MACA;IACF;IAEA,IAAIC,MAA4D;;IAEhE;IACA,MAAMC,WAAW,GAAGP,UAAU,CAACQ,WAAW,GAAG,UAAU,EAAGC,CAAC,IAAK;MAC9D,MAAMC,SAAS,GAAGV,UAAU,CAACU,SAAS,CAAC,CAAC;MAExCC,oBAAoB,CAACL,MAAM,CAAC;;MAE5B;MACA;MACAA,MAAM,GAAGM,qBAAqB,CAAC,MAAM;QACnC,MAAMC,YAAY,GAAGb,UAAU,CAACc,QAAQ,CAAC,CAAC;QAE1C,IACEJ,SAAS,KACRG,YAAY,CAACE,KAAK,GAAG,CAAC,IAAIF,YAAY,CAACG,MAAM,CAAC,CAAC,CAAC,EAAEC,OAAO,EAAEC,MAAM,CAAC,IACnE,CAAET,CAAC,CAAgCU,gBAAgB,EACnD;UACA;UACA;UACAnB,UAAU,CAACoB,QAAQ,CAAC;YAClB,GAAGvC,YAAY,CAACwC,QAAQ,CAAC,CAAC;YAC1BC,MAAM,EAAET,YAAY,CAACU;UACvB,CAAC,CAAC;QACJ;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,MAAM;MACXZ,oBAAoB,CAACL,MAAM,CAAC;MAC5BC,WAAW,GAAG,CAAC;IACjB,CAAC;EACH,CAAC,EAAE,CAACL,IAAI,EAAEF,UAAU,CAAC,CAAC;EAEtB,oBACEb,IAAA,CAACc,iBAAiB;IAAAV,QAAA,eAChBJ,IAAA,CAACF,eAAe;MAAA,GACVY,IAAI;MACRC,KAAK,EAAEA,KAAM;MACbE,UAAU,EAAEA,UAAW;MACvBD,WAAW,EAAEA;IAAY,CAC1B;EAAC,CACe,CAAC;AAExB;AAUA,OAAO,MAAMyB,0BAA0B,GACrC9C,sBAAsB,CAAqBU,oBAAoB,CAAC;AAElE,OAAO,MAAMqC,uBAAuB,GAClC9C,mBAAmB,CAAqB,CAAC","ignoreList":[]}

package/lib/module/utils/useAnimatedHeaderHeight.js

@@ -3,7 +3,7 @@
 import * as React from 'react';
 export const AnimatedHeaderHeightContext = /*#__PURE__*/React.createContext(undefined);
 export function useAnimatedHeaderHeight() {
-  const animatedValue = React.useContext(AnimatedHeaderHeightContext);
+  const animatedValue = React.use(AnimatedHeaderHeightContext);
   if (animatedValue === undefined) {
     throw new Error("Couldn't find the header height. Are you inside a screen in a native stack navigator?");
   }

package/lib/module/utils/useAnimatedHeaderHeight.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","AnimatedHeaderHeightContext","createContext","undefined","useAnimatedHeaderHeight","animatedValue","useContext","Error"],"sourceRoot":"../../../src","sources":["utils/useAnimatedHeaderHeight.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAG9B,OAAO,MAAMC,2BAA2B,gBAAGD,KAAK,CAACE,aAAa,CAE5DC,SAAS,CAAC;AAEZ,OAAO,SAASC,uBAAuBA,CAAA,EAAG;EACxC,MAAMC,aAAa,GAAGL,KAAK,CAACM,UAAU,CAACL,2BAA2B,CAAC;EAEnE,IAAII,aAAa,KAAKF,SAAS,EAAE;IAC/B,MAAM,IAAII,KAAK,CACb,uFACF,CAAC;EACH;EAEA,OAAOF,aAAa;AACtB","ignoreList":[]}
+{"version":3,"names":["React","AnimatedHeaderHeightContext","createContext","undefined","useAnimatedHeaderHeight","animatedValue","use","Error"],"sourceRoot":"../../../src","sources":["utils/useAnimatedHeaderHeight.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAG9B,OAAO,MAAMC,2BAA2B,gBAAGD,KAAK,CAACE,aAAa,CAE5DC,SAAS,CAAC;AAEZ,OAAO,SAASC,uBAAuBA,CAAA,EAAG;EACxC,MAAMC,aAAa,GAAGL,KAAK,CAACM,GAAG,CAACL,2BAA2B,CAAC;EAE5D,IAAII,aAAa,KAAKF,SAAS,EAAE;IAC/B,MAAM,IAAII,KAAK,CACb,uFACF,CAAC;EACH;EAEA,OAAOF,aAAa;AACtB","ignoreList":[]}

package/lib/module/utils/useInvalidPreventRemoveError.js

@@ -7,7 +7,7 @@ export function useInvalidPreventRemoveError(descriptors) {
     preventedRoutes
   } = usePreventRemoveContext();
   const preventedRouteKey = Object.keys(preventedRoutes)[0];
-  const preventedDescriptor = descriptors[preventedRouteKey];
+  const preventedDescriptor = preventedRouteKey == null ? undefined : descriptors[preventedRouteKey];
   const isHeaderBackButtonMenuEnabledOnPreventedScreen = preventedDescriptor?.options?.headerBackButtonMenuEnabled;
   const preventedRouteName = preventedDescriptor?.route?.name;
   React.useEffect(() => {

package/lib/module/utils/useInvalidPreventRemoveError.js.map

@@ -1 +1 @@
-{"version":3,"names":["usePreventRemoveContext","React","useInvalidPreventRemoveError","descriptors","preventedRoutes","preventedRouteKey","Object","keys","preventedDescriptor","isHeaderBackButtonMenuEnabledOnPreventedScreen","options","headerBackButtonMenuEnabled","preventedRouteName","route","name","useEffect","message","console","error"],"sourceRoot":"../../../src","sources":["utils/useInvalidPreventRemoveError.tsx"],"mappings":";;AAAA,SAASA,uBAAuB,QAAQ,0BAA0B;AAClE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAI9B,OAAO,SAASC,4BAA4BA,CAC1CC,WAAqC,EACrC;EACA,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,uBAAuB,CAAC,CAAC;EACrD,MAAMK,iBAAiB,GAAGC,MAAM,CAACC,IAAI,CAACH,eAAe,CAAC,CAAC,CAAC,CAAC;EACzD,MAAMI,mBAAmB,GAAGL,WAAW,CAACE,iBAAiB,CAAC;EAC1D,MAAMI,8CAA8C,GAClDD,mBAAmB,EAAEE,OAAO,EAAEC,2BAA2B;EAC3D,MAAMC,kBAAkB,GAAGJ,mBAAmB,EAAEK,KAAK,EAAEC,IAAI;EAE3Db,KAAK,CAACc,SAAS,CAAC,MAAM;IACpB,IACEV,iBAAiB,IAAI,IAAI,IACzBI,8CAA8C,EAC9C;MACA,MAAMO,OAAO,GACX,cAAcJ,kBAAkB,2GAA2G,GAC3I,8DAA8DA,kBAAkB,mCAAmC;MACrHK,OAAO,CAACC,KAAK,CAACF,OAAO,CAAC;IACxB;EACF,CAAC,EAAE,CACDX,iBAAiB,EACjBI,8CAA8C,EAC9CG,kBAAkB,CACnB,CAAC;AACJ","ignoreList":[]}
+{"version":3,"names":["usePreventRemoveContext","React","useInvalidPreventRemoveError","descriptors","preventedRoutes","preventedRouteKey","Object","keys","preventedDescriptor","undefined","isHeaderBackButtonMenuEnabledOnPreventedScreen","options","headerBackButtonMenuEnabled","preventedRouteName","route","name","useEffect","message","console","error"],"sourceRoot":"../../../src","sources":["utils/useInvalidPreventRemoveError.tsx"],"mappings":";;AAAA,SAASA,uBAAuB,QAAQ,0BAA0B;AAClE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAI9B,OAAO,SAASC,4BAA4BA,CAC1CC,WAAqC,EACrC;EACA,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,uBAAuB,CAAC,CAAC;EACrD,MAAMK,iBAAiB,GAAGC,MAAM,CAACC,IAAI,CAACH,eAAe,CAAC,CAAC,CAAC,CAAC;EACzD,MAAMI,mBAAmB,GACvBH,iBAAiB,IAAI,IAAI,GAAGI,SAAS,GAAGN,WAAW,CAACE,iBAAiB,CAAC;EACxE,MAAMK,8CAA8C,GAClDF,mBAAmB,EAAEG,OAAO,EAAEC,2BAA2B;EAC3D,MAAMC,kBAAkB,GAAGL,mBAAmB,EAAEM,KAAK,EAAEC,IAAI;EAE3Dd,KAAK,CAACe,SAAS,CAAC,MAAM;IACpB,IACEX,iBAAiB,IAAI,IAAI,IACzBK,8CAA8C,EAC9C;MACA,MAAMO,OAAO,GACX,cAAcJ,kBAAkB,2GAA2G,GAC3I,8DAA8DA,kBAAkB,mCAAmC;MACrHK,OAAO,CAACC,KAAK,CAACF,OAAO,CAAC;IACxB;EACF,CAAC,EAAE,CACDZ,iBAAiB,EACjBK,8CAA8C,EAC9CG,kBAAkB,CACnB,CAAC;AACJ","ignoreList":[]}

package/lib/module/views/FooterComponent.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import React from 'react';
+import * as React from 'react';
 import { ScreenFooter } from 'react-native-screens';
 import { jsx as _jsx } from "react/jsx-runtime";
 export function FooterComponent({

package/lib/module/views/FooterComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","ScreenFooter","jsx","_jsx","FooterComponent","children","collapsable"],"sourceRoot":"../../../src","sources":["views/FooterComponent.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,YAAY,QAAQ,sBAAsB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMpD,OAAO,SAASC,eAAeA,CAAC;EAAEC;AAAsB,CAAC,EAAE;EACzD,oBAAOF,IAAA,CAACF,YAAY;IAACK,WAAW,EAAE,KAAM;IAAAD,QAAA,EAAEA;EAAQ,CAAe,CAAC;AACpE","ignoreList":[]}
+{"version":3,"names":["React","ScreenFooter","jsx","_jsx","FooterComponent","children","collapsable"],"sourceRoot":"../../../src","sources":["views/FooterComponent.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,YAAY,QAAQ,sBAAsB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMpD,OAAO,SAASC,eAAeA,CAAC;EAAEC;AAAsB,CAAC,EAAE;EACzD,oBAAOF,IAAA,CAACF,YAAY;IAACK,WAAW,EAAE,KAAM;IAAAD,QAAA,EAAEA;EAAQ,CAAe,CAAC;AACpE","ignoreList":[]}

package/lib/module/views/NativeStackView.js

@@ -1,10 +1,11 @@
 "use strict";
 
 import { getHeaderTitle, Header, HeaderBackButton, HeaderBackContext, useHeaderHeight } from '@react-navigation/elements';
-import { SafeAreaProviderCompat, Screen } from '@react-navigation/elements/internal';
+import { ActivityView, SafeAreaProviderCompat, Screen } from '@react-navigation/elements/internal';
 import { useLinkBuilder } from '@react-navigation/native';
 import * as React from 'react';
-import { Animated, Image, StyleSheet, View } from 'react-native';
+import { Animated, StyleSheet, View } from 'react-native';
+import { getModalRouteKeys } from "../utils/getModalRoutesKeys.js";
 import { AnimatedHeaderHeightContext } from "../utils/useAnimatedHeaderHeight.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const TRANSPARENT_PRESENTATIONS = ['transparentModal', 'containedTransparentModal'];
@@ -12,28 +13,35 @@ export function NativeStackView({
   state,
   descriptors
 }) {
-  const parentHeaderBack = React.useContext(HeaderBackContext);
+  const parentHeaderBack = React.use(HeaderBackContext);
   const {
     buildHref
   } = useLinkBuilder();
+  const activeRoutes = state.routes.slice(0, state.index + 1);
+  const modalRouteKeys = getModalRouteKeys(activeRoutes, descriptors);
   return /*#__PURE__*/_jsx(SafeAreaProviderCompat, {
-    children: state.routes.concat(state.preloadedRoutes).map((route, i) => {
+    children: state.routes.map((route, i) => {
       const isFocused = state.index === i;
-      const previousKey = state.routes[i - 1]?.key;
-      const nextKey = state.routes[i + 1]?.key;
+      const previousKey = activeRoutes[i - 1]?.key;
+      const nextKey = activeRoutes[i + 1]?.key;
       const previousDescriptor = previousKey ? descriptors[previousKey] : undefined;
       const nextDescriptor = nextKey ? descriptors[nextKey] : undefined;
+      const descriptor = descriptors[route.key];
+      if (descriptor == null) {
+        throw new Error(`Couldn't find a descriptor for route '${route.key}'.`);
+      }
       const {
         options,
         navigation,
         render
-      } = descriptors[route.key];
+      } = descriptor;
       const headerBack = previousDescriptor ? {
         title: getHeaderTitle(previousDescriptor.options, previousDescriptor.route.name),
         href: buildHref(previousDescriptor.route.name, previousDescriptor.route.params)
       } : parentHeaderBack;
       const canGoBack = headerBack != null;
       const {
+        inactiveBehavior = 'pause',
         header,
         headerShown,
         headerBackIcon,
@@ -45,8 +53,20 @@ export function NativeStackView({
         ...rest
       } = options;
       const nextPresentation = nextDescriptor?.options.presentation;
-      const isPreloaded = state.preloadedRoutes.some(r => r.key === route.key);
-      return /*#__PURE__*/_jsx(Screen, {
+      const isNextScreenTransparent = nextPresentation != null && TRANSPARENT_PRESENTATIONS.includes(nextPresentation);
+      const isInactive = i > state.index;
+      const isBeforeLast = i === activeRoutes.length - 2;
+      const isNextScreenModal = nextKey ? modalRouteKeys.includes(nextKey) : false;
+      const activityMode =
+      // Render focused screens normally
+      isFocused ? 'normal' :
+      // Unpause preloaded and retained screens so updates are visible
+      // This lets effects on those screens run
+      inactiveBehavior === 'none' || isInactive || isNextScreenTransparent ? 'inert' : inactiveBehavior === 'unmount' && !isNextScreenModal && !isBeforeLast && !route.state ? 'unmounted' : 'paused';
+      if (activityMode === 'unmounted') {
+        return null;
+      }
+      const content = /*#__PURE__*/_jsx(Screen, {
         focused: isFocused,
         route: route,
         navigation: navigation,
@@ -75,21 +95,17 @@ export function NativeStackView({
             ...rest,
             label: headerBackTitle ?? label,
             tintColor: tintColor,
-            backImage: headerBackIcon !== undefined ? () => /*#__PURE__*/_jsx(Image, {
-              source: headerBackIcon.source,
-              resizeMode: "contain",
-              tintColor: tintColor,
-              style: styles.backImage
-            }) : undefined,
+            icon: headerBackIcon,
             onPress: navigation.goBack
           }) : headerLeft,
           headerTransparent: headerTransparent
         }),
-        style: [StyleSheet.absoluteFill, {
-          display: (isFocused || nextPresentation != null && TRANSPARENT_PRESENTATIONS.includes(nextPresentation)) && !isPreloaded ? 'flex' : 'none'
-        }, presentation != null && TRANSPARENT_PRESENTATIONS.includes(presentation) ? {
-          backgroundColor: 'transparent'
-        } : null],
+        style: {
+          ...StyleSheet.absoluteFill,
+          ...(presentation != null && TRANSPARENT_PRESENTATIONS.includes(presentation) ? {
+            backgroundColor: 'transparent'
+          } : null)
+        },
         children: /*#__PURE__*/_jsx(HeaderBackContext.Provider, {
           value: headerBack,
           children: /*#__PURE__*/_jsx(AnimatedHeaderHeightProvider, {
@@ -100,6 +116,12 @@ export function NativeStackView({
           })
         })
       }, route.key);
+      return /*#__PURE__*/_jsx(ActivityView, {
+        mode: activityMode,
+        visible: isFocused || isNextScreenTransparent,
+        style: StyleSheet.absoluteFill,
+        children: content
+      }, route.key);
     })
   });
 }
@@ -119,11 +141,6 @@ const AnimatedHeaderHeightProvider = ({
 const styles = StyleSheet.create({
   contentContainer: {
     flex: 1
-  },
-  backImage: {
-    height: 24,
-    width: 24,
-    margin: 3
   }
 });
 //# sourceMappingURL=NativeStackView.js.map

package/lib/module/views/NativeStackView.js.map

@@ -1 +1 @@
-{"version":3,"names":["getHeaderTitle","Header","HeaderBackButton","HeaderBackContext","useHeaderHeight","SafeAreaProviderCompat","Screen","useLinkBuilder","React","Animated","Image","StyleSheet","View","AnimatedHeaderHeightContext","jsx","_jsx","TRANSPARENT_PRESENTATIONS","NativeStackView","state","descriptors","parentHeaderBack","useContext","buildHref","children","routes","concat","preloadedRoutes","map","route","i","isFocused","index","previousKey","key","nextKey","previousDescriptor","undefined","nextDescriptor","options","navigation","render","headerBack","title","name","href","params","canGoBack","header","headerShown","headerBackIcon","headerLeft","headerTransparent","headerBackTitle","presentation","contentStyle","rest","nextPresentation","isPreloaded","some","r","focused","back","label","tintColor","backImage","source","resizeMode","style","styles","onPress","goBack","absoluteFill","display","includes","backgroundColor","Provider","value","AnimatedHeaderHeightProvider","contentContainer","headerHeight","animatedHeaderHeight","useState","Value","useEffect","setValue","create","flex","height","width","margin"],"sourceRoot":"../../../src","sources":["views/NativeStackView.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getHeaderTitle","Header","HeaderBackButton","HeaderBackContext","useHeaderHeight","ActivityView","SafeAreaProviderCompat","Screen","useLinkBuilder","React","Animated","StyleSheet","View","getModalRouteKeys","AnimatedHeaderHeightContext","jsx","_jsx","TRANSPARENT_PRESENTATIONS","NativeStackView","state","descriptors","parentHeaderBack","use","buildHref","activeRoutes","routes","slice","index","modalRouteKeys","children","map","route","i","isFocused","previousKey","key","nextKey","previousDescriptor","undefined","nextDescriptor","descriptor","Error","options","navigation","render","headerBack","title","name","href","params","canGoBack","inactiveBehavior","header","headerShown","headerBackIcon","headerLeft","headerTransparent","headerBackTitle","presentation","contentStyle","rest","nextPresentation","isNextScreenTransparent","includes","isInactive","isBeforeLast","length","isNextScreenModal","activityMode","content","focused","back","label","tintColor","icon","onPress","goBack","style","absoluteFill","backgroundColor","Provider","value","AnimatedHeaderHeightProvider","styles","contentContainer","mode","visible","headerHeight","animatedHeaderHeight","useState","Value","useEffect","setValue","create","flex"],"sourceRoot":"../../../src","sources":["views/NativeStackView.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/views/NativeStackView.native.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { getDefaultHeaderHeight, getHeaderTitle, HeaderBackContext, HeaderHeightContext, HeaderShownContext, useFrameSize } from '@react-navigation/elements';
-import { SafeAreaProviderCompat } from '@react-navigation/elements/internal';
+import { ActivityView, SafeAreaProviderCompat } from '@react-navigation/elements/internal';
 import { NavigationProvider, StackActions, usePreventRemoveContext, useTheme } from '@react-navigation/native';
 import * as React from 'react';
 import { Animated, Platform, StyleSheet, useAnimatedValue, View } from 'react-native';
@@ -15,18 +15,20 @@ import { useInvalidPreventRemoveError } from "../utils/useInvalidPreventRemoveEr
 import { useHeaderConfigProps } from "./useHeaderConfigProps.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ANDROID_DEFAULT_HEADER_HEIGHT = 56;
-function isFabric() {
-  return 'nativeFabricUIManager' in global;
-}
 const useNativeDriver = Platform.OS !== 'web';
+const TRANSPARENT_PRESENTATIONS = ['transparentModal', 'containedTransparentModal'];
+const SHEET_PRESENTATIONS = ['formSheet', 'pageSheet'];
 const SceneView = ({
   index,
   focused,
-  shouldFreeze,
   descriptor,
   previousDescriptor,
   isPresentationModal,
-  isPreloaded,
+  isNextScreenTransparent,
+  isNextScreenSheet,
+  isNextScreenModal,
+  isInactive,
+  isBeforeLast,
   onWillDisappear,
   onWillAppear,
   onAppear,
@@ -44,6 +46,7 @@ const SceneView = ({
     render
   } = descriptor;
   const {
+    inactiveBehavior = 'pause',
     animation,
     animationDuration,
     animationMatchesGesture,
@@ -74,9 +77,9 @@ const SceneView = ({
     statusBarAnimation,
     statusBarHidden,
     statusBarStyle,
+    unstable_headerInsets,
     unstable_sheetFooter,
     scrollEdgeEffects,
-    freezeOnBlur,
     contentStyle
   } = options;
   let {
@@ -97,11 +100,11 @@ const SceneView = ({
 
   // Modals are fullscreen in landscape only on iPhone
   const isIPhone = Platform.OS === 'ios' && !(Platform.isPad || Platform.isTV);
-  const isParentHeaderShown = React.useContext(HeaderShownContext);
-  const parentHeaderHeight = React.useContext(HeaderHeightContext);
-  const parentHeaderBack = React.useContext(HeaderBackContext);
+  const isParentHeaderShown = React.use(HeaderShownContext);
+  const parentHeaderHeight = React.use(HeaderHeightContext);
+  const parentHeaderBack = React.use(HeaderBackContext);
   const isLandscape = useFrameSize(frame => frame.width > frame.height);
-  const topInset = isParentHeaderShown || Platform.OS === 'ios' && isModal || isIPhone && isLandscape ? 0 : insets.top;
+  const topInset = isParentHeaderShown || Platform.OS === 'android' && unstable_headerInsets?.top === false || Platform.OS === 'ios' && isModal || isIPhone && isLandscape ? 0 : insets.top;
   const defaultHeaderHeight = useFrameSize(frame => Platform.select({
     // FIXME: Currently screens isn't using Material 3
     // So our `getDefaultHeaderHeight` doesn't return the correct value
@@ -123,7 +126,6 @@ const SceneView = ({
   // Debounce the header height updates to avoid excessive re-renders
   debounce(setHeaderHeight, 100), []);
   const hasCustomHeader = header != null;
-  const headerTopInsetEnabled = topInset !== 0;
   const canGoBack = previousDescriptor != null || parentHeaderBack != null;
   const backTitle = previousDescriptor ? getHeaderTitle(previousDescriptor.options, previousDescriptor.route.name) : parentHeaderBack?.title;
   const headerBack = React.useMemo(() => {
@@ -145,9 +147,15 @@ const SceneView = ({
     headerBackTitle: options.headerBackTitle !== undefined ? options.headerBackTitle : undefined,
     headerHeight,
     headerShown: header !== undefined ? false : headerShown,
-    headerTopInsetEnabled,
     headerBack
   });
+  const headerContainerRef = React.useRef(null);
+  React.useLayoutEffect(() => {
+    headerContainerRef.current?.measure((_x, _y, _width, height) => {
+      animatedHeaderHeight.setValue(height);
+      setHeaderHeight(height);
+    });
+  }, [animatedHeaderHeight]);
   const onHeaderHeightChange = hasCustomHeader ?
   // If we have a custom header, don't use native header height
   undefined :
@@ -171,7 +179,9 @@ const SceneView = ({
         if (doesHeaderAnimate) {
           setHeaderHeightDebounced(headerHeight);
         } else {
-          if (Platform.OS === 'android' && headerHeight !== 0 && headerHeight <= ANDROID_DEFAULT_HEADER_HEIGHT) {
+          if (Platform.OS === 'android' && headerHeight !== 0 &&
+          // On some devices, height maybe slightly off (e.g. 56.17 instead of 56)
+          Math.round(headerHeight) <= ANDROID_DEFAULT_HEADER_HEIGHT) {
             // FIXME: On Android, events may get delivered out-of-order
             // https://github.com/facebook/react-native/issues/54636
             // We seem to get header height without status bar height first,
@@ -188,18 +198,77 @@ const SceneView = ({
       }
     }
   });
+  const activityMode =
+  // Render focused screens normally
+  // Unpause preloaded and retained screens so updates are visible
+  // Unpause previous screen so update isn't delayed for swipe back
+  // This lets effects on those screens run
+  // We don't need to handle inert as it'll be handled natively
+  inactiveBehavior === 'none' || focused || isInactive || isNextScreenTransparent ||
+  // Unpause the screen behind a sheet so it stays up to date
+  // Sheets don't cover the whole screen, so the screen behind is visible
+  isNextScreenSheet ||
+  // On iPadOS, the base screen is visible while modal is in a smaller area
+  // So also keep the screens unpaused
+  isNextScreenModal && !isModal || isBeforeLast ? 'normal' : inactiveBehavior === 'unmount' && !('state' in route && route.state) ? 'unmounted' : 'paused';
+  const content = /*#__PURE__*/_jsx(AnimatedHeaderHeightContext.Provider, {
+    value: animatedHeaderHeight,
+    children: /*#__PURE__*/_jsxs(HeaderHeightContext.Provider, {
+      value: headerShown !== false ? headerHeight : parentHeaderHeight ?? 0,
+      children: [headerBackground != null ?
+      /*#__PURE__*/
+      /**
+       * To show a custom header background, we render it at the top of the screen below the header
+       * The header also needs to be positioned absolutely (with `translucent` style)
+       */
+      _jsx(View, {
+        style: [styles.background, headerTransparent ? styles.translucent : null, {
+          height: headerHeight
+        }],
+        children: headerBackground()
+      }) : null, header != null && headerShown !== false ? /*#__PURE__*/_jsx(View, {
+        style: [styles.header, headerTransparent ? [styles.absolute,
+        // Specify an explicit min height for Android screen readers
+        {
+          minHeight: headerHeight
+        }] : null],
+        children: /*#__PURE__*/_jsx(View, {
+          ref: headerContainerRef,
+          onLayout: e => {
+            const headerHeight = e.nativeEvent.layout.height;
+            animatedHeaderHeight.setValue(headerHeight);
+            setHeaderHeight(headerHeight);
+          },
+          style: {
+            pointerEvents: 'box-none'
+          },
+          children: header({
+            back: headerBack,
+            options,
+            route,
+            navigation
+          })
+        })
+      }) : null, /*#__PURE__*/_jsx(HeaderShownContext.Provider, {
+        value: isParentHeaderShown || headerShown !== false,
+        children: /*#__PURE__*/_jsx(HeaderBackContext.Provider, {
+          value: headerBack,
+          children: render()
+        })
+      })]
+    })
+  });
   return /*#__PURE__*/_jsx(NavigationProvider, {
     navigation: navigation,
     route: route,
     children: /*#__PURE__*/_jsx(ScreenStackItem, {
       screenId: route.key,
-      activityState: isPreloaded ? 0 : 2,
+      activityState: isInactive ? 0 : 2,
       style: StyleSheet.absoluteFill,
       "aria-hidden": !focused,
       customAnimationOnSwipe: animationMatchesGesture,
       fullScreenSwipeEnabled: fullScreenGestureEnabled,
       fullScreenSwipeShadowEnabled: fullScreenGestureShadowEnabled,
-      freezeOnBlur: freezeOnBlur,
       gestureEnabled: Platform.OS === 'android' ?
       // This prop enables handling of system back gestures on Android
       // Since we handle them in JS side, we disable this
@@ -250,48 +319,16 @@ const SceneView = ({
         backgroundColor: colors.background
       }, contentStyle],
       headerConfig: headerConfig,
-      unstable_sheetFooter: unstable_sheetFooter
-      // When ts-expect-error is added, it affects all the props below it
-      // So we keep any props that need it at the end
-      // Otherwise invalid props may not be caught by TypeScript
-      ,
-      shouldFreeze: shouldFreeze,
-      children: /*#__PURE__*/_jsx(AnimatedHeaderHeightContext.Provider, {
-        value: animatedHeaderHeight,
-        children: /*#__PURE__*/_jsxs(HeaderHeightContext.Provider, {
-          value: headerShown !== false ? headerHeight : parentHeaderHeight ?? 0,
-          children: [headerBackground != null ?
-          /*#__PURE__*/
-          /**
-           * To show a custom header background, we render it at the top of the screen below the header
-           * The header also needs to be positioned absolutely (with `translucent` style)
-           */
-          _jsx(View, {
-            style: [styles.background, headerTransparent ? styles.translucent : null, {
-              height: headerHeight
-            }],
-            children: headerBackground()
-          }) : null, header != null && headerShown !== false ? /*#__PURE__*/_jsx(View, {
-            onLayout: e => {
-              const headerHeight = e.nativeEvent.layout.height;
-              animatedHeaderHeight.setValue(headerHeight);
-              setHeaderHeight(headerHeight);
-            },
-            style: [styles.header, headerTransparent ? styles.absolute : null],
-            children: header({
-              back: headerBack,
-              options,
-              route,
-              navigation
-            })
-          }) : null, /*#__PURE__*/_jsx(HeaderShownContext.Provider, {
-            value: isParentHeaderShown || headerShown !== false,
-            children: /*#__PURE__*/_jsx(HeaderBackContext.Provider, {
-              value: headerBack,
-              children: render()
-            })
-          })]
-        })
+      unstable_sheetFooter: unstable_sheetFooter,
+      children: activityMode === 'unmounted' ? null : /*#__PURE__*/_jsx(ActivityView, {
+        mode: activityMode,
+        visible:
+        // We don't need to hide the content since it's handled natively
+        // Hiding may also cause flash due to lag after native tab switch
+        // So we leave it always visible
+        true,
+        style: styles.content,
+        children: content
       })
     }, route.key)
   });
@@ -305,34 +342,38 @@ export function NativeStackView({
     setNextDismissedKey
   } = useDismissedRouteError(state);
   useInvalidPreventRemoveError(descriptors);
-  const modalRouteKeys = getModalRouteKeys(state.routes, descriptors);
+  const activeRoutes = state.routes.slice(0, state.index + 1);
+  const modalRouteKeys = getModalRouteKeys(activeRoutes, descriptors);
   return /*#__PURE__*/_jsx(SafeAreaProviderCompat, {
     children: /*#__PURE__*/_jsx(ScreenStack, {
       style: styles.container,
-      children: state.routes.concat(state.preloadedRoutes).map((route, index) => {
+      children: state.routes.map((route, index) => {
         const descriptor = descriptors[route.key];
+        if (descriptor == null) {
+          throw new Error(`Couldn't find a descriptor for route '${route.key}'.`);
+        }
         const isFocused = state.index === index;
-        const isBelowFocused = state.index - 1 === index;
-        const previousKey = state.routes[index - 1]?.key;
-        const nextKey = state.routes[index + 1]?.key;
+        const previousKey = activeRoutes[index - 1]?.key;
+        const nextKey = activeRoutes[index + 1]?.key;
         const previousDescriptor = previousKey ? descriptors[previousKey] : undefined;
         const nextDescriptor = nextKey ? descriptors[nextKey] : undefined;
+        const nextPresentation = nextDescriptor?.options.presentation;
+        const isNextScreenTransparent = nextPresentation != null && TRANSPARENT_PRESENTATIONS.includes(nextPresentation);
+        const isNextScreenSheet = nextPresentation != null && SHEET_PRESENTATIONS.includes(nextPresentation);
+        const isNextScreenModal = nextKey ? modalRouteKeys.includes(nextKey) : false;
         const isModal = modalRouteKeys.includes(route.key);
-        const isModalOnIos = isModal && Platform.OS === 'ios';
-        const isPreloaded = state.preloadedRoutes.some(r => r.key === route.key);
-
-        // On Fabric, when screen is frozen, animated and reanimated values are not updated
-        // due to component being unmounted. To avoid this, we don't freeze the previous screen there
-        const shouldFreeze = isFabric() ? !isPreloaded && !isFocused && !isBelowFocused && !isModalOnIos : !isPreloaded && !isFocused && !isModalOnIos;
         return /*#__PURE__*/_jsx(SceneView, {
           index: index,
           focused: isFocused,
-          shouldFreeze: shouldFreeze,
           descriptor: descriptor,
           previousDescriptor: previousDescriptor,
           nextDescriptor: nextDescriptor,
           isPresentationModal: isModal,
-          isPreloaded: isPreloaded,
+          isNextScreenTransparent: isNextScreenTransparent,
+          isNextScreenSheet: isNextScreenSheet,
+          isNextScreenModal: isNextScreenModal,
+          isInactive: index > state.index,
+          isBeforeLast: index === activeRoutes.length - 2,
           onWillDisappear: () => {
             navigation.emit({
               type: 'transitionStart',
@@ -370,11 +411,15 @@ export function NativeStackView({
             });
           },
           onDismissed: event => {
-            navigation.dispatch({
-              ...StackActions.pop(event.nativeEvent.dismissCount),
-              source: route.key,
-              target: state.key
-            });
+            const currentState = navigation.getState();
+            const currentActiveRoutes = currentState.routes.slice(0, currentState.index + 1);
+            if (currentActiveRoutes.some(r => r.key === route.key)) {
+              navigation.dispatch({
+                ...StackActions.pop(event.nativeEvent.dismissCount),
+                source: route.key,
+                target: currentState.key
+              });
+            }
             setNextDismissedKey(route.key);
           },
           onHeaderBackButtonClicked: () => {
@@ -416,6 +461,9 @@ const styles = StyleSheet.create({
   container: {
     flex: 1
   },
+  content: {
+    flex: 1
+  },
   header: {
     zIndex: 1
   },