@react-navigation/core 8.0.0-alpha.4 → 8.0.0-alpha.41

package/lib/module/DataLoading.js

@@ -0,0 +1,129 @@
+"use strict";
+
+import { getStateFromRouteParams } from "./getStateFromRouteParams.js";
+function findScreenInConfig(config, name) {
+  const screens = config.screens;
+  if (screens?.[name] != null) {
+    return screens[name];
+  }
+  if (config.groups) {
+    for (const group of Object.values(config.groups)) {
+      if (group.screens[name] != null) {
+        return group.screens[name];
+      }
+    }
+  }
+  return undefined;
+}
+function findInitialRouteName(config) {
+  if (config.initialRouteName != null) {
+    return config.initialRouteName;
+  }
+  for (const key in config) {
+    if (key === 'screens' && config.screens) {
+      const name = Object.keys(config.screens)[0];
+      if (name != null) {
+        return name;
+      }
+    }
+    if (key === 'groups' && config.groups) {
+      for (const group of Object.values(config.groups)) {
+        const name = Object.keys(group.screens)[0];
+        if (name != null) {
+          return name;
+        }
+      }
+    }
+  }
+  return undefined;
+}
+
+/**
+ * Get loader for the focused route in a static config tree with given navigation state.
+ *
+ * @param tree The static navigation config.
+ * @param state The navigation state to extract the focused route path from.
+ * @returns A function that returns a `Promise<void>`, or `undefined` if no loaders are found.
+ *
+ * @example
+ * ```js
+ * const loader = getLoaderForState(RootStack, {
+ *   index: 0,
+ *   routes: [{ name: 'Home' }],
+ * });
+ * await loader?.();
+ * ```
+ */
+export function getLoaderForState(tree, state) {
+  return getLoaderForStateChange(tree, state, undefined, undefined);
+}
+export function getLoaderForStateChange(tree, state, previousState, consumedParams) {
+  const focusedRoute = state?.routes[state.index ?? state.routes.length - 1];
+  const previousFocusedRoute = previousState?.routes[previousState.index ?? previousState.routes.length - 1];
+  if (!focusedRoute) {
+    return undefined;
+  }
+  const isNewlyFocused = previousState === undefined || previousFocusedRoute == null || focusedRoute.name !== previousFocusedRoute.name || focusedRoute.key != null && previousFocusedRoute.key != null && focusedRoute.key !== previousFocusedRoute.key;
+  const item = findScreenInConfig(tree.config, focusedRoute.name);
+  if (item == null) {
+    return undefined;
+  }
+  const initialParams = typeof item === 'object' && 'initialParams' in item ? item.initialParams : undefined;
+  const params = initialParams != null || focusedRoute.params != null ? {
+    ...initialParams,
+    ...focusedRoute.params
+  } : undefined;
+  const loaders = [];
+  if (isNewlyFocused && 'UNSTABLE_loader' in item && typeof item.UNSTABLE_loader === 'function') {
+    const loader = item.UNSTABLE_loader;
+    loaders.push(() => loader({
+      name: focusedRoute.name,
+      params
+    }));
+  }
+  const nested = 'config' in item ? item : 'screen' in item &&
+  // Nested navigators cannot be defined as a getter
+  Object.getOwnPropertyDescriptor(item, 'screen')?.get == null && 'config' in item.screen ? item.screen : undefined;
+  if (nested) {
+    const initialRouteName = findInitialRouteName(nested.config);
+    const stateFromParams = focusedRoute.params != null && consumedParams?.has(focusedRoute.params) ? undefined : getStateFromRouteParams(params);
+    let childState = previousState !== undefined && stateFromParams != null ? stateFromParams : focusedRoute.state ?? stateFromParams;
+    if (childState == null && initialRouteName != null) {
+      childState = {
+        routes: [{
+          name: initialRouteName
+        }]
+      };
+    }
+    let previousChildState;
+    if (!isNewlyFocused) {
+      const previousRouteParams = previousFocusedRoute?.params;
+      const previousParams = initialParams != null || previousRouteParams != null ? {
+        ...initialParams,
+        ...previousRouteParams
+      } : undefined;
+      const previousStateFromParams = previousRouteParams != null && consumedParams?.has(previousRouteParams) ? undefined : getStateFromRouteParams(previousParams);
+      previousChildState = previousFocusedRoute?.state ?? previousStateFromParams;
+      if (previousChildState == null && initialRouteName != null) {
+        previousChildState = {
+          routes: [{
+            name: initialRouteName
+          }]
+        };
+      }
+    }
+    const childLoader = getLoaderForStateChange(nested, childState, previousState === undefined ? undefined : previousChildState ?? {
+      routes: []
+    }, consumedParams);
+    if (childLoader) {
+      loaders.push(childLoader);
+    }
+  }
+  if (loaders.length === 0) {
+    return undefined;
+  }
+  return async () => {
+    await Promise.all(loaders.map(l => l()));
+  };
+}
+//# sourceMappingURL=DataLoading.js.map

package/lib/module/DataLoading.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getStateFromRouteParams","findScreenInConfig","config","name","screens","groups","group","Object","values","undefined","findInitialRouteName","initialRouteName","key","keys","getLoaderForState","tree","state","getLoaderForStateChange","previousState","consumedParams","focusedRoute","routes","index","length","previousFocusedRoute","isNewlyFocused","item","initialParams","params","loaders","UNSTABLE_loader","loader","push","nested","getOwnPropertyDescriptor","get","screen","stateFromParams","has","childState","previousChildState","previousRouteParams","previousParams","previousStateFromParams","childLoader","Promise","all","map","l"],"sourceRoot":"../../src","sources":["DataLoading.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/NavigationBuilderContext.js

@@ -4,15 +4,12 @@ import * as React from 'react';
 /**
  * Context which holds the required helpers needed to build nested navigators.
  */
-export const NavigationBuilderContext = /*#__PURE__*/React.createContext({
-  onDispatchAction: () => undefined,
-  onEmitEvent: () => undefined,
-  onOptionsChange: () => undefined,
-  scheduleUpdate: () => {
-    throw new Error("Couldn't find a context for scheduling updates.");
-  },
-  flushUpdates: () => {
-    throw new Error("Couldn't find a context for flushing updates.");
+export const NavigationBuilderContext = /*#__PURE__*/React.createContext(undefined);
+export function useNavigationBuilderContext() {
+  const value = React.use(NavigationBuilderContext);
+  if (value == null) {
+    throw new Error("Couldn't find a navigation builder context. Is your component inside NavigationContainer?");
   }
-});
+  return value;
+}
 //# sourceMappingURL=NavigationBuilderContext.js.map

package/lib/module/NavigationBuilderContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","NavigationBuilderContext","createContext","onDispatchAction","undefined","onEmitEvent","onOptionsChange","scheduleUpdate","Error","flushUpdates"],"sourceRoot":"../../src","sources":["NavigationBuilderContext.tsx"],"mappings":";;AAKA,OAAO,KAAKA,KAAK,MAAM,OAAO;AA6C9B;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,gBAAGD,KAAK,CAACE,aAAa,CAmBxD;EACDC,gBAAgB,EAAEA,CAAA,KAAMC,SAAS;EACjCC,WAAW,EAAEA,CAAA,KAAMD,SAAS;EAC5BE,eAAe,EAAEA,CAAA,KAAMF,SAAS;EAChCG,cAAc,EAAEA,CAAA,KAAM;IACpB,MAAM,IAAIC,KAAK,CAAC,iDAAiD,CAAC;EACpE,CAAC;EACDC,YAAY,EAAEA,CAAA,KAAM;IAClB,MAAM,IAAID,KAAK,CAAC,+CAA+C,CAAC;EAClE;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","NavigationBuilderContext","createContext","undefined","useNavigationBuilderContext","value","use","Error"],"sourceRoot":"../../src","sources":["NavigationBuilderContext.tsx"],"mappings":";;AAMA,OAAO,KAAKA,KAAK,MAAM,OAAO;AA8E9B;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,gBAAGD,KAAK,CAACE,aAAa,CAEzDC,SAAS,CAAC;AAEZ,OAAO,SAASC,2BAA2BA,CAAA,EAAG;EAC5C,MAAMC,KAAK,GAAGL,KAAK,CAACM,GAAG,CAACL,wBAAwB,CAAC;EAEjD,IAAII,KAAK,IAAI,IAAI,EAAE;IACjB,MAAM,IAAIE,KAAK,CACb,2FACF,CAAC;EACH;EAEA,OAAOF,KAAK;AACd","ignoreList":[]}

package/lib/module/NavigationIndependentTree.js

@@ -1,8 +1,17 @@
 "use strict";
 
 import * as React from 'react';
+import { NavigationBuilderContext } from "./NavigationBuilderContext.js";
+import { NavigationContainerRefContext } from "./NavigationContainerRefContext.js";
+import { NavigationFocusedRouteStateContext } from "./NavigationFocusedRouteStateContext.js";
+import { NavigationHelpersContext } from "./NavigationHelpersContext.js";
 import { NavigationIndependentTreeContext } from "./NavigationIndependentTreeContext.js";
-import { NamedRouteContextListContext, NavigationContext, NavigationRouteContext, NavigationRouteNameContext } from "./NavigationProvider.js";
+import { IsScreenContext, NamedRouteContextListContext, NavigationContext, NavigationRouteContext } from "./NavigationProvider.js";
+import { NavigationRootContext } from "./NavigationRootContext.js";
+import { PreventRemoveContext } from "./PreventRemoveContext.js";
+import { StaticTreeContext } from "./StaticTreeContext.js";
+import { FocusedRouteKeyContext, IsFocusedContext, IsFocusedGetterContext } from "./useIsFocused.js";
+import { NamedNavigationStateListenerListContext, NavigationStateListenerContext } from "./useNavigationState.js";
 
 /**
  * Component to make the child navigation container independent of parent containers.
@@ -14,17 +23,53 @@ export function NavigationIndependentTree({
   return (
     /*#__PURE__*/
     // We need to clear any existing contexts for nested independent container to work correctly
-    _jsx(NamedRouteContextListContext.Provider, {
-      value: undefined,
-      children: /*#__PURE__*/_jsx(NavigationRouteContext.Provider, {
+    _jsx(NavigationIndependentTreeContext.Provider, {
+      value: true,
+      children: /*#__PURE__*/_jsx(NavigationContainerRefContext.Provider, {
         value: undefined,
-        children: /*#__PURE__*/_jsx(NavigationContext.Provider, {
+        children: /*#__PURE__*/_jsx(NavigationRootContext.Provider, {
           value: undefined,
-          children: /*#__PURE__*/_jsx(NavigationRouteNameContext.Provider, {
+          children: /*#__PURE__*/_jsx(NavigationBuilderContext.Provider, {
             value: undefined,
-            children: /*#__PURE__*/_jsx(NavigationIndependentTreeContext.Provider, {
-              value: true,
-              children: children
+            children: /*#__PURE__*/_jsx(StaticTreeContext.Provider, {
+              value: undefined,
+              children: /*#__PURE__*/_jsx(NavigationHelpersContext.Provider, {
+                value: undefined,
+                children: /*#__PURE__*/_jsx(NavigationStateListenerContext.Provider, {
+                  value: undefined,
+                  children: /*#__PURE__*/_jsx(FocusedRouteKeyContext.Provider, {
+                    value: undefined,
+                    children: /*#__PURE__*/_jsx(PreventRemoveContext.Provider, {
+                      value: undefined,
+                      children: /*#__PURE__*/_jsx(NamedNavigationStateListenerListContext.Provider, {
+                        value: undefined,
+                        children: /*#__PURE__*/_jsx(NamedRouteContextListContext.Provider, {
+                          value: undefined,
+                          children: /*#__PURE__*/_jsx(NavigationRouteContext.Provider, {
+                            value: undefined,
+                            children: /*#__PURE__*/_jsx(NavigationContext.Provider, {
+                              value: undefined,
+                              children: /*#__PURE__*/_jsx(IsFocusedContext.Provider, {
+                                value: undefined,
+                                children: /*#__PURE__*/_jsx(IsFocusedGetterContext.Provider, {
+                                  value: undefined,
+                                  children: /*#__PURE__*/_jsx(IsScreenContext.Provider, {
+                                    value: false,
+                                    children: /*#__PURE__*/_jsx(NavigationFocusedRouteStateContext.Provider, {
+                                      value: undefined,
+                                      children: children
+                                    })
+                                  })
+                                })
+                              })
+                            })
+                          })
+                        })
+                      })
+                    })
+                  })
+                })
+              })
             })
           })
         })

package/lib/module/NavigationIndependentTree.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","NavigationIndependentTreeContext","NamedRouteContextListContext","NavigationContext","NavigationRouteContext","NavigationRouteNameContext","jsx","_jsx","NavigationIndependentTree","children","Provider","value","undefined"],"sourceRoot":"../../src","sources":["NavigationIndependentTree.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,gCAAgC,QAAQ,uCAAoC;AACrF,SACEC,4BAA4B,EAC5BC,iBAAiB,EACjBC,sBAAsB,EACtBC,0BAA0B,QACrB,yBAAsB;;AAE7B;AACA;AACA;AAFA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,SAASC,yBAAyBA,CAAC;EACxCC;AAGF,CAAC,EAAE;EACD;IAAA;IACE;IACAF,IAAA,CAACL,4BAA4B,CAACQ,QAAQ;MAACC,KAAK,EAAEC,SAAU;MAAAH,QAAA,eACtDF,IAAA,CAACH,sBAAsB,CAACM,QAAQ;QAACC,KAAK,EAAEC,SAAU;QAAAH,QAAA,eAChDF,IAAA,CAACJ,iBAAiB,CAACO,QAAQ;UAACC,KAAK,EAAEC,SAAU;UAAAH,QAAA,eAC3CF,IAAA,CAACF,0BAA0B,CAACK,QAAQ;YAACC,KAAK,EAAEC,SAAU;YAAAH,QAAA,eACpDF,IAAA,CAACN,gCAAgC,CAACS,QAAQ;cAACC,KAAK,EAAE,IAAK;cAAAF,QAAA,EACpDA;YAAQ,CACgC;UAAC,CACT;QAAC,CACZ;MAAC,CACE;IAAC,CACG;EAAC;AAE5C","ignoreList":[]}
+{"version":3,"names":["React","NavigationBuilderContext","NavigationContainerRefContext","NavigationFocusedRouteStateContext","NavigationHelpersContext","NavigationIndependentTreeContext","IsScreenContext","NamedRouteContextListContext","NavigationContext","NavigationRouteContext","NavigationRootContext","PreventRemoveContext","StaticTreeContext","FocusedRouteKeyContext","IsFocusedContext","IsFocusedGetterContext","NamedNavigationStateListenerListContext","NavigationStateListenerContext","jsx","_jsx","NavigationIndependentTree","children","Provider","value","undefined"],"sourceRoot":"../../src","sources":["NavigationIndependentTree.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,wBAAwB,QAAQ,+BAA4B;AACrE,SAASC,6BAA6B,QAAQ,oCAAiC;AAC/E,SAASC,kCAAkC,QAAQ,yCAAsC;AACzF,SAASC,wBAAwB,QAAQ,+BAA4B;AACrE,SAASC,gCAAgC,QAAQ,uCAAoC;AACrF,SACEC,eAAe,EACfC,4BAA4B,EAC5BC,iBAAiB,EACjBC,sBAAsB,QACjB,yBAAsB;AAC7B,SAASC,qBAAqB,QAAQ,4BAAyB;AAC/D,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SACEC,sBAAsB,EACtBC,gBAAgB,EAChBC,sBAAsB,QACjB,mBAAgB;AACvB,SACEC,uCAAuC,EACvCC,8BAA8B,QACzB,yBAAsB;;AAE7B;AACA;AACA;AAFA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,SAASC,yBAAyBA,CAAC;EACxCC;AAGF,CAAC,EAAE;EACD;IAAA;IACE;IACAF,IAAA,CAACd,gCAAgC,CAACiB,QAAQ;MAACC,KAAK,EAAE,IAAK;MAAAF,QAAA,eACrDF,IAAA,CAACjB,6BAA6B,CAACoB,QAAQ;QAACC,KAAK,EAAEC,SAAU;QAAAH,QAAA,eACvDF,IAAA,CAACT,qBAAqB,CAACY,QAAQ;UAACC,KAAK,EAAEC,SAAU;UAAAH,QAAA,eAC/CF,IAAA,CAAClB,wBAAwB,CAACqB,QAAQ;YAACC,KAAK,EAAEC,SAAU;YAAAH,QAAA,eAClDF,IAAA,CAACP,iBAAiB,CAACU,QAAQ;cAACC,KAAK,EAAEC,SAAU;cAAAH,QAAA,eAC3CF,IAAA,CAACf,wBAAwB,CAACkB,QAAQ;gBAACC,KAAK,EAAEC,SAAU;gBAAAH,QAAA,eAClDF,IAAA,CAACF,8BAA8B,CAACK,QAAQ;kBAACC,KAAK,EAAEC,SAAU;kBAAAH,QAAA,eACxDF,IAAA,CAACN,sBAAsB,CAACS,QAAQ;oBAACC,KAAK,EAAEC,SAAU;oBAAAH,QAAA,eAChDF,IAAA,CAACR,oBAAoB,CAACW,QAAQ;sBAACC,KAAK,EAAEC,SAAU;sBAAAH,QAAA,eAC9CF,IAAA,CAACH,uCAAuC,CAACM,QAAQ;wBAC/CC,KAAK,EAAEC,SAAU;wBAAAH,QAAA,eAEjBF,IAAA,CAACZ,4BAA4B,CAACe,QAAQ;0BACpCC,KAAK,EAAEC,SAAU;0BAAAH,QAAA,eAEjBF,IAAA,CAACV,sBAAsB,CAACa,QAAQ;4BAACC,KAAK,EAAEC,SAAU;4BAAAH,QAAA,eAChDF,IAAA,CAACX,iBAAiB,CAACc,QAAQ;8BAACC,KAAK,EAAEC,SAAU;8BAAAH,QAAA,eAC3CF,IAAA,CAACL,gBAAgB,CAACQ,QAAQ;gCAACC,KAAK,EAAEC,SAAU;gCAAAH,QAAA,eAC1CF,IAAA,CAACJ,sBAAsB,CAACO,QAAQ;kCAC9BC,KAAK,EAAEC,SAAU;kCAAAH,QAAA,eAEjBF,IAAA,CAACb,eAAe,CAACgB,QAAQ;oCAACC,KAAK,EAAE,KAAM;oCAAAF,QAAA,eACrCF,IAAA,CAAChB,kCAAkC,CAACmB,QAAQ;sCAC1CC,KAAK,EAAEC,SAAU;sCAAAH,QAAA,EAEhBA;oCAAQ,CACkC;kCAAC,CACtB;gCAAC,CACI;8BAAC,CACT;4BAAC,CACF;0BAAC,CACE;wBAAC,CACG;sBAAC,CACQ;oBAAC,CACtB;kBAAC,CACD;gBAAC,CACK;cAAC,CACT;YAAC,CACV;UAAC,CACI;QAAC,CACN;MAAC,CACK;IAAC,CACA;EAAC;AAEhD","ignoreList":[]}

package/lib/module/NavigationProvider.js

@@ -1,7 +1,10 @@
 "use strict";
 
 import * as React from 'react';
+import useLatestCallback from 'use-latest-callback';
+import { FocusedRouteKeyContext, IsFocusedContext, IsFocusedGetterContext } from "./useIsFocused.js";
 import { useLazyValue } from "./useLazyValue.js";
+import { NamedNavigationStateListenerProvider } from "./useNavigationState.js";
 
 /**
  * Context which holds the route prop for a screen.
@@ -13,7 +16,12 @@ export const NavigationRouteContext = /*#__PURE__*/React.createContext(undefined
  * Context which holds the navigation prop for a screen.
  */
 export const NavigationContext = /*#__PURE__*/React.createContext(undefined);
-export const NavigationRouteNameContext = /*#__PURE__*/React.createContext(undefined);
+
+/**
+ * Context which indicates whether the component is inside a screen.
+ */
+export const IsScreenContext = /*#__PURE__*/React.createContext(false);
+
 /**
  * Component to provide the navigation and route contexts to its children.
  */
@@ -29,21 +37,38 @@ export function NavigationProvider({
     ...parents,
     [route.name]: NamedRouteContext
   }), [NamedRouteContext, parents, route.name]);
-  return /*#__PURE__*/_jsx(NamedRouteContextListContext.Provider, {
-    value: NamedRouteContextList,
-    children: /*#__PURE__*/_jsx(NamedRouteContext.Provider, {
-      value: route,
-      children: /*#__PURE__*/_jsx(NavigationRouteContext.Provider, {
+  const parentIsFocused = React.use(IsFocusedContext);
+  const focusedRouteKey = React.use(FocusedRouteKeyContext);
+
+  // Mark route as focused only if:
+  // - It doesn't have a parent navigator
+  // - Parent navigator is focused
+  const isFocused = parentIsFocused == null || parentIsFocused ? focusedRouteKey === route.key : false;
+  const getIsFocused = useLatestCallback(() => isFocused);
+  return React.useMemo(() => /*#__PURE__*/_jsx(NamedNavigationStateListenerProvider, {
+    name: route.name,
+    children: /*#__PURE__*/_jsx(NamedRouteContextListContext.Provider, {
+      value: NamedRouteContextList,
+      children: /*#__PURE__*/_jsx(NamedRouteContext.Provider, {
         value: route,
-        children: /*#__PURE__*/_jsx(NavigationContext.Provider, {
-          value: navigation,
-          children: /*#__PURE__*/_jsx(NavigationRouteNameContext.Provider, {
-            value: route.name,
-            children: children
+        children: /*#__PURE__*/_jsx(NavigationRouteContext.Provider, {
+          value: route,
+          children: /*#__PURE__*/_jsx(NavigationContext.Provider, {
+            value: navigation,
+            children: /*#__PURE__*/_jsx(IsFocusedContext.Provider, {
+              value: isFocused,
+              children: /*#__PURE__*/_jsx(IsFocusedGetterContext.Provider, {
+                value: getIsFocused,
+                children: /*#__PURE__*/_jsx(IsScreenContext.Provider, {
+                  value: true,
+                  children: children
+                })
+              })
+            })
           })
         })
       })
     })
-  });
+  }), [NamedRouteContext, NamedRouteContextList, children, getIsFocused, isFocused, navigation, route]);
 }
 //# sourceMappingURL=NavigationProvider.js.map

package/lib/module/NavigationProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useLazyValue","jsx","_jsx","NavigationRouteContext","createContext","undefined","NavigationContext","NavigationRouteNameContext","NamedRouteContextListContext","NavigationProvider","route","navigation","children","NamedRouteContext","parents","use","NamedRouteContextList","useMemo","name","Provider","value"],"sourceRoot":"../../src","sources":["NavigationProvider.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAG9B,SAASC,YAAY,QAAQ,mBAAgB;;AAE7C;AACA;AACA;AAFA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,sBAAsB,gBAAGJ,KAAK,CAACK,aAAa,CAEvDC,SAAS,CAAC;;AAEZ;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,gBAAGP,KAAK,CAACK,aAAa,CAElDC,SAAS,CAAC;AAEZ,OAAO,MAAME,0BAA0B,gBAAGR,KAAK,CAACK,aAAa,CAE3DC,SAAS,CAAC;AAQZ;AACA;AACA;AACA,OAAO,MAAMG,4BAA4B,gBAAGT,KAAK,CAACK,aAAa,CAE7DC,SAAS,CAAC;AAEZ,OAAO,SAASI,kBAAkBA,CAAC;EAAEC,KAAK;EAAEC,UAAU;EAAEC;AAAgB,CAAC,EAAE;EACzE,MAAMC,iBAAiB,GAAGb,YAAY,CAAC,mBAAMD,KAAK,CAACK,aAAa,CAACM,KAAK,CAAC,CAAC;EAExE,MAAMI,OAAO,GAAGf,KAAK,CAACgB,GAAG,CAACP,4BAA4B,CAAC;EAEvD,MAAMQ,qBAAqB,GAAGjB,KAAK,CAACkB,OAAO,CACzC,OAAO;IACL,GAAGH,OAAO;IACV,CAACJ,KAAK,CAACQ,IAAI,GAAGL;EAChB,CAAC,CAAC,EACF,CAACA,iBAAiB,EAAEC,OAAO,EAAEJ,KAAK,CAACQ,IAAI,CACzC,CAAC;EAED,oBACEhB,IAAA,CAACM,4BAA4B,CAACW,QAAQ;IAACC,KAAK,EAAEJ,qBAAsB;IAAAJ,QAAA,eAClEV,IAAA,CAACW,iBAAiB,CAACM,QAAQ;MAACC,KAAK,EAAEV,KAAM;MAAAE,QAAA,eACvCV,IAAA,CAACC,sBAAsB,CAACgB,QAAQ;QAACC,KAAK,EAAEV,KAAM;QAAAE,QAAA,eAC5CV,IAAA,CAACI,iBAAiB,CAACa,QAAQ;UAACC,KAAK,EAAET,UAAW;UAAAC,QAAA,eAC5CV,IAAA,CAACK,0BAA0B,CAACY,QAAQ;YAACC,KAAK,EAAEV,KAAK,CAACQ,IAAK;YAAAN,QAAA,EACpDA;UAAQ,CAC0B;QAAC,CACZ;MAAC,CACE;IAAC,CACR;EAAC,CACQ,CAAC;AAE5C","ignoreList":[]}
+{"version":3,"names":["React","useLatestCallback","FocusedRouteKeyContext","IsFocusedContext","IsFocusedGetterContext","useLazyValue","NamedNavigationStateListenerProvider","jsx","_jsx","NavigationRouteContext","createContext","undefined","NavigationContext","IsScreenContext","NamedRouteContextListContext","NavigationProvider","route","navigation","children","NamedRouteContext","parents","use","NamedRouteContextList","useMemo","name","parentIsFocused","focusedRouteKey","isFocused","key","getIsFocused","Provider","value"],"sourceRoot":"../../src","sources":["NavigationProvider.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,OAAOC,iBAAiB,MAAM,qBAAqB;AAGnD,SACEC,sBAAsB,EACtBC,gBAAgB,EAChBC,sBAAsB,QACjB,mBAAgB;AACvB,SAASC,YAAY,QAAQ,mBAAgB;AAC7C,SAASC,oCAAoC,QAAQ,yBAAsB;;AAE3E;AACA;AACA;AAFA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,sBAAsB,gBAAGT,KAAK,CAACU,aAAa,CAEvDC,SAAS,CAAC;;AAEZ;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,gBAAGZ,KAAK,CAACU,aAAa,CAElDC,SAAS,CAAC;;AAEZ;AACA;AACA;AACA,OAAO,MAAME,eAAe,gBAAGb,KAAK,CAACU,aAAa,CAAC,KAAK,CAAC;;AAEzD;AACA;AACA;AACA,OAAO,MAAMI,4BAA4B,gBAAGd,KAAK,CAACU,aAAa,CAE7DC,SAAS,CAAC;AAQZ,OAAO,SAASI,kBAAkBA,CAAC;EAAEC,KAAK;EAAEC,UAAU;EAAEC;AAAgB,CAAC,EAAE;EACzE,MAAMC,iBAAiB,GAAGd,YAAY,CAAC,mBAAML,KAAK,CAACU,aAAa,CAACM,KAAK,CAAC,CAAC;EAExE,MAAMI,OAAO,GAAGpB,KAAK,CAACqB,GAAG,CAACP,4BAA4B,CAAC;EAEvD,MAAMQ,qBAAqB,GAAGtB,KAAK,CAACuB,OAAO,CACzC,OAAO;IACL,GAAGH,OAAO;IACV,CAACJ,KAAK,CAACQ,IAAI,GAAGL;EAChB,CAAC,CAAC,EACF,CAACA,iBAAiB,EAAEC,OAAO,EAAEJ,KAAK,CAACQ,IAAI,CACzC,CAAC;EAED,MAAMC,eAAe,GAAGzB,KAAK,CAACqB,GAAG,CAAClB,gBAAgB,CAAC;EACnD,MAAMuB,eAAe,GAAG1B,KAAK,CAACqB,GAAG,CAACnB,sBAAsB,CAAC;;EAEzD;EACA;EACA;EACA,MAAMyB,SAAS,GACbF,eAAe,IAAI,IAAI,IAAIA,eAAe,GACtCC,eAAe,KAAKV,KAAK,CAACY,GAAG,GAC7B,KAAK;EAEX,MAAMC,YAAY,GAAG5B,iBAAiB,CAAC,MAAM0B,SAAS,CAAC;EAEvD,OAAO3B,KAAK,CAACuB,OAAO,CAClB,mBACEf,IAAA,CAACF,oCAAoC;IAACkB,IAAI,EAAER,KAAK,CAACQ,IAAK;IAAAN,QAAA,eACrDV,IAAA,CAACM,4BAA4B,CAACgB,QAAQ;MAACC,KAAK,EAAET,qBAAsB;MAAAJ,QAAA,eAClEV,IAAA,CAACW,iBAAiB,CAACW,QAAQ;QAACC,KAAK,EAAEf,KAAM;QAAAE,QAAA,eACvCV,IAAA,CAACC,sBAAsB,CAACqB,QAAQ;UAACC,KAAK,EAAEf,KAAM;UAAAE,QAAA,eAC5CV,IAAA,CAACI,iBAAiB,CAACkB,QAAQ;YAACC,KAAK,EAAEd,UAAW;YAAAC,QAAA,eAC5CV,IAAA,CAACL,gBAAgB,CAAC2B,QAAQ;cAACC,KAAK,EAAEJ,SAAU;cAAAT,QAAA,eAC1CV,IAAA,CAACJ,sBAAsB,CAAC0B,QAAQ;gBAACC,KAAK,EAAEF,YAAa;gBAAAX,QAAA,eACnDV,IAAA,CAACK,eAAe,CAACiB,QAAQ;kBAACC,KAAK,EAAE,IAAK;kBAAAb,QAAA,EACnCA;gBAAQ,CACe;cAAC,CACI;YAAC,CACT;UAAC,CACF;QAAC,CACE;MAAC,CACR;IAAC,CACQ;EAAC,CACJ,CACvC,EACD,CACEC,iBAAiB,EACjBG,qBAAqB,EACrBJ,QAAQ,EACRW,YAAY,EACZF,SAAS,EACTV,UAAU,EACVD,KAAK,CAET,CAAC;AACH","ignoreList":[]}

package/lib/module/NavigationRootContext.js

@@ -0,0 +1,8 @@
+"use strict";
+
+import * as React from 'react';
+/**
+ * Context which holds the navigation object for components outside a screen.
+ */
+export const NavigationRootContext = /*#__PURE__*/React.createContext(undefined);
+//# sourceMappingURL=NavigationRootContext.js.map

package/lib/module/NavigationRootContext.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","NavigationRootContext","createContext","undefined"],"sourceRoot":"../../src","sources":["NavigationRootContext.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAI9B;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,gBAAGD,KAAK,CAACE,aAAa,CAEtDC,SAAS,CAAC","ignoreList":[]}

package/lib/module/NavigationStateContext.js

@@ -16,6 +16,9 @@ export const NavigationStateContext = /*#__PURE__*/React.createContext({
   get setState() {
     throw new Error(MISSING_CONTEXT_ERROR);
   },
+  get subscribe() {
+    throw new Error(MISSING_CONTEXT_ERROR);
+  },
   get getIsInitial() {
     throw new Error(MISSING_CONTEXT_ERROR);
   }

package/lib/module/NavigationStateContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","MISSING_CONTEXT_ERROR","NavigationStateContext","createContext","isDefault","getKey","Error","setKey","getState","setState","getIsInitial"],"sourceRoot":"../../src","sources":["NavigationStateContext.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,MAAMC,qBAAqB,GACzB,wKAAwK;AAE1K,OAAO,MAAMC,sBAAsB,gBAAGF,KAAK,CAACG,aAAa,CActD;EACDC,SAAS,EAAE,IAAI;EAEf,IAAIC,MAAMA,CAAA,EAAQ;IAChB,MAAM,IAAIC,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIM,MAAMA,CAAA,EAAQ;IAChB,MAAM,IAAID,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIO,QAAQA,CAAA,EAAQ;IAClB,MAAM,IAAIF,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIQ,QAAQA,CAAA,EAAQ;IAClB,MAAM,IAAIH,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIS,YAAYA,CAAA,EAAQ;IACtB,MAAM,IAAIJ,KAAK,CAACL,qBAAqB,CAAC;EACxC;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","MISSING_CONTEXT_ERROR","NavigationStateContext","createContext","isDefault","getKey","Error","setKey","getState","setState","subscribe","getIsInitial"],"sourceRoot":"../../src","sources":["NavigationStateContext.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,MAAMC,qBAAqB,GACzB,wKAAwK;AAE1K,OAAO,MAAMC,sBAAsB,gBAAGF,KAAK,CAACG,aAAa,CAWtD;EACDC,SAAS,EAAE,IAAI;EAEf,IAAIC,MAAMA,CAAA,EAAQ;IAChB,MAAM,IAAIC,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIM,MAAMA,CAAA,EAAQ;IAChB,MAAM,IAAID,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIO,QAAQA,CAAA,EAAQ;IAClB,MAAM,IAAIF,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIQ,QAAQA,CAAA,EAAQ;IAClB,MAAM,IAAIH,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIS,SAASA,CAAA,EAAQ;IACnB,MAAM,IAAIJ,KAAK,CAACL,qBAAqB,CAAC;EACxC,CAAC;EACD,IAAIU,YAAYA,CAAA,EAAQ;IACtB,MAAM,IAAIL,KAAK,CAACL,qBAAqB,CAAC;EACxC;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/PreventRemoveContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","PreventRemoveContext","createContext","undefined"],"sourceRoot":"../../src","sources":["PreventRemoveContext.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;;AAE9B;AACA;AACA;AACA;;AAGA,OAAO,MAAMC,oBAAoB,gBAAGD,KAAK,CAACE,aAAa,CAUrDC,SAAS,CAAC","ignoreList":[]}
+{"version":3,"names":["React","PreventRemoveContext","createContext","undefined"],"sourceRoot":"../../src","sources":["PreventRemoveContext.tsx"],"mappings":";;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;;AAE9B;AACA;AACA;AACA;;AAGA,OAAO,MAAMC,oBAAoB,gBAAGD,KAAK,CAACE,aAAa,CAWrDC,SAAS,CAAC","ignoreList":[]}

package/lib/module/PreventRemoveProvider.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import { nanoid } from 'nanoid/non-secure';
 import * as React from 'react';
 import useLatestCallback from 'use-latest-callback';
 import { NavigationHelpersContext } from "./NavigationHelpersContext.js";
@@ -11,16 +10,12 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * Util function to transform map of prevented routes to a simpler object.
  */
 const transformPreventedRoutes = preventedRoutesMap => {
-  const preventedRoutesToTransform = [...preventedRoutesMap.values()];
-  const preventedRoutes = preventedRoutesToTransform.reduce((acc, {
-    routeKey,
-    preventRemove
-  }) => {
-    acc[routeKey] = {
-      preventRemove: acc[routeKey]?.preventRemove || preventRemove
+  const preventedRoutes = {};
+  for (const routeKey of preventedRoutesMap.values()) {
+    preventedRoutes[routeKey] = {
+      preventRemove: true
     };
-    return acc;
-  }, {});
+  }
   return preventedRoutes;
 };
 
@@ -30,38 +25,51 @@ const transformPreventedRoutes = preventedRoutesMap => {
 export function PreventRemoveProvider({
   children
 }) {
-  const [parentId] = React.useState(() => nanoid());
+  const parentId = React.useId();
   const [preventedRoutesMap, setPreventedRoutesMap] = React.useState(() => new Map());
-  const navigation = React.useContext(NavigationHelpersContext);
-  const route = React.useContext(NavigationRouteContext);
-  const preventRemoveContextValue = React.useContext(PreventRemoveContext);
+  const registry = React.useRef(new Map());
+  const navigation = React.use(NavigationHelpersContext);
+  const route = React.use(NavigationRouteContext);
+  const preventRemoveContextValue = React.use(PreventRemoveContext);
   // take `setPreventRemove` from parent context - if exist it means we're in a nested context
   const setParentPrevented = preventRemoveContextValue?.setPreventRemove;
+  const notifyParentPrevented = preventRemoveContextValue?.notifyPreventRemove;
   const setPreventRemove = useLatestCallback((id, routeKey, preventRemove) => {
-    if (preventRemove && (navigation == null || navigation?.getState().routes.every(route => route.key !== routeKey))) {
-      throw new Error(`Couldn't find a route with the key ${routeKey}. Is your component inside NavigationContent?`);
+    if (preventRemove && navigation == null) {
+      throw new Error("Couldn't find a navigation object. This is likely a bug in the navigator.\n\nIf you're using a custom navigator, make sure that the navigator content is wrapped by the 'render' function returned by 'useNavigationBuilder'.");
     }
+    if (preventRemove) {
+      registry.current.set(id, routeKey);
+    } else {
+      registry.current.delete(id);
+    }
+  });
+  const notifyPreventRemove = useLatestCallback(() => {
+    // eslint-disable-next-line @eslint-react/hooks-extra/no-direct-set-state-in-use-effect
     setPreventedRoutesMap(prevPrevented => {
+      const nextPrevented = registry.current;
+      const hasChanged = prevPrevented.size !== nextPrevented.size || [...nextPrevented].some(([id, routeKey]) => prevPrevented.get(id) !== routeKey);
+
       // values haven't changed - do nothing
-      if (routeKey === prevPrevented.get(id)?.routeKey && preventRemove === prevPrevented.get(id)?.preventRemove) {
+      if (!hasChanged) {
         return prevPrevented;
       }
-      const nextPrevented = new Map(prevPrevented);
-      if (preventRemove) {
-        nextPrevented.set(id, {
-          routeKey,
-          preventRemove
-        });
-      } else {
-        nextPrevented.delete(id);
-      }
-      return nextPrevented;
+      return new Map(nextPrevented);
     });
   });
-  const isPrevented = [...preventedRoutesMap.values()].some(({
-    preventRemove
-  }) => preventRemove);
+
+  // Sync the state on every commit in case the registry was changed by a screen
+  // unmounting while hidden with `<Activity>`, where no passive effects run
+  // Also notify the parent so nested prevention propagates upwards
   React.useEffect(() => {
+    notifyPreventRemove();
+    notifyParentPrevented?.();
+    return () => {
+      notifyParentPrevented?.();
+    };
+  });
+  const isPrevented = preventedRoutesMap.size > 0;
+  React.useInsertionEffect(() => {
     if (route?.key !== undefined && setParentPrevented !== undefined) {
       // when route is defined (and setParentPrevented) it means we're in a nested stack
       // route.key then will be the route key of parent
@@ -74,8 +82,9 @@ export function PreventRemoveProvider({
   }, [parentId, isPrevented, route?.key, setParentPrevented]);
   const value = React.useMemo(() => ({
     setPreventRemove,
+    notifyPreventRemove,
     preventedRoutes: transformPreventedRoutes(preventedRoutesMap)
-  }), [setPreventRemove, preventedRoutesMap]);
+  }), [setPreventRemove, notifyPreventRemove, preventedRoutesMap]);
   return /*#__PURE__*/_jsx(PreventRemoveContext.Provider, {
     value: value,
     children: children

package/lib/module/PreventRemoveProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["nanoid","React","useLatestCallback","NavigationHelpersContext","NavigationRouteContext","PreventRemoveContext","jsx","_jsx","transformPreventedRoutes","preventedRoutesMap","preventedRoutesToTransform","values","preventedRoutes","reduce","acc","routeKey","preventRemove","PreventRemoveProvider","children","parentId","useState","setPreventedRoutesMap","Map","navigation","useContext","route","preventRemoveContextValue","setParentPrevented","setPreventRemove","id","getState","routes","every","key","Error","prevPrevented","get","nextPrevented","set","delete","isPrevented","some","useEffect","undefined","value","useMemo","Provider"],"sourceRoot":"../../src","sources":["PreventRemoveProvider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useLatestCallback","NavigationHelpersContext","NavigationRouteContext","PreventRemoveContext","jsx","_jsx","transformPreventedRoutes","preventedRoutesMap","preventedRoutes","routeKey","values","preventRemove","PreventRemoveProvider","children","parentId","useId","setPreventedRoutesMap","useState","Map","registry","useRef","navigation","use","route","preventRemoveContextValue","setParentPrevented","setPreventRemove","notifyParentPrevented","notifyPreventRemove","id","Error","current","set","delete","prevPrevented","nextPrevented","hasChanged","size","some","get","useEffect","isPrevented","useInsertionEffect","key","undefined","value","useMemo","Provider"],"sourceRoot":"../../src","sources":["PreventRemoveProvider.tsx"],"mappings":"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","ignoreList":[]}