@react-navigation/core 7.23.0 → 7.25.0

package/lib/typescript/src/useNavigationHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNavigationHelpers.d.ts","sourceRoot":"","sources":["../../../src/useNavigationHelpers.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,MAAM,EACZ,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,KAAK,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,YAAS,CAAC;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAmB,CAAC;AAMhE,KAAK,OAAO,CAAC,KAAK,SAAS,eAAe,EAAE,MAAM,SAAS,gBAAgB,IAAI;IAC7E,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC;IAChD,iBAAiB,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACtD,QAAQ,EAAE,MAAM,KAAK,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC/B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,SAAS,eAAe,EAC7B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,EAChD,MAAM,SAAS,gBAAgB,EAC/B,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACpC,EACA,EAAE,EAAE,WAAW,EACf,QAAQ,EACR,iBAAiB,EACjB,QAAQ,EACR,KAAK,EACL,OAAO,EACP,MAAM,GACP,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAsGxB"}
+{"version":3,"file":"useNavigationHelpers.d.ts","sourceRoot":"","sources":["../../../src/useNavigationHelpers.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,MAAM,EACZ,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EAAE,KAAK,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,YAAS,CAAC;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAmB,CAAC;AAMhE,KAAK,OAAO,CAAC,KAAK,SAAS,eAAe,EAAE,MAAM,SAAS,gBAAgB,IAAI;IAC7E,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC;IAChD,iBAAiB,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACtD,QAAQ,EAAE,MAAM,KAAK,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC/B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,SAAS,eAAe,EAC7B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,EAChD,MAAM,SAAS,gBAAgB,EAC/B,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACpC,EACA,EAAE,EAAE,WAAW,EACf,QAAQ,EACR,iBAAiB,EACjB,QAAQ,EACR,KAAK,EACL,OAAO,EACP,MAAM,GACP,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAiHxB"}

package/lib/typescript/src/useNavigationState.d.ts

@@ -1,5 +1,9 @@
 import type { NavigationState, ParamListBase } from '@react-navigation/routers';
 import * as React from 'react';
+type NavigationStateListener = {
+    getState: () => NavigationState<ParamListBase>;
+    subscribe: (callback: () => void) => () => void;
+};
 type Selector<ParamList extends ParamListBase, T> = (state: NavigationState<ParamList>) => T;
 /**
  * Hook to get a value from the current navigation state using a selector.
@@ -12,5 +16,6 @@ export declare function NavigationStateListenerProvider({ state, getState, child
     getState: () => NavigationState<ParamListBase>;
     children: React.ReactNode;
 }): React.JSX.Element;
+export declare const NavigationStateListenerContext: React.Context<NavigationStateListener | undefined>;
 export {};
 //# sourceMappingURL=useNavigationState.d.ts.map

package/lib/typescript/src/useNavigationState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNavigationState.d.ts","sourceRoot":"","sources":["../../../src/useNavigationState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAU/B,KAAK,QAAQ,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,IAAI,CAClD,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,KAC9B,CAAC,CAAC;AAEP;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,EACnE,QAAQ,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,GAC/B,CAAC,CA+CH;AAED,wBAAgB,+BAA+B,CAAC,EAC9C,KAAK,EACL,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;IACtC,QAAQ,EAAE,MAAM,eAAe,CAAC,aAAa,CAAC,CAAC;IAC/C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,qBA6BA"}
+{"version":3,"file":"useNavigationState.d.ts","sourceRoot":"","sources":["../../../src/useNavigationState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,KAAK,uBAAuB,GAAG;IAC7B,QAAQ,EAAE,MAAM,eAAe,CAAC,aAAa,CAAC,CAAC;IAC/C,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;CACjD,CAAC;AAEF,KAAK,QAAQ,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,IAAI,CAClD,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,KAC9B,CAAC,CAAC;AAEP;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,EACnE,QAAQ,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,GAC/B,CAAC,CA+CH;AAED,wBAAgB,+BAA+B,CAAC,EAC9C,KAAK,EACL,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;IACtC,QAAQ,EAAE,MAAM,eAAe,CAAC,aAAa,CAAC,CAAC;IAC/C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,qBA6BA;AAED,eAAO,MAAM,8BAA8B,oDAE/B,CAAC"}

package/lib/typescript/src/useOnRouteFocus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOnRouteFocus.d.ts","sourceRoot":"","sources":["../../../src/useOnRouteFocus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,MAAM,EACP,MAAM,2BAA2B,CAAC;AAKnC,KAAK,OAAO,CAAC,KAAK,SAAS,eAAe,EAAE,MAAM,SAAS,gBAAgB,IAAI;IAC7E,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,MAAM,KAAK,CAAC;IACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,KAAK,SAAS,eAAe,EAC7B,MAAM,SAAS,gBAAgB,EAC/B,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,SAMnE,MAAM,UAcf"}
+{"version":3,"file":"useOnRouteFocus.d.ts","sourceRoot":"","sources":["../../../src/useOnRouteFocus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,MAAM,EACP,MAAM,2BAA2B,CAAC;AAKnC,KAAK,OAAO,CAAC,KAAK,SAAS,eAAe,EAAE,MAAM,SAAS,gBAAgB,IAAI;IAC7E,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,MAAM,KAAK,CAAC;IACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,KAAK,SAAS,eAAe,EAC7B,MAAM,SAAS,gBAAgB,EAC/B,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,SAInE,MAAM,UAcf"}

package/lib/typescript/src/useOptionsGetters.d.ts

@@ -1,5 +1,7 @@
 import type { ParamListBase } from '@react-navigation/routers';
+import * as React from 'react';
 import type { NavigationProp } from './types.js';
+export declare const OptionsGetterContext: React.Context<((key: string, getter: () => object | undefined | null) => void) | undefined>;
 type Options = {
     key?: string;
     navigation?: NavigationProp<ParamListBase>;

package/lib/typescript/src/useOptionsGetters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOptionsGetters.d.ts","sourceRoot":"","sources":["../../../src/useOptionsGetters.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAS,CAAC;AAE9C,KAAK,OAAO,GAAG;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,OAAO;4BAkE7D,MAAM,UAAU,MAAM,MAAM,GAAG,SAAS,GAAG,IAAI;;EAiBxD"}
+{"version":3,"file":"useOptionsGetters.d.ts","sourceRoot":"","sources":["../../../src/useOptionsGetters.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAS,CAAC;AAE9C,eAAO,MAAM,oBAAoB,uBACxB,MAAM,UAAU,MAAM,MAAM,GAAG,SAAS,GAAG,IAAI,KAAK,IAAI,cACrD,CAAC;AAEb,KAAK,OAAO,GAAG;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,OAAO;4BAkE7D,MAAM,UAAU,MAAM,MAAM,GAAG,SAAS,GAAG,IAAI;;EAiBxD"}

package/lib/typescript/src/useScheduleUpdate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useScheduleUpdate.d.ts","sourceRoot":"","sources":["../../../src/useScheduleUpdate.tsx"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,IAAI,QAUrD"}
+{"version":3,"file":"useScheduleUpdate.d.ts","sourceRoot":"","sources":["../../../src/useScheduleUpdate.tsx"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,IAAI,QAQrD"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/core",
   "description": "Core utilities for building navigators",
-  "version": "7.23.0",
+  "version": "7.25.0",
   "keywords": [
     "react",
     "react-native",
@@ -40,24 +40,23 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/routers": "^7.6.4",
+    "@react-navigation/routers": "^7.6.6",
     "escape-string-regexp": "^4.0.0",
     "fast-deep-equal": "^3.1.3",
-    "react-is": "^19.1.0",
-    "use-latest-callback": "^0.2.4",
-    "use-sync-external-store": "^1.5.0"
+    "react-is": "^19.3.1",
+    "use-latest-callback": "^0.2.4"
   },
   "devDependencies": {
-    "@jest/globals": "^30.0.0",
+    "@jest/globals": "^30.5.2",
     "@testing-library/react-native": "^13.2.1",
-    "@types/react": "~19.2.4",
-    "@types/react-is": "^19.0.0",
-    "@types/use-sync-external-store": "^1.5.0",
-    "del-cli": "^6.0.0",
-    "immer": "^10.1.1",
-    "react": "19.2.3",
-    "react-native-builder-bob": "^0.42.1",
-    "react-test-renderer": "19.2.3",
+    "@types/react": "~19.3.0",
+    "@types/react-is": "^19.3.0",
+    "del-cli": "^8.0.1",
+    "immer": "^11.2.9",
+    "react": "19.3.0",
+    "react-native": "0.88.1",
+    "react-native-builder-bob": "^0.44.1",
+    "react-test-renderer": "19.3.0",
     "typescript": "~6.0.3"
   },
   "peerDependencies": {
@@ -81,5 +80,5 @@
       ]
     ]
   },
-  "gitHead": "47f787dc7580c092238e17af8a86cad32573bd32"
+  "gitHead": "77fad70cd6d9ed492d7ce30177efa923e95294cb"
 }

package/src/BaseNavigationContainer.tsx

@@ -17,7 +17,10 @@ import { NOT_INITIALIZED_ERROR } from './createNavigationContainerRef';
 import { DeprecatedNavigationInChildContext } from './DeprecatedNavigationInChildContext';
 import { EnsureSingleNavigator } from './EnsureSingleNavigator';
 import { findFocusedRoute } from './findFocusedRoute';
-import { NavigationBuilderContext } from './NavigationBuilderContext';
+import {
+  NavigationBuilderContext,
+  type WithStackTrace,
+} from './NavigationBuilderContext';
 import { NavigationContainerRefContext } from './NavigationContainerRefContext';
 import { NavigationIndependentTreeContext } from './NavigationIndependentTreeContext';
 import { NavigationStateContext } from './NavigationStateContext';
@@ -33,7 +36,7 @@ import { useEventEmitter } from './useEventEmitter';
 import { useKeyedChildListeners } from './useKeyedChildListeners';
 import { useLazyValue } from './useLazyValue';
 import { useNavigationIndependentTree } from './useNavigationIndependentTree';
-import { useOptionsGetters } from './useOptionsGetters';
+import { OptionsGetterContext, useOptionsGetters } from './useOptionsGetters';
 import { useSyncState } from './useSyncState';
 
 type State = NavigationState | PartialState<NavigationState> | undefined;
@@ -126,6 +129,41 @@ export const BaseNavigationContainer = React.forwardRef(
 
     const { keyedListeners, addKeyedListener } = useKeyedChildListeners();
 
+    const stackRef = React.useRef<string | undefined>(undefined);
+
+    const withStackTrace = React.useCallback<WithStackTrace>(
+      (entry, callback) => {
+        if (process.env.NODE_ENV === 'production' || stackRef.current != null) {
+          callback();
+          return;
+        }
+
+        const error = new Error();
+
+        if (Error.captureStackTrace) {
+          // Available on V8 and Hermes, omits the frames of `entry` and what it called
+          Error.captureStackTrace(error, entry);
+
+          stackRef.current = error.stack;
+        } else {
+          // Other engines always include them, so we drop the frames up to `entry` ourselves
+          const frames = error.stack?.split('\n') ?? [];
+          const index = frames.findIndex((frame) =>
+            frame.includes(`${entry.name}@`)
+          );
+
+          stackRef.current = frames.slice(index + 1).join('\n');
+        }
+
+        try {
+          callback();
+        } finally {
+          stackRef.current = undefined;
+        }
+      },
+      []
+    );
+
     const dispatch = useLatestCallback(
       (
         action:
@@ -135,7 +173,9 @@ export const BaseNavigationContainer = React.forwardRef(
         if (listeners.focus[0] == null) {
           console.error(NOT_INITIALIZED_ERROR);
         } else {
-          listeners.focus[0]((navigation) => navigation.dispatch(action));
+          withStackTrace(dispatch, () => {
+            listeners.focus[0]((navigation) => navigation.dispatch(action));
+          });
         }
       }
     );
@@ -198,9 +238,14 @@ export const BaseNavigationContainer = React.forwardRef(
     const navigation: NavigationContainerRef<ParamListBase> = React.useMemo(
       () => ({
         ...Object.keys(CommonActions).reduce<any>((acc, name) => {
-          acc[name] = (...args: any[]) =>
-            // @ts-expect-error: this is ok
-            dispatch(CommonActions[name](...args));
+          const helper = (...args: any[]) =>
+            withStackTrace(helper, () =>
+              // @ts-expect-error: this is ok
+              dispatch(CommonActions[name](...args))
+            );
+
+          acc[name] = helper;
+
           return acc;
         }, {}),
         ...emitter.create('root'),
@@ -228,6 +273,7 @@ export const BaseNavigationContainer = React.forwardRef(
         getState,
         isReady,
         resetRoot,
+        withStackTrace,
       ]
     );
 
@@ -266,8 +312,6 @@ export const BaseNavigationContainer = React.forwardRef(
       });
     });
 
-    const stackRef = React.useRef<string | undefined>(undefined);
-
     const lastEmittedStateRef = React.useRef<State | undefined>(undefined);
 
     const getIsStateEmitted = useLatestCallback(
@@ -285,7 +329,7 @@ export const BaseNavigationContainer = React.forwardRef(
         getIsStateEmitted,
         scheduleUpdate,
         flushUpdates,
-        stackRef,
+        withStackTrace,
       }),
       [
         addListener,
@@ -296,6 +340,7 @@ export const BaseNavigationContainer = React.forwardRef(
         getIsStateEmitted,
         scheduleUpdate,
         flushUpdates,
+        withStackTrace,
       ]
     );
 
@@ -311,17 +356,8 @@ export const BaseNavigationContainer = React.forwardRef(
         getKey,
         setKey,
         getIsInitial,
-        addOptionsGetter,
       }),
-      [
-        state,
-        getState,
-        setState,
-        getKey,
-        setKey,
-        getIsInitial,
-        addOptionsGetter,
-      ]
+      [state, getState, setState, getKey, setKey, getIsInitial]
     );
 
     const onReadyRef = React.useRef(onReady);
@@ -475,19 +511,21 @@ export const BaseNavigationContainer = React.forwardRef(
         <NavigationContainerRefContext.Provider value={navigation}>
           <NavigationBuilderContext.Provider value={builderContext}>
             <NavigationStateContext.Provider value={context}>
-              <ConsumedParamsContext.Provider value={consumedParams}>
-                <UnhandledActionContext.Provider
-                  value={onUnhandledAction ?? defaultOnUnhandledAction}
-                >
-                  <DeprecatedNavigationInChildContext.Provider
-                    value={navigationInChildEnabled}
+              <OptionsGetterContext.Provider value={addOptionsGetter}>
+                <ConsumedParamsContext.Provider value={consumedParams}>
+                  <UnhandledActionContext.Provider
+                    value={onUnhandledAction ?? defaultOnUnhandledAction}
                   >
-                    <EnsureSingleNavigator>
-                      <ThemeProvider value={theme}>{children}</ThemeProvider>
-                    </EnsureSingleNavigator>
-                  </DeprecatedNavigationInChildContext.Provider>
-                </UnhandledActionContext.Provider>
-              </ConsumedParamsContext.Provider>
+                    <DeprecatedNavigationInChildContext.Provider
+                      value={navigationInChildEnabled}
+                    >
+                      <EnsureSingleNavigator>
+                        <ThemeProvider value={theme}>{children}</ThemeProvider>
+                      </EnsureSingleNavigator>
+                    </DeprecatedNavigationInChildContext.Provider>
+                  </UnhandledActionContext.Provider>
+                </ConsumedParamsContext.Provider>
+              </OptionsGetterContext.Provider>
             </NavigationStateContext.Provider>
           </NavigationBuilderContext.Provider>
         </NavigationContainerRefContext.Provider>

package/src/NavigationBuilderContext.tsx

@@ -47,15 +47,17 @@ export type FocusedNavigationListener = <T>(
 
 export type GetStateListener = () => NavigationState;
 
+export type WithStackTrace = (
+  entry: (...args: never[]) => void,
+  callback: () => void
+) => void;
+
 export type ChildBeforeRemoveListener = (
   action: NavigationAction,
   nextState: NavigationState | PartialState<NavigationState> | undefined
 ) => boolean;
 
-/**
- * Context which holds the required helpers needed to build nested navigators.
- */
-export const NavigationBuilderContext = React.createContext<{
+type NavigationBuilderContextValue = {
   onAction?: (
     action: NavigationAction,
     visitedNavigators?: Set<string>
@@ -71,16 +73,24 @@ export const NavigationBuilderContext = React.createContext<{
   getIsStateEmitted: () => boolean;
   scheduleUpdate: (callback: () => void) => void;
   flushUpdates: () => void;
-  stackRef?: React.RefObject<string | undefined>;
-}>({
-  onDispatchAction: () => undefined,
-  onEmitEvent: () => undefined,
-  onOptionsChange: () => undefined,
-  getIsStateEmitted: () => false,
-  scheduleUpdate: () => {
-    throw new Error("Couldn't find a context for scheduling updates.");
-  },
-  flushUpdates: () => {
-    throw new Error("Couldn't find a context for flushing updates.");
-  },
-});
+  withStackTrace: WithStackTrace;
+};
+
+/**
+ * Context which holds the required helpers needed to build nested navigators.
+ */
+export const NavigationBuilderContext = React.createContext<
+  NavigationBuilderContextValue | undefined
+>(undefined);
+
+export function useNavigationBuilderContext() {
+  const value = React.useContext(NavigationBuilderContext);
+
+  if (value == null) {
+    throw new Error(
+      "Couldn't find a navigation builder context. Is your component inside NavigationContainer?"
+    );
+  }
+
+  return value;
+}

package/src/NavigationIndependentTree.tsx

@@ -1,10 +1,20 @@
 import * as React from 'react';
 
+import { NavigationBuilderContext } from './NavigationBuilderContext';
+import { NavigationContainerRefContext } from './NavigationContainerRefContext';
 import { NavigationContext } from './NavigationContext';
 import { NavigationFocusedRouteStateContext } from './NavigationFocusedRouteStateContext';
+import { NavigationHelpersContext } from './NavigationHelpersContext';
 import { NavigationIndependentTreeContext } from './NavigationIndependentTreeContext';
-import { NavigationRouteContext } from './NavigationProvider';
-import { IsFocusedContext } from './useIsFocused';
+// eslint-disable-next-line import-x/no-deprecated
+import { NavigationMetaContext } from './NavigationMetaContext';
+import {
+  NamedRouteContextListContext,
+  NavigationRouteContext,
+} from './NavigationProvider';
+import { PreventRemoveContext } from './PreventRemoveContext';
+import { FocusedRouteKeyContext, IsFocusedContext } from './useIsFocused';
+import { NavigationStateListenerContext } from './useNavigationState';
 
 /**
  * Component to make the child navigation container independent of parent containers.
@@ -16,16 +26,34 @@ export function NavigationIndependentTree({
 }) {
   return (
     // We need to clear any existing contexts for nested independent container to work correctly
-    <NavigationRouteContext.Provider value={undefined}>
-      <NavigationContext.Provider value={undefined}>
-        <NavigationFocusedRouteStateContext.Provider value={undefined}>
-          <IsFocusedContext.Provider value={undefined}>
-            <NavigationIndependentTreeContext.Provider value>
-              {children}
-            </NavigationIndependentTreeContext.Provider>
-          </IsFocusedContext.Provider>
-        </NavigationFocusedRouteStateContext.Provider>
-      </NavigationContext.Provider>
-    </NavigationRouteContext.Provider>
+    <NavigationIndependentTreeContext.Provider value>
+      <NavigationContainerRefContext.Provider value={undefined}>
+        <NavigationBuilderContext.Provider value={undefined}>
+          <NavigationMetaContext.Provider value={undefined}>
+            <NavigationHelpersContext.Provider value={undefined}>
+              <NavigationStateListenerContext.Provider value={undefined}>
+                <FocusedRouteKeyContext.Provider value={undefined}>
+                  <PreventRemoveContext.Provider value={undefined}>
+                    <NamedRouteContextListContext.Provider value={undefined}>
+                      <NavigationRouteContext.Provider value={undefined}>
+                        <NavigationContext.Provider value={undefined}>
+                          <IsFocusedContext.Provider value={undefined}>
+                            <NavigationFocusedRouteStateContext.Provider
+                              value={undefined}
+                            >
+                              {children}
+                            </NavigationFocusedRouteStateContext.Provider>
+                          </IsFocusedContext.Provider>
+                        </NavigationContext.Provider>
+                      </NavigationRouteContext.Provider>
+                    </NamedRouteContextListContext.Provider>
+                  </PreventRemoveContext.Provider>
+                </FocusedRouteKeyContext.Provider>
+              </NavigationStateListenerContext.Provider>
+            </NavigationHelpersContext.Provider>
+          </NavigationMetaContext.Provider>
+        </NavigationBuilderContext.Provider>
+      </NavigationContainerRefContext.Provider>
+    </NavigationIndependentTreeContext.Provider>
   );
 }

package/src/NavigationProvider.tsx

@@ -37,13 +37,16 @@ export function NavigationProvider({ route, navigation, children }: Props) {
       ? focusedRouteKey === route.key
       : false;
 
-  return (
-    <NavigationRouteContext.Provider value={route}>
-      <NavigationContext.Provider value={navigation}>
-        <IsFocusedContext.Provider value={isFocused}>
-          {children}
-        </IsFocusedContext.Provider>
-      </NavigationContext.Provider>
-    </NavigationRouteContext.Provider>
+  return React.useMemo(
+    () => (
+      <NavigationRouteContext.Provider value={route}>
+        <NavigationContext.Provider value={navigation}>
+          <IsFocusedContext.Provider value={isFocused}>
+            {children}
+          </IsFocusedContext.Provider>
+        </NavigationContext.Provider>
+      </NavigationRouteContext.Provider>
+    ),
+    [children, isFocused, navigation, route]
   );
 }

package/src/NavigationStateContext.tsx

@@ -14,10 +14,6 @@ export const NavigationStateContext = React.createContext<{
     state: NavigationState | PartialState<NavigationState> | undefined
   ) => void;
   getIsInitial: () => boolean;
-  addOptionsGetter?: (
-    key: string,
-    getter: () => object | undefined | null
-  ) => void;
 }>({
   isDefault: true,
 

package/src/PreventRemoveProvider.tsx

@@ -65,7 +65,6 @@ export function PreventRemoveProvider({ children }: Props) {
   );
 
   const notifyPreventRemove = useLatestCallback(() => {
-    // eslint-disable-next-line @eslint-react/hooks-extra/no-direct-set-state-in-use-effect
     setPreventedRoutesMap((prevPrevented) => {
       const nextPrevented = registry.current;
 

package/src/SceneView.tsx

@@ -15,7 +15,7 @@ import {
 import { NavigationStateContext } from './NavigationStateContext';
 import { StaticContainer } from './StaticContainer';
 import type { NavigationProp, RouteConfigComponent } from './types';
-import { useOptionsGetters } from './useOptionsGetters';
+import { OptionsGetterContext, useOptionsGetters } from './useOptionsGetters';
 
 type Props<State extends NavigationState, ScreenOptions extends {}> = {
   screen: RouteConfigComponent<ParamListBase, string> & { name: string };
@@ -105,7 +105,7 @@ export function SceneView<
   // Clear options set by this screen when it is unmounted
   React.useEffect(() => {
     return clearOptions;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line @eslint-react/exhaustive-deps
   }, []);
 
   const getIsInitial = React.useCallback(() => isInitialRef.current, []);
@@ -163,40 +163,35 @@ export function SceneView<
       getKey,
       setKey,
       getIsInitial,
-      addOptionsGetter,
     }),
-    [
-      routeState,
-      getCurrentState,
-      setCurrentState,
-      getKey,
-      setKey,
-      getIsInitial,
-      addOptionsGetter,
-    ]
+    [routeState, getCurrentState, setCurrentState, getKey, setKey, getIsInitial]
   );
 
   const ScreenComponent = screen.getComponent
-    ? screen.getComponent()
+    ? // eslint-disable-next-line @eslint-react/static-components
+      screen.getComponent()
     : screen.component;
 
   return (
     <NavigationStateContext.Provider value={context}>
       <NavigationFocusedRouteStateContext.Provider value={focusedRouteState}>
-        <EnsureSingleNavigator>
-          <StaticContainer
-            name={screen.name}
-            render={ScreenComponent || screen.children}
-            navigation={navigation}
-            route={route}
-          >
-            {ScreenComponent !== undefined ? (
-              <ScreenComponent navigation={navigation} route={route} />
-            ) : screen.children !== undefined ? (
-              screen.children({ navigation, route })
-            ) : null}
-          </StaticContainer>
-        </EnsureSingleNavigator>
+        <OptionsGetterContext.Provider value={addOptionsGetter}>
+          <EnsureSingleNavigator>
+            <StaticContainer
+              name={screen.name}
+              render={ScreenComponent || screen.children}
+              navigation={navigation}
+              route={route}
+            >
+              {ScreenComponent !== undefined ? (
+                // eslint-disable-next-line @eslint-react/static-components
+                <ScreenComponent navigation={navigation} route={route} />
+              ) : screen.children !== undefined ? (
+                screen.children({ navigation, route })
+              ) : null}
+            </StaticContainer>
+          </EnsureSingleNavigator>
+        </OptionsGetterContext.Provider>
       </NavigationFocusedRouteStateContext.Provider>
     </NavigationStateContext.Provider>
   );