@react-navigation/core 7.13.7 → 8.0.0-alpha.0

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

@@ -1,5 +1,4 @@
-import type { NavigationState, ParamListBase } from '@react-navigation/routers';
-import type { RouteProp } from './types';
+import type { NavigationState } from '@react-navigation/routers';
 /**
  * Utilities such as `getFocusedRouteNameFromRoute` need to access state.
  * So we need a way to suppress the warning for those use cases.
@@ -10,5 +9,15 @@ export declare const CHILD_STATE: unique symbol;
  * Hook to cache route props for each screen in the navigator.
  * This lets add warnings and modifications to the route object but keep references between renders.
  */
-export declare function useRouteCache<State extends NavigationState>(routes: State['routes']): RouteProp<ParamListBase>[];
+export declare function useRouteCache<State extends NavigationState>(routes: State['routes']): Readonly<{
+    key: string;
+    name: string;
+    path?: string;
+    history?: {
+        type: "params";
+        params: object;
+    }[];
+} & Readonly<{
+    params?: Readonly<object | undefined>;
+}>>[];
 //# sourceMappingURL=useRouteCache.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useRouteCache.d.ts","sourceRoot":"","sources":["../../../src/useRouteCache.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAIhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIzC;;;;GAIG;AACH,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,SAAS,eAAe,EACzD,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,8BA8CxB"}
+{"version":3,"file":"useRouteCache.d.ts","sourceRoot":"","sources":["../../../src/useRouteCache.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,2BAA2B,CAAC;AAQhF;;;;GAIG;AACH,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,SAAS,eAAe,EACzD,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC;;;;;;;;;;MA8CxB"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"useSyncState.d.ts","sourceRoot":"","sources":["../../../src/useSyncState.tsx"],"names":[],"mappings":"AAiEA,wBAAgB,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC;;;;wCAaF,MAAM,IAAI;;EA0B/D"}
+{"version":3,"file":"useSyncState.d.ts","sourceRoot":"","sources":["../../../src/useSyncState.tsx"],"names":[],"mappings":"AA8DA,wBAAgB,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC;;;;wCA6BF,MAAM,IAAI;;EA4B/D"}

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

@@ -0,0 +1,99 @@
+/**
+ * Flatten a type to remove all type alias names, unions etc.
+ * This will show a plain object when hovering over the type.
+ */
+export type FlatType<T> = {
+    [K in keyof T]: T[K];
+} & {};
+/**
+ * keyof T doesn't work for union types. We can use distributive conditional types instead.
+ * https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types
+ */
+export type KeysOf<T> = T extends {} ? keyof T : never;
+/**
+ * Extract string keys from an object type.
+ */
+export type KeyOf<T extends {}> = Extract<keyof T, string>;
+/**
+ * We get a union type when using keyof, but we want an intersection instead.
+ * https://stackoverflow.com/a/50375286/1665026
+ */
+export type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+export type UnknownToUndefined<T> = unknown extends T ? undefined : T;
+/**
+ * Exclude undefined from a type.
+ * Similar to NonNullable but only excludes undefined, not null.
+ */
+export type NotUndefined<T> = T extends undefined ? never : T;
+export type AnyToUnknown<T> = 0 extends 1 & T ? unknown : T;
+/**
+ * Check if a function type has arguments.
+ */
+export type HasArguments<T extends (...args: any[]) => any> = Parameters<T> extends [] ? false : Parameters<T> extends [undefined?] ? false : true;
+export type ValidPathPattern = `:${string}` | `${string}/:${string}`;
+/**
+ * Strip regex pattern from a path param.
+ * e.g. `userId([a-z]+)` -> `userId`
+ */
+type StripRegex<Param extends string> = Param extends `${infer Name}(${string})` ? Name : Param;
+/**
+ * Extract a single path param from a segment.
+ * e.g. `:userId` -> `{ userId: string }`, `:id?` -> `{ id?: string }`
+ */
+type ExtractSegmentParam<Segment extends string> = Segment extends `:${infer Param}?` ? {
+    [K in StripRegex<Param>]?: string;
+} : Segment extends `:${infer Param}` ? {
+    [K in StripRegex<Param>]: string;
+} : {};
+/**
+ * Extract path params from a path string.
+ * e.g. `/foo/:userId/:postId` -> `{ userId: string; postId: string }`
+ * Supports optional params with `?` suffix.
+ * Params must start with `:` at the beginning of a segment (after `/`).
+ */
+export type ExtractParamStrings<Path extends string> = Path extends `${infer Segment}/${infer Rest}` ? ExtractSegmentParam<Segment> & ExtractParamStrings<Rest> : ExtractSegmentParam<Path>;
+/**
+ * Extract the parsed params type from base params and parse functions.
+ * Applies the return type of parse functions to the corresponding params.
+ */
+export type ExtractParamsType<Params, Parse> = {
+    [K in keyof Params]: K extends keyof Parse ? Parse[K] extends (value: string) => infer R ? R : Params[K] : Params[K];
+};
+/**
+ * Infer the path string from a linking config.
+ */
+export type InferPath<T> = T extends {
+    path: infer P extends string;
+} ? P : never;
+/**
+ * Infer the parse functions from a linking config.
+ */
+export type InferParse<T> = T extends {
+    parse: infer P;
+} ? P : {};
+/**
+ * Infer the params type from a screen component or nested navigator.
+ */
+export type InferScreenParams<T> = T extends React.ComponentType<{
+    route: {
+        params: infer P;
+    };
+}> ? P : T extends {
+    config: {
+        screens: infer Screens;
+    };
+} ? import('./types').NavigatorScreenParams<{
+    [K in keyof Screens]: Screens[K] extends React.ComponentType<{
+        route: {
+            params: infer P;
+        };
+    }> ? P : Screens[K] extends {
+        screen: infer S;
+    } ? S extends React.ComponentType<{
+        route: {
+            params: infer P;
+        };
+    }> ? P : undefined : undefined;
+}> : undefined;
+export {};
+//# sourceMappingURL=utilities.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../../src/utilities.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;AAE3D;;;GAGG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,CACnC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CACvC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,GAC1B,CAAC,GACD,KAAK,CAAC;AAEV,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,OAAO,SAAS,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC;AAEtE;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AAE9D,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC;AAE5D;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IACxD,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,GACpB,KAAK,GACL,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,GAChC,KAAK,GACL,IAAI,CAAC;AAEb,MAAM,MAAM,gBAAgB,GAAG,IAAI,MAAM,EAAE,GAAG,GAAG,MAAM,KAAK,MAAM,EAAE,CAAC;AAErE;;;GAGG;AACH,KAAK,UAAU,CAAC,KAAK,SAAS,MAAM,IAAI,KAAK,SAAS,GAAG,MAAM,IAAI,IAAI,MAAM,GAAG,GAC5E,IAAI,GACJ,KAAK,CAAC;AAEV;;;GAGG;AACH,KAAK,mBAAmB,CAAC,OAAO,SAAS,MAAM,IAC7C,OAAO,SAAS,IAAI,MAAM,KAAK,GAAG,GAC9B;KAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM;CAAE,GACrC,OAAO,SAAS,IAAI,MAAM,KAAK,EAAE,GAC/B;KAAG,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,MAAM;CAAE,GACpC,EAAE,CAAC;AAEX;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,CAAC,IAAI,SAAS,MAAM,IACjD,IAAI,SAAS,GAAG,MAAM,OAAO,IAAI,MAAM,IAAI,EAAE,GACzC,mBAAmB,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,GACxD,mBAAmB,CAAC,IAAI,CAAC,CAAC;AAEhC;;;GAGG;AACH,MAAM,MAAM,iBAAiB,CAAC,MAAM,EAAE,KAAK,IAAI;KAC5C,CAAC,IAAI,MAAM,MAAM,GAAG,CAAC,SAAS,MAAM,KAAK,GACtC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,GACzC,CAAC,GACD,MAAM,CAAC,CAAC,CAAC,GACX,MAAM,CAAC,CAAC,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC,SAAS,MAAM,CAAA;CAAE,GACjE,CAAC,GACD,KAAK,CAAC;AAEV;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GAAG,EAAE,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAC7B,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC;IAAE,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;CAAE,CAAC,GACzD,CAAC,GACD,CAAC,SAAS;IAAE,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,OAAO,CAAA;KAAE,CAAA;CAAE,GAC9C,OAAO,SAAS,EAAE,qBAAqB,CAAC;KACrC,CAAC,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC;QAC3D,KAAK,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC,CAAA;SAAE,CAAC;KAC5B,CAAC,GACE,CAAC,GACD,OAAO,CAAC,CAAC,CAAC,SAAS;QAAE,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GACpC,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC;QAAE,KAAK,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC,GAC3D,CAAC,GACD,SAAS,GACX,SAAS;CAChB,CAAC,GACF,SAAS,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/core",
   "description": "Core utilities for building navigators",
-  "version": "7.13.7",
+  "version": "8.0.0-alpha.0",
   "keywords": [
     "react",
     "react-native",
@@ -40,30 +40,30 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/routers": "^7.5.3",
+    "@react-navigation/routers": "^8.0.0-alpha.0",
     "escape-string-regexp": "^4.0.0",
     "fast-deep-equal": "^3.1.3",
     "nanoid": "^3.3.11",
     "query-string": "^7.1.3",
     "react-is": "^19.1.0",
-    "use-latest-callback": "^0.2.4",
+    "use-latest-callback": "^0.3.2",
     "use-sync-external-store": "^1.5.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
     "@testing-library/react-native": "^13.2.1",
-    "@types/react": "~19.0.10",
+    "@types/react": "~19.1.10",
     "@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.1.0",
-    "react-native-builder-bob": "^0.40.17",
+    "react-native-builder-bob": "^0.40.12",
     "react-test-renderer": "19.1.0",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "react": ">= 18.2.0"
+    "react": ">= 19.0.0"
   },
   "react-native-builder-bob": {
     "source": "src",
@@ -83,5 +83,5 @@
       ]
     ]
   },
-  "gitHead": "2b7ee0d2d1b1ef0390b690f59c0c1dd8bd57e9eb"
+  "gitHead": "46daae524ec6a59737147ed506222dd09a5b6e39"
 }

package/src/BaseNavigationContainer.tsx

@@ -13,7 +13,6 @@ import useLatestCallback from 'use-latest-callback';
 import { checkDuplicateRouteNames } from './checkDuplicateRouteNames';
 import { checkSerializable } from './checkSerializable';
 import { NOT_INITIALIZED_ERROR } from './createNavigationContainerRef';
-import { DeprecatedNavigationInChildContext } from './DeprecatedNavigationInChildContext';
 import { EnsureSingleNavigator } from './EnsureSingleNavigator';
 import { findFocusedRoute } from './findFocusedRoute';
 import { NavigationBuilderContext } from './NavigationBuilderContext';
@@ -88,7 +87,6 @@ export const BaseNavigationContainer = React.forwardRef(
       onStateChange,
       onReady,
       onUnhandledAction,
-      navigationInChildEnabled = false,
       theme,
       children,
     }: NavigationContainerProps,
@@ -450,13 +448,9 @@ export const BaseNavigationContainer = React.forwardRef(
               <UnhandledActionContext.Provider
                 value={onUnhandledAction ?? defaultOnUnhandledAction}
               >
-                <DeprecatedNavigationInChildContext.Provider
-                  value={navigationInChildEnabled}
-                >
-                  <EnsureSingleNavigator>
-                    <ThemeProvider value={theme}>{children}</ThemeProvider>
-                  </EnsureSingleNavigator>
-                </DeprecatedNavigationInChildContext.Provider>
+                <EnsureSingleNavigator>
+                  <ThemeProvider value={theme}>{children}</ThemeProvider>
+                </EnsureSingleNavigator>
               </UnhandledActionContext.Provider>
             </NavigationStateContext.Provider>
           </NavigationBuilderContext.Provider>

package/src/NavigationIndependentTree.tsx

@@ -1,8 +1,12 @@
 import * as React from 'react';
 
-import { NavigationContext } from './NavigationContext';
 import { NavigationIndependentTreeContext } from './NavigationIndependentTreeContext';
-import { NavigationRouteContext } from './NavigationRouteContext';
+import {
+  NamedRouteContextListContext,
+  NavigationContext,
+  NavigationRouteContext,
+  NavigationRouteNameContext,
+} from './NavigationProvider';
 
 /**
  * Component to make the child navigation container independent of parent containers.
@@ -14,12 +18,16 @@ 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}>
-        <NavigationIndependentTreeContext.Provider value>
-          {children}
-        </NavigationIndependentTreeContext.Provider>
-      </NavigationContext.Provider>
-    </NavigationRouteContext.Provider>
+    <NamedRouteContextListContext.Provider value={undefined}>
+      <NavigationRouteContext.Provider value={undefined}>
+        <NavigationContext.Provider value={undefined}>
+          <NavigationRouteNameContext.Provider value={undefined}>
+            <NavigationIndependentTreeContext.Provider value={true}>
+              {children}
+            </NavigationIndependentTreeContext.Provider>
+          </NavigationRouteNameContext.Provider>
+        </NavigationContext.Provider>
+      </NavigationRouteContext.Provider>
+    </NamedRouteContextListContext.Provider>
   );
 }

package/src/NavigationProvider.tsx

@@ -0,0 +1,64 @@
+import type { ParamListBase, Route } from '@react-navigation/routers';
+import * as React from 'react';
+
+import type { NavigationProp } from './types';
+import { useLazyValue } from './useLazyValue';
+
+/**
+ * Context which holds the route prop for a screen.
+ */
+export const NavigationRouteContext = React.createContext<
+  Route<string> | undefined
+>(undefined);
+
+/**
+ * Context which holds the navigation prop for a screen.
+ */
+export const NavigationContext = React.createContext<
+  NavigationProp<ParamListBase> | undefined
+>(undefined);
+
+export const NavigationRouteNameContext = React.createContext<
+  string | undefined
+>(undefined);
+
+type Props = {
+  route: Route<string>;
+  navigation: NavigationProp<ParamListBase>;
+  children: React.ReactNode;
+};
+
+/**
+ * Component to provide the navigation and route contexts to its children.
+ */
+export const NamedRouteContextListContext = React.createContext<
+  Record<string, React.Context<Route<string>>> | undefined
+>(undefined);
+
+export function NavigationProvider({ route, navigation, children }: Props) {
+  const NamedRouteContext = useLazyValue(() => React.createContext(route));
+
+  const parents = React.use(NamedRouteContextListContext);
+
+  const NamedRouteContextList = React.useMemo(
+    () => ({
+      ...parents,
+      [route.name]: NamedRouteContext,
+    }),
+    [NamedRouteContext, parents, route.name]
+  );
+
+  return (
+    <NamedRouteContextListContext.Provider value={NamedRouteContextList}>
+      <NamedRouteContext.Provider value={route}>
+        <NavigationRouteContext.Provider value={route}>
+          <NavigationContext.Provider value={navigation}>
+            <NavigationRouteNameContext.Provider value={route.name}>
+              {children}
+            </NavigationRouteNameContext.Provider>
+          </NavigationContext.Provider>
+        </NavigationRouteContext.Provider>
+      </NamedRouteContext.Provider>
+    </NamedRouteContextListContext.Provider>
+  );
+}

package/src/PreventRemoveProvider.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import useLatestCallback from 'use-latest-callback';
 
 import { NavigationHelpersContext } from './NavigationHelpersContext';
-import { NavigationRouteContext } from './NavigationRouteContext';
+import { NavigationRouteContext } from './NavigationProvider';
 import {
   type PreventedRoutes,
   PreventRemoveContext,

package/src/SceneView.tsx

@@ -19,13 +19,7 @@ import { useOptionsGetters } from './useOptionsGetters';
 
 type Props<State extends NavigationState, ScreenOptions extends {}> = {
   screen: RouteConfigComponent<ParamListBase, string> & { name: string };
-  navigation: NavigationProp<
-    ParamListBase,
-    string,
-    string | undefined,
-    State,
-    ScreenOptions
-  >;
+  navigation: NavigationProp<ParamListBase, string, State, ScreenOptions>;
   route: Route<string>;
   routeState: NavigationState | PartialState<NavigationState> | undefined;
   getState: () => State;