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

package/lib/module/useNavigationState.js

@@ -1,9 +1,6 @@
 "use strict";
 
 import * as React from 'react';
-import useLatestCallback from 'use-latest-callback';
-import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/with-selector';
-import { useNavigation } from "./useNavigation.js";
 
 /**
  * Hook to get a value from the current navigation state using a selector.
@@ -15,66 +12,181 @@ import { useNavigation } from "./useNavigation.js";
  */
 import { jsx as _jsx } from "react/jsx-runtime";
 export function useNavigationState(...args) {
-  let navigation, stateListener, selector;
+  const selector = typeof args[0] === 'string' ? args[1] : args[0];
+  if (typeof selector !== 'function') {
+    throw new Error(`A selector function must be provided (got ${typeof selector}).`);
+  }
+
+  // @ts-expect-error: the public overloads guarantee the selector's type, but
+  // the `unknown[]` implementation signature can't express it
+  const select = selector;
+  let listener;
   if (typeof args[0] === 'string') {
-    // `useNavigation` uses `use` internally, so it's fine to call it conditionally
-    // @ts-expect-error we can't specify the type here
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    navigation = useNavigation(args[0]);
-    selector = args[1];
+    const name = args[0];
+    const listeners = React.use(NamedNavigationStateListenerListContext);
+    listener = listeners?.[name];
+    if (listener == null) {
+      throw new Error(`Couldn't find a navigator for the route '${name}' in any of the parent screens. Is your component inside the correct screen?`);
+    }
   } else {
-    selector = args[0];
-  }
-  if (navigation == null) {
-    stateListener = React.use(NavigationStateListenerContext);
-    if (stateListener == null) {
+    listener = React.use(NavigationStateListenerContext);
+    if (listener == null) {
       throw new Error("Couldn't get the navigation state. Is your component inside a navigator?");
     }
   }
-  const subscribe = React.useCallback(callback => {
-    if (navigation) {
-      return navigation.addListener('state', callback);
-    } else if (stateListener) {
-      return stateListener.subscribe(callback);
-    } else {
-      throw new Error("Couldn't subscribe to navigation state changes. This is not expected.");
+  const {
+    getState,
+    getSnapshot,
+    subscribe
+  } = listener;
+  const initialRef = React.useRef(true);
+
+  // We read the initial state from context on mount instead of using getState
+  // This ensures that we get proper state for the current render,
+  // even if the external store has been updated.
+  // We conditionally use `use` to avoid more unnecessary re-renders after first mount.
+  // The context subscription is removed on the next render, which can cause one extra render.
+  const initialState = initialRef.current ? React.use(listener.initialStateContext) : undefined;
+
+  // We track the last committed reducer entry, navigation state, and selector,
+  // so we can check if an update changes the value the component last committed.
+  const committedRef = React.useRef({
+    entry: null,
+    state: initialState ?? getSnapshot(),
+    select
+  });
+
+  // The store can contain state from a transition that hasn't committed yet.
+  // Reading it during render can show state that doesn't match the navigator in that render.
+  // The reducer lets React process state in the same render lane as the navigator.
+  const [entry, dispatch] = React.useReducer((previous, event) => {
+    // Navigation state can change between the dispatch and the reducer running.
+    // Reading here ensures the processed event uses the state for that render.
+    const state = event === 'update' ? getState() : getSnapshot();
+
+    // If we're processing the same reducer entry as the last commit,
+    // we compare against the state last committed by the component.
+    // We keep the reducer entry to avoid re-renders for unchanged selections.
+    // This means the reducer entry can still hold older navigation state.
+    // If a parent causes another render,
+    // we use the latest snapshot so the selector doesn't read stale state.
+    // We leave the reducer entry unchanged to avoid an extra render.
+    // We save that snapshot in committedRef when the render commits,
+    // so later updates compare against the state we actually rendered,
+    // including when the selector changed.
+    // If the reducer entry is different, we use its own navigation state,
+    // so comparisons include updates already processed in the pending render.
+    const previousState = previous === committedRef.current.entry ? committedRef.current.state : previous.state;
+    if (previous.listener === listener && (previousState === state || event === 'update' && Object.is(select(previousState), select(state)))) {
+      return previous;
     }
-  }, [navigation, stateListener]);
-  const getSnapshot = navigation ? navigation.getState : stateListener?.getState;
-  if (getSnapshot == null) {
-    throw new Error("Couldn't get the navigation state. This is not expected.");
-  }
-  if (typeof selector !== 'function') {
-    throw new Error(`A selector function must be provided (got ${typeof selector}).`);
-  }
-  const value = useSyncExternalStoreWithSelector(subscribe, getSnapshot, getSnapshot,
-  // @ts-expect-error we can't infer the type here
-  selector);
-  return value;
+    return {
+      listener,
+      state
+    };
+  }, undefined, () => ({
+    listener,
+    state: initialState ?? getSnapshot()
+  }));
+  const state =
+  // A different listener means the state belongs to another navigator.
+  // This can happen when the passed route name changes.
+  entry.listener !== listener ||
+  // An entry that advanced past the last commit is at least as new as the snapshot.
+  // An entry that didn't advance while the committed state changed is older.
+  entry === committedRef.current.entry ? getSnapshot() : entry.state;
+  React.useInsertionEffect(() => {
+    initialRef.current = false;
+    committedRef.current = {
+      entry,
+      state,
+      select
+    };
+  });
+  React.useLayoutEffect(() => {
+    const check = event => {
+      const {
+        state,
+        select
+      } = committedRef.current;
+
+      // An 'update' event follows the latest state in the lane the update was made in.
+      // A 'commit' event syncs the reducer to the state committed by the navigator.
+      const target = event === 'update' ? getState() : getSnapshot();
+      if (state !== target && !Object.is(select(state), select(target))) {
+        dispatch(event);
+      }
+    };
+    const unsubscribe = subscribe(check);
+
+    // The reducer may not match the committed state when the subscription starts.
+    // This happens on mount during a transition or an update before subscribing.
+    check('commit');
+    return unsubscribe;
+  }, [getState, getSnapshot, subscribe]);
+  return select(state);
 }
 export function NavigationStateListenerProvider({
+  isSynced,
   state,
+  getState,
+  subscribe,
   children
 }) {
-  const listeners = React.useRef([]);
-  const getState = useLatestCallback(() => state);
-  const subscribe = useLatestCallback(callback => {
-    listeners.current.push(callback);
-    return () => {
-      listeners.current = listeners.current.filter(cb => cb !== callback);
-    };
-  });
-  React.useEffect(() => {
-    listeners.current.forEach(callback => callback());
+  const [InitialStateContext] = React.useState(() => /*#__PURE__*/React.createContext(state));
+  const [listeners] = React.useState(() => new Set());
+  React.useLayoutEffect(() => {
+    listeners.forEach(listener => listener('commit'));
+  }, [listeners, state]);
+  const snapshotRef = React.useRef(state);
+  React.useInsertionEffect(() => {
+    snapshotRef.current = state;
   }, [state]);
+
+  // Route config or nested params can produce new state during render.
+  // If the scheduled update hasn't synced that state to the store yet,
+  // We need to expose the rendered state so consumers match the navigator.
+  // We keep this `undefined` for other scenarios, so the context isn't recreated.
+  const nextState = isSynced ? undefined : state;
   const context = React.useMemo(() => ({
+    initialStateContext: InitialStateContext,
     getState,
-    subscribe
-  }), [getState, subscribe]);
+    getSnapshot: () => nextState ?? snapshotRef.current,
+    subscribe: callback => {
+      const unsubscribe = subscribe(() => callback('update'));
+      listeners.add(callback);
+      return () => {
+        listeners.delete(callback);
+        unsubscribe();
+      };
+    }
+  }), [InitialStateContext, getState, listeners, nextState, subscribe]);
   return /*#__PURE__*/_jsx(NavigationStateListenerContext.Provider, {
     value: context,
+    children: /*#__PURE__*/_jsx(InitialStateContext.Provider, {
+      value: state,
+      children: children
+    })
+  });
+}
+export function NamedNavigationStateListenerProvider({
+  name,
+  children
+}) {
+  const listener = React.use(NavigationStateListenerContext);
+  if (listener == null) {
+    throw new Error("Couldn't find a navigation state listener. 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'.");
+  }
+  const parents = React.use(NamedNavigationStateListenerListContext);
+  const listeners = React.useMemo(() => ({
+    ...parents,
+    [name]: listener
+  }), [listener, name, parents]);
+  return /*#__PURE__*/_jsx(NamedNavigationStateListenerListContext.Provider, {
+    value: listeners,
     children: children
   });
 }
-const NavigationStateListenerContext = /*#__PURE__*/React.createContext(undefined);
+export const NavigationStateListenerContext = /*#__PURE__*/React.createContext(undefined);
+export const NamedNavigationStateListenerListContext = /*#__PURE__*/React.createContext(undefined);
 //# sourceMappingURL=useNavigationState.js.map

package/lib/module/useNavigationState.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useLatestCallback","useSyncExternalStoreWithSelector","useNavigation","jsx","_jsx","useNavigationState","args","navigation","stateListener","selector","use","NavigationStateListenerContext","Error","subscribe","useCallback","callback","addListener","getSnapshot","getState","value","NavigationStateListenerProvider","state","children","listeners","useRef","current","push","filter","cb","useEffect","forEach","context","useMemo","Provider","createContext","undefined"],"sourceRoot":"../../src","sources":["useNavigationState.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","jsx","_jsx","useNavigationState","args","selector","Error","select","listener","name","listeners","use","NamedNavigationStateListenerListContext","NavigationStateListenerContext","getState","getSnapshot","subscribe","initialRef","useRef","initialState","current","initialStateContext","undefined","committedRef","entry","state","dispatch","useReducer","previous","event","previousState","Object","is","useInsertionEffect","useLayoutEffect","check","target","unsubscribe","NavigationStateListenerProvider","isSynced","children","InitialStateContext","useState","createContext","Set","forEach","snapshotRef","nextState","context","useMemo","callback","add","delete","Provider","value","NamedNavigationStateListenerProvider","parents"],"sourceRoot":"../../src","sources":["useNavigationState.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/useOnAction.js

@@ -1,7 +1,10 @@
 "use strict";
 
 import * as React from 'react';
-import { NavigationBuilderContext } from "./NavigationBuilderContext.js";
+import { ConsumedParamsContext } from "./ConsumedParamsContext.js";
+import { getLoaderForStateChange } from "./DataLoading.js";
+import { useNavigationBuilderContext } from "./NavigationBuilderContext.js";
+import { StaticTreeContext } from "./StaticTreeContext.js";
 import { shouldPreventRemove, useOnPreventRemove } from "./useOnPreventRemove.js";
 /**
  * Hook to handle actions for a navigator, including state updates and bubbling.
@@ -26,13 +29,20 @@ export function useOnAction({
     onAction: onActionParent,
     onRouteFocus: onRouteFocusParent,
     addListener: addListenerParent,
-    onDispatchAction
-  } = React.useContext(NavigationBuilderContext);
+    onDispatchAction,
+    flushUpdates
+  } = useNavigationBuilderContext();
+  const tree = React.use(StaticTreeContext);
+  const consumedParams = React.use(ConsumedParamsContext);
   const routerConfigOptionsRef = React.useRef(routerConfigOptions);
-  React.useEffect(() => {
+  React.useInsertionEffect(() => {
     routerConfigOptionsRef.current = routerConfigOptions;
   });
   const onAction = React.useCallback((action, visitedNavigators = new Set()) => {
+    // Apply any pending state updates scheduled during render before handling the action
+    // Otherwise the action will be handled with an outdated state,
+    // and the pending updates will overwrite the changes from the action
+    flushUpdates();
     const state = getState();
 
     // Since actions can bubble both up and down, they could come to the same navigator again
@@ -45,16 +55,38 @@ export function useOnAction({
       let result = router.getStateForAction(state, action, routerConfigOptionsRef.current);
 
       // If a target is specified and set to current navigator, the action shouldn't bubble
-      // So instead of `null`, we use the state object for such cases to signal that action was handled
-      result = result === null && action.target === state.key ? state : result;
+      // So we immediately return `false` to mark it as unhandled
+      if (result === null && action.target === state.key) {
+        return false;
+      }
+      if (result !== null && result.stale !== false) {
+        // Some actions (e.g. `RESET`) may return a stale state from the router
+        // We rehydrate it before storing so the stored state is always usable
+        // Otherwise anything reading the state before the next render
+        // (e.g. another dispatch immediately after) would get an outdated state
+        result = router.getRehydratedState(result, routerConfigOptionsRef.current);
+      }
       if (result !== null) {
-        onDispatchAction(action, state === result);
         if (state !== result) {
           const isPrevented = shouldPreventRemove(emitter, beforeRemoveListeners, state.routes, result.routes, action);
           if (isPrevented) {
+            onDispatchAction(action, true);
             return true;
           }
+          if (getState() !== state) {
+            // Listeners for 'beforeRemove' may dispatch actions that change the state
+            // Then the result we have is outdated and would overwrite those changes
+            // So we handle the action again to calculate the result with the latest state
+            return onAction(action, new Set());
+          }
+          onDispatchAction(action, false);
+          if (tree) {
+            const loader = getLoaderForStateChange(tree, result, state, consumedParams);
+            loader?.();
+          }
           setState(result);
+        } else {
+          onDispatchAction(action, true);
         }
         if (onRouteFocusParent !== undefined) {
           // Some actions such as `NAVIGATE` also want to bring the navigated route to focus in the whole tree
@@ -67,29 +99,44 @@ export function useOnAction({
         return true;
       }
     }
+    const isSourceInCurrentNavigator = action.source !== undefined && state.routes.some(r => r.key === action.source);
     if (onActionParent !== undefined) {
       // Bubble action to the parent if the current navigator didn't handle it
-      if (onActionParent(action, visitedNavigators)) {
+      const parentAction = isSourceInCurrentNavigator && key !== undefined ? {
+        ...action,
+        // If the `source` belonged to the current navigator,
+        // rewrite the `source` to the parent screen's key when bubbling
+        // This will let parent handle it relative to the child that dispatched the action
+        source: key
+      } : action;
+      if (onActionParent(parentAction, visitedNavigators)) {
         return true;
       }
     }
     if (typeof action.target === 'string') {
       // If the action wasn't handled by current navigator or a parent navigator, let children handle it
+      const childAction = isSourceInCurrentNavigator ? {
+        ...action,
+        // If the `source` belonged to the current navigator,
+        // remove it when targeting a child navigator
+        // So child navigators can handle it based on the focused screen
+        source: undefined
+      } : action;
       for (let i = actionListeners.length - 1; i >= 0; i--) {
         const listener = actionListeners[i];
-        if (listener(action, visitedNavigators)) {
+        if (listener?.(childAction, visitedNavigators)) {
           return true;
         }
       }
     }
     return false;
-  }, [actionListeners, beforeRemoveListeners, emitter, getState, key, onActionParent, onDispatchAction, onRouteFocusParent, router, setState]);
+  }, [actionListeners, beforeRemoveListeners, consumedParams, emitter, flushUpdates, getState, key, onActionParent, onDispatchAction, onRouteFocusParent, router, setState, tree]);
   useOnPreventRemove({
     getState,
     emitter,
     beforeRemoveListeners
   });
-  React.useEffect(() => addListenerParent?.('action', onAction), [addListenerParent, onAction]);
+  React.useInsertionEffect(() => addListenerParent?.('action', onAction), [addListenerParent, onAction]);
   return onAction;
 }
 //# sourceMappingURL=useOnAction.js.map

package/lib/module/useOnAction.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","NavigationBuilderContext","shouldPreventRemove","useOnPreventRemove","useOnAction","router","getState","setState","key","actionListeners","beforeRemoveListeners","routerConfigOptions","emitter","onAction","onActionParent","onRouteFocus","onRouteFocusParent","addListener","addListenerParent","onDispatchAction","useContext","routerConfigOptionsRef","useRef","useEffect","current","useCallback","action","visitedNavigators","Set","state","has","add","target","result","getStateForAction","isPrevented","routes","undefined","shouldFocus","shouldActionChangeFocus","i","length","listener"],"sourceRoot":"../../src","sources":["useOnAction.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","ConsumedParamsContext","getLoaderForStateChange","useNavigationBuilderContext","StaticTreeContext","shouldPreventRemove","useOnPreventRemove","useOnAction","router","getState","setState","key","actionListeners","beforeRemoveListeners","routerConfigOptions","emitter","onAction","onActionParent","onRouteFocus","onRouteFocusParent","addListener","addListenerParent","onDispatchAction","flushUpdates","tree","use","consumedParams","routerConfigOptionsRef","useRef","useInsertionEffect","current","useCallback","action","visitedNavigators","Set","state","has","add","target","result","getStateForAction","stale","getRehydratedState","isPrevented","routes","loader","undefined","shouldFocus","shouldActionChangeFocus","isSourceInCurrentNavigator","source","some","r","parentAction","childAction","i","length","listener"],"sourceRoot":"../../src","sources":["useOnAction.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/useOnGetNavigation.js

@@ -0,0 +1,26 @@
+"use strict";
+
+import * as React from 'react';
+import { useNavigationBuilderContext } from "./NavigationBuilderContext.js";
+import { NavigationRouteContext } from "./NavigationProvider.js";
+/**
+ * Hook which lets the container access the navigation object of the root navigator.
+ * It's used for the navigation object returned by `useNavigation` outside a screen.
+ */
+export function useOnGetNavigation({
+  navigation
+}) {
+  const {
+    addKeyedListener
+  } = useNavigationBuilderContext();
+  const route = React.use(NavigationRouteContext);
+  React.useInsertionEffect(() => {
+    // We only register if this is the root navigator
+    // i.e. there is no parent route
+    if (route != null) {
+      return;
+    }
+    return addKeyedListener?.('getNavigation', 'root', () => navigation);
+  }, [addKeyedListener, navigation, route]);
+}
+//# sourceMappingURL=useOnGetNavigation.js.map

package/lib/module/useOnGetNavigation.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","useNavigationBuilderContext","NavigationRouteContext","useOnGetNavigation","navigation","addKeyedListener","route","use","useInsertionEffect"],"sourceRoot":"../../src","sources":["useOnGetNavigation.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,2BAA2B,QAAQ,+BAA4B;AACxE,SAASC,sBAAsB,QAAQ,yBAAsB;AAO7D;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAAC;EAAEC;AAAoB,CAAC,EAAE;EAC1D,MAAM;IAAEC;EAAiB,CAAC,GAAGJ,2BAA2B,CAAC,CAAC;EAE1D,MAAMK,KAAK,GAAGN,KAAK,CAACO,GAAG,CAACL,sBAAsB,CAAC;EAE/CF,KAAK,CAACQ,kBAAkB,CAAC,MAAM;IAC7B;IACA;IACA,IAAIF,KAAK,IAAI,IAAI,EAAE;MACjB;IACF;IAEA,OAAOD,gBAAgB,GAAG,eAAe,EAAE,MAAM,EAAE,MAAMD,UAAU,CAAC;EACtE,CAAC,EAAE,CAACC,gBAAgB,EAAED,UAAU,EAAEE,KAAK,CAAC,CAAC;AAC3C","ignoreList":[]}

package/lib/module/useOnGetState.js

@@ -2,7 +2,7 @@
 
 import * as React from 'react';
 import { isArrayEqual } from "./isArrayEqual.js";
-import { NavigationBuilderContext } from "./NavigationBuilderContext.js";
+import { useNavigationBuilderContext } from "./NavigationBuilderContext.js";
 import { NavigationRouteContext } from "./NavigationProvider.js";
 export function useOnGetState({
   getState,
@@ -10,8 +10,8 @@ export function useOnGetState({
 }) {
   const {
     addKeyedListener
-  } = React.useContext(NavigationBuilderContext);
-  const route = React.useContext(NavigationRouteContext);
+  } = useNavigationBuilderContext();
+  const route = React.use(NavigationRouteContext);
   const key = route ? route.key : 'root';
   const getRehydratedState = React.useCallback(() => {
     const state = getState();
@@ -35,7 +35,10 @@ export function useOnGetState({
       routes
     };
   }, [getState, getStateListeners]);
-  React.useEffect(() => {
+
+  // Use insertion effect to preserve the listener under `<Activity mode="hidden">`
+  // So `getRootState` will still return state of nested navigators
+  React.useInsertionEffect(() => {
     return addKeyedListener?.('getState', key, getRehydratedState);
   }, [addKeyedListener, getRehydratedState, key]);
 }

package/lib/module/useOnGetState.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","isArrayEqual","NavigationBuilderContext","NavigationRouteContext","useOnGetState","getState","getStateListeners","addKeyedListener","useContext","route","key","getRehydratedState","useCallback","state","routes","map","childState","useEffect"],"sourceRoot":"../../src","sources":["useOnGetState.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,YAAY,QAAQ,mBAAgB;AAC7C,SAEEC,wBAAwB,QACnB,+BAA4B;AACnC,SAASC,sBAAsB,QAAQ,yBAAsB;AAO7D,OAAO,SAASC,aAAaA,CAAC;EAAEC,QAAQ;EAAEC;AAA2B,CAAC,EAAE;EACtE,MAAM;IAAEC;EAAiB,CAAC,GAAGP,KAAK,CAACQ,UAAU,CAACN,wBAAwB,CAAC;EACvE,MAAMO,KAAK,GAAGT,KAAK,CAACQ,UAAU,CAACL,sBAAsB,CAAC;EACtD,MAAMO,GAAG,GAAGD,KAAK,GAAGA,KAAK,CAACC,GAAG,GAAG,MAAM;EAEtC,MAAMC,kBAAkB,GAAGX,KAAK,CAACY,WAAW,CAAC,MAAM;IACjD,MAAMC,KAAK,GAAGR,QAAQ,CAAC,CAAC;;IAExB;IACA,MAAMS,MAAM,GAAGD,KAAK,CAACC,MAAM,CAACC,GAAG,CAAEN,KAAK,IAAK;MACzC,MAAMO,UAAU,GAAGV,iBAAiB,CAACG,KAAK,CAACC,GAAG,CAAC,GAAG,CAAC;MAEnD,IAAID,KAAK,CAACI,KAAK,KAAKG,UAAU,EAAE;QAC9B,OAAOP,KAAK;MACd;MAEA,OAAO;QAAE,GAAGA,KAAK;QAAEI,KAAK,EAAEG;MAAW,CAAC;IACxC,CAAC,CAAC;IAEF,IAAIf,YAAY,CAACY,KAAK,CAACC,MAAM,EAAEA,MAAM,CAAC,EAAE;MACtC,OAAOD,KAAK;IACd;IAEA,OAAO;MAAE,GAAGA,KAAK;MAAEC;IAAO,CAAC;EAC7B,CAAC,EAAE,CAACT,QAAQ,EAAEC,iBAAiB,CAAC,CAAC;EAEjCN,KAAK,CAACiB,SAAS,CAAC,MAAM;IACpB,OAAOV,gBAAgB,GAAG,UAAU,EAAEG,GAAG,EAAEC,kBAAkB,CAAC;EAChE,CAAC,EAAE,CAACJ,gBAAgB,EAAEI,kBAAkB,EAAED,GAAG,CAAC,CAAC;AACjD","ignoreList":[]}
+{"version":3,"names":["React","isArrayEqual","useNavigationBuilderContext","NavigationRouteContext","useOnGetState","getState","getStateListeners","addKeyedListener","route","use","key","getRehydratedState","useCallback","state","routes","map","childState","useInsertionEffect"],"sourceRoot":"../../src","sources":["useOnGetState.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,YAAY,QAAQ,mBAAgB;AAC7C,SAEEC,2BAA2B,QACtB,+BAA4B;AACnC,SAASC,sBAAsB,QAAQ,yBAAsB;AAO7D,OAAO,SAASC,aAAaA,CAAC;EAAEC,QAAQ;EAAEC;AAA2B,CAAC,EAAE;EACtE,MAAM;IAAEC;EAAiB,CAAC,GAAGL,2BAA2B,CAAC,CAAC;EAE1D,MAAMM,KAAK,GAAGR,KAAK,CAACS,GAAG,CAACN,sBAAsB,CAAC;EAE/C,MAAMO,GAAG,GAAGF,KAAK,GAAGA,KAAK,CAACE,GAAG,GAAG,MAAM;EAEtC,MAAMC,kBAAkB,GAAGX,KAAK,CAACY,WAAW,CAAC,MAAM;IACjD,MAAMC,KAAK,GAAGR,QAAQ,CAAC,CAAC;;IAExB;IACA,MAAMS,MAAM,GAAGD,KAAK,CAACC,MAAM,CAACC,GAAG,CAAEP,KAAK,IAAK;MACzC,MAAMQ,UAAU,GAAGV,iBAAiB,CAACE,KAAK,CAACE,GAAG,CAAC,GAAG,CAAC;MAEnD,IAAIF,KAAK,CAACK,KAAK,KAAKG,UAAU,EAAE;QAC9B,OAAOR,KAAK;MACd;MAEA,OAAO;QAAE,GAAGA,KAAK;QAAEK,KAAK,EAAEG;MAAW,CAAC;IACxC,CAAC,CAAC;IAEF,IAAIf,YAAY,CAACY,KAAK,CAACC,MAAM,EAAEA,MAAM,CAAC,EAAE;MACtC,OAAOD,KAAK;IACd;IAEA,OAAO;MAAE,GAAGA,KAAK;MAAEC;IAAO,CAAC;EAC7B,CAAC,EAAE,CAACT,QAAQ,EAAEC,iBAAiB,CAAC,CAAC;;EAEjC;EACA;EACAN,KAAK,CAACiB,kBAAkB,CAAC,MAAM;IAC7B,OAAOV,gBAAgB,GAAG,UAAU,EAAEG,GAAG,EAAEC,kBAAkB,CAAC;EAChE,CAAC,EAAE,CAACJ,gBAAgB,EAAEI,kBAAkB,EAAED,GAAG,CAAC,CAAC;AACjD","ignoreList":[]}

package/lib/module/useOnPreventRemove.js

@@ -1,43 +1,52 @@
 "use strict";
 
 import * as React from 'react';
-import { NavigationBuilderContext } from "./NavigationBuilderContext.js";
+import { useNavigationBuilderContext } from "./NavigationBuilderContext.js";
 import { NavigationRouteContext } from "./NavigationProvider.js";
 const VISITED_ROUTE_KEYS = Symbol('VISITED_ROUTE_KEYS');
 export const shouldPreventRemove = (emitter, beforeRemoveListeners, currentRoutes, nextRoutes, action) => {
-  const nextRouteKeys = nextRoutes.map(route => route.key);
-
-  // Call these in reverse order so last screens handle the event first
-  const removedRoutes = currentRoutes.filter(route => !nextRouteKeys.includes(route.key)).reverse();
-  const visitedRouteKeys =
-  // @ts-expect-error: add this property to mark that we've already emitted this action
-  action[VISITED_ROUTE_KEYS] ?? new Set();
+  const nextRoutesByKey = new Map(nextRoutes.map(route => [route.key, route]).filter(([, route]) => route.key != null));
+  const visitedRouteKeys = VISITED_ROUTE_KEYS in action && action[VISITED_ROUTE_KEYS] instanceof Set ? action[VISITED_ROUTE_KEYS] : new Set();
   const beforeRemoveAction = {
     ...action,
     [VISITED_ROUTE_KEYS]: visitedRouteKeys
   };
-  for (const route of removedRoutes) {
+
+  // Call these in reverse order so last screens handle the event first
+  const reversedCurrentRoutes = [...currentRoutes].reverse();
+  for (const route of reversedCurrentRoutes) {
     if (visitedRouteKeys.has(route.key)) {
       // Skip if we've already emitted this action for this screen
       continue;
     }
-
-    // First, we need to check if any child screens want to prevent it
-    const isPrevented = beforeRemoveListeners[route.key]?.(beforeRemoveAction);
-    if (isPrevented) {
-      return true;
-    }
-    visitedRouteKeys.add(route.key);
-    const event = emitter.emit({
-      type: 'beforeRemove',
-      target: route.key,
-      data: {
-        action: beforeRemoveAction
-      },
-      canPreventDefault: true
-    });
-    if (event.defaultPrevented) {
-      return true;
+    if (!nextRoutesByKey.has(route.key)) {
+      // The route is not in next state, so it's being removed
+      // First, we need to check if any child screens want to prevent it
+      const isPrevented = beforeRemoveListeners[route.key]?.(beforeRemoveAction, undefined);
+      if (isPrevented) {
+        return true;
+      }
+      visitedRouteKeys.add(route.key);
+      const event = emitter.emit({
+        type: 'beforeRemove',
+        target: route.key,
+        data: {
+          action: beforeRemoveAction
+        },
+        canPreventDefault: true
+      });
+      if (event.defaultPrevented) {
+        return true;
+      }
+    } else {
+      // The route is kept but its nested state changed, so propagate the check into the nested navigator
+      const nextRoute = nextRoutesByKey.get(route.key);
+      if (route.state != null && route.state !== nextRoute?.state) {
+        const isPrevented = beforeRemoveListeners[route.key]?.(beforeRemoveAction, nextRoute?.state);
+        if (isPrevented) {
+          return true;
+        }
+      }
     }
   }
   return false;
@@ -49,14 +58,14 @@ export function useOnPreventRemove({
 }) {
   const {
     addKeyedListener
-  } = React.useContext(NavigationBuilderContext);
-  const route = React.useContext(NavigationRouteContext);
+  } = useNavigationBuilderContext();
+  const route = React.use(NavigationRouteContext);
   const routeKey = route?.key;
-  React.useEffect(() => {
+  React.useInsertionEffect(() => {
     if (routeKey) {
-      return addKeyedListener?.('beforeRemove', routeKey, action => {
+      return addKeyedListener?.('beforeRemove', routeKey, (action, nextState) => {
         const state = getState();
-        return shouldPreventRemove(emitter, beforeRemoveListeners, state.routes, [], action);
+        return shouldPreventRemove(emitter, beforeRemoveListeners, state.routes, nextState?.routes ?? [], action);
       });
     }
   }, [addKeyedListener, beforeRemoveListeners, emitter, getState, routeKey]);

package/lib/module/useOnPreventRemove.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","NavigationBuilderContext","NavigationRouteContext","VISITED_ROUTE_KEYS","Symbol","shouldPreventRemove","emitter","beforeRemoveListeners","currentRoutes","nextRoutes","action","nextRouteKeys","map","route","key","removedRoutes","filter","includes","reverse","visitedRouteKeys","Set","beforeRemoveAction","has","isPrevented","add","event","emit","type","target","data","canPreventDefault","defaultPrevented","useOnPreventRemove","getState","addKeyedListener","useContext","routeKey","useEffect","state","routes"],"sourceRoot":"../../src","sources":["useOnPreventRemove.tsx"],"mappings":";;AAIA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAEEC,wBAAwB,QACnB,+BAA4B;AACnC,SAASC,sBAAsB,QAAQ,yBAAsB;AAU7D,MAAMC,kBAAkB,GAAGC,MAAM,CAAC,oBAAoB,CAAC;AAEvD,OAAO,MAAMC,mBAAmB,GAAGA,CACjCC,OAAkD,EAClDC,qBAA4E,EAC5EC,aAAgC,EAChCC,UAA0C,EAC1CC,MAAwB,KACrB;EACH,MAAMC,aAAa,GAAGF,UAAU,CAACG,GAAG,CAAEC,KAAK,IAAKA,KAAK,CAACC,GAAG,CAAC;;EAE1D;EACA,MAAMC,aAAa,GAAGP,aAAa,CAChCQ,MAAM,CAAEH,KAAK,IAAK,CAACF,aAAa,CAACM,QAAQ,CAACJ,KAAK,CAACC,GAAG,CAAC,CAAC,CACrDI,OAAO,CAAC,CAAC;EAEZ,MAAMC,gBAA6B;EACjC;EACAT,MAAM,CAACP,kBAAkB,CAAC,IAAI,IAAIiB,GAAG,CAAS,CAAC;EAEjD,MAAMC,kBAAkB,GAAG;IACzB,GAAGX,MAAM;IACT,CAACP,kBAAkB,GAAGgB;EACxB,CAAC;EAED,KAAK,MAAMN,KAAK,IAAIE,aAAa,EAAE;IACjC,IAAII,gBAAgB,CAACG,GAAG,CAACT,KAAK,CAACC,GAAG,CAAC,EAAE;MACnC;MACA;IACF;;IAEA;IACA,MAAMS,WAAW,GAAGhB,qBAAqB,CAACM,KAAK,CAACC,GAAG,CAAC,GAAGO,kBAAkB,CAAC;IAE1E,IAAIE,WAAW,EAAE;MACf,OAAO,IAAI;IACb;IAEAJ,gBAAgB,CAACK,GAAG,CAACX,KAAK,CAACC,GAAG,CAAC;IAE/B,MAAMW,KAAK,GAAGnB,OAAO,CAACoB,IAAI,CAAC;MACzBC,IAAI,EAAE,cAAc;MACpBC,MAAM,EAAEf,KAAK,CAACC,GAAG;MACjBe,IAAI,EAAE;QAAEnB,MAAM,EAAEW;MAAmB,CAAC;MACpCS,iBAAiB,EAAE;IACrB,CAAC,CAAC;IAEF,IAAIL,KAAK,CAACM,gBAAgB,EAAE;MAC1B,OAAO,IAAI;IACb;EACF;EAEA,OAAO,KAAK;AACd,CAAC;AAED,OAAO,SAASC,kBAAkBA,CAAC;EACjCC,QAAQ;EACR3B,OAAO;EACPC;AACO,CAAC,EAAE;EACV,MAAM;IAAE2B;EAAiB,CAAC,GAAGlC,KAAK,CAACmC,UAAU,CAAClC,wBAAwB,CAAC;EACvE,MAAMY,KAAK,GAAGb,KAAK,CAACmC,UAAU,CAACjC,sBAAsB,CAAC;EACtD,MAAMkC,QAAQ,GAAGvB,KAAK,EAAEC,GAAG;EAE3Bd,KAAK,CAACqC,SAAS,CAAC,MAAM;IACpB,IAAID,QAAQ,EAAE;MACZ,OAAOF,gBAAgB,GAAG,cAAc,EAAEE,QAAQ,EAAG1B,MAAM,IAAK;QAC9D,MAAM4B,KAAK,GAAGL,QAAQ,CAAC,CAAC;QAExB,OAAO5B,mBAAmB,CACxBC,OAAO,EACPC,qBAAqB,EACrB+B,KAAK,CAACC,MAAM,EACZ,EAAE,EACF7B,MACF,CAAC;MACH,CAAC,CAAC;IACJ;EACF,CAAC,EAAE,CAACwB,gBAAgB,EAAE3B,qBAAqB,EAAED,OAAO,EAAE2B,QAAQ,EAAEG,QAAQ,CAAC,CAAC;AAC5E","ignoreList":[]}
+{"version":3,"names":["React","useNavigationBuilderContext","NavigationRouteContext","VISITED_ROUTE_KEYS","Symbol","shouldPreventRemove","emitter","beforeRemoveListeners","currentRoutes","nextRoutes","action","nextRoutesByKey","Map","map","route","key","filter","visitedRouteKeys","Set","beforeRemoveAction","reversedCurrentRoutes","reverse","has","isPrevented","undefined","add","event","emit","type","target","data","canPreventDefault","defaultPrevented","nextRoute","get","state","useOnPreventRemove","getState","addKeyedListener","use","routeKey","useInsertionEffect","nextState","routes"],"sourceRoot":"../../src","sources":["useOnPreventRemove.tsx"],"mappings":";;AAOA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAEEC,2BAA2B,QACtB,+BAA4B;AACnC,SAASC,sBAAsB,QAAQ,yBAAsB;AAU7D,MAAMC,kBAAkB,GAAGC,MAAM,CAAC,oBAAoB,CAAC;AAEvD,OAAO,MAAMC,mBAAmB,GAAGA,CACjCC,OAAkD,EAClDC,qBAA4E,EAC5EC,aAAuD,EACvDC,UAGG,EACHC,MAAwB,KACrB;EACH,MAAMC,eAAe,GAAG,IAAIC,GAAG,CAC7BH,UAAU,CACPI,GAAG,CAAEC,KAAK,IAAK,CAACA,KAAK,CAACC,GAAG,EAAED,KAAK,CAAU,CAAC,CAC3CE,MAAM,CAAC,CAAC,GAAGF,KAAK,CAAC,KAAKA,KAAK,CAACC,GAAG,IAAI,IAAI,CAC5C,CAAC;EAED,MAAME,gBAAgB,GACpBd,kBAAkB,IAAIO,MAAM,IAAIA,MAAM,CAACP,kBAAkB,CAAC,YAAYe,GAAG,GACrER,MAAM,CAACP,kBAAkB,CAAC,GAC1B,IAAIe,GAAG,CAAS,CAAC;EAEvB,MAAMC,kBAAkB,GAAG;IACzB,GAAGT,MAAM;IACT,CAACP,kBAAkB,GAAGc;EACxB,CAAC;;EAED;EACA,MAAMG,qBAAqB,GAAG,CAAC,GAAGZ,aAAa,CAAC,CAACa,OAAO,CAAC,CAAC;EAE1D,KAAK,MAAMP,KAAK,IAAIM,qBAAqB,EAAE;IACzC,IAAIH,gBAAgB,CAACK,GAAG,CAACR,KAAK,CAACC,GAAG,CAAC,EAAE;MACnC;MACA;IACF;IAEA,IAAI,CAACJ,eAAe,CAACW,GAAG,CAACR,KAAK,CAACC,GAAG,CAAC,EAAE;MACnC;MACA;MACA,MAAMQ,WAAW,GAAGhB,qBAAqB,CAACO,KAAK,CAACC,GAAG,CAAC,GAClDI,kBAAkB,EAClBK,SACF,CAAC;MAED,IAAID,WAAW,EAAE;QACf,OAAO,IAAI;MACb;MAEAN,gBAAgB,CAACQ,GAAG,CAACX,KAAK,CAACC,GAAG,CAAC;MAE/B,MAAMW,KAAK,GAAGpB,OAAO,CAACqB,IAAI,CAAC;QACzBC,IAAI,EAAE,cAAc;QACpBC,MAAM,EAAEf,KAAK,CAACC,GAAG;QACjBe,IAAI,EAAE;UAAEpB,MAAM,EAAES;QAAmB,CAAC;QACpCY,iBAAiB,EAAE;MACrB,CAAC,CAAC;MAEF,IAAIL,KAAK,CAACM,gBAAgB,EAAE;QAC1B,OAAO,IAAI;MACb;IACF,CAAC,MAAM;MACL;MACA,MAAMC,SAAS,GAAGtB,eAAe,CAACuB,GAAG,CAACpB,KAAK,CAACC,GAAG,CAAC;MAEhD,IAAID,KAAK,CAACqB,KAAK,IAAI,IAAI,IAAIrB,KAAK,CAACqB,KAAK,KAAKF,SAAS,EAAEE,KAAK,EAAE;QAC3D,MAAMZ,WAAW,GAAGhB,qBAAqB,CAACO,KAAK,CAACC,GAAG,CAAC,GAClDI,kBAAkB,EAClBc,SAAS,EAAEE,KACb,CAAC;QAED,IAAIZ,WAAW,EAAE;UACf,OAAO,IAAI;QACb;MACF;IACF;EACF;EAEA,OAAO,KAAK;AACd,CAAC;AAED,OAAO,SAASa,kBAAkBA,CAAC;EACjCC,QAAQ;EACR/B,OAAO;EACPC;AACO,CAAC,EAAE;EACV,MAAM;IAAE+B;EAAiB,CAAC,GAAGrC,2BAA2B,CAAC,CAAC;EAE1D,MAAMa,KAAK,GAAGd,KAAK,CAACuC,GAAG,CAACrC,sBAAsB,CAAC;EAE/C,MAAMsC,QAAQ,GAAG1B,KAAK,EAAEC,GAAG;EAE3Bf,KAAK,CAACyC,kBAAkB,CAAC,MAAM;IAC7B,IAAID,QAAQ,EAAE;MACZ,OAAOF,gBAAgB,GACrB,cAAc,EACdE,QAAQ,EACR,CAAC9B,MAAM,EAAEgC,SAAS,KAAK;QACrB,MAAMP,KAAK,GAAGE,QAAQ,CAAC,CAAC;QAExB,OAAOhC,mBAAmB,CACxBC,OAAO,EACPC,qBAAqB,EACrB4B,KAAK,CAACQ,MAAM,EACZD,SAAS,EAAEC,MAAM,IAAI,EAAE,EACvBjC,MACF,CAAC;MACH,CACF,CAAC;IACH;EACF,CAAC,EAAE,CAAC4B,gBAAgB,EAAE/B,qBAAqB,EAAED,OAAO,EAAE+B,QAAQ,EAAEG,QAAQ,CAAC,CAAC;AAC5E","ignoreList":[]}