@react-navigation/core 6.4.7 → 6.4.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/core",
   "description": "Core utilities for building navigators",
-  "version": "6.4.7",
+  "version": "6.4.9",
   "keywords": [
     "react",
     "react-native",
@@ -35,7 +35,7 @@
     "clean": "del lib"
   },
   "dependencies": {
-    "@react-navigation/routers": "^6.1.7",
+    "@react-navigation/routers": "^6.1.9",
     "escape-string-regexp": "^4.0.0",
     "nanoid": "^3.1.23",
     "query-string": "^7.1.3",
@@ -44,14 +44,14 @@
   },
   "devDependencies": {
     "@testing-library/react-native": "^11.5.0",
-    "@types/react": "~18.0.0",
+    "@types/react": "~18.0.27",
     "@types/react-is": "^17.0.0",
-    "del-cli": "^3.0.1",
+    "del-cli": "^5.0.0",
     "immer": "^9.0.2",
-    "react": "18.0.0",
-    "react-native-builder-bob": "^0.20.3",
-    "react-test-renderer": "18.0.0",
-    "typescript": "^4.7.4"
+    "react": "18.2.0",
+    "react-native-builder-bob": "^0.20.4",
+    "react-test-renderer": "18.1.0",
+    "typescript": "^4.9.4"
   },
   "peerDependencies": {
     "react": "*"
@@ -70,5 +70,5 @@
       ]
     ]
   },
-  "gitHead": "f2a05ec1634bc60302e9f6bd6cd2fb36083fb7c5"
+  "gitHead": "cf836cb84932638369f7bf59534d5a3ccea9b4f6"
 }

package/src/checkDuplicateRouteNames.tsx

@@ -7,7 +7,7 @@ export default function checkDuplicateRouteNames(state: NavigationState) {
     location: string,
     state: NavigationState | PartialState<NavigationState>
   ) => {
-    state.routes.forEach((route: typeof state.routes[0]) => {
+    state.routes.forEach((route: (typeof state.routes)[0]) => {
       const currentLocation = location
         ? `${location} > ${route.name}`
         : route.name;

package/src/getPathFromState.tsx

@@ -9,7 +9,7 @@ import fromEntries from './fromEntries';
 import type { PathConfig, PathConfigMap } from './types';
 import validatePathConfig from './validatePathConfig';
 
-type Options<ParamList> = {
+type Options<ParamList extends {}> = {
   initialRouteName?: string;
   screens: PathConfigMap<ParamList>;
 };

package/src/types.tsx

@@ -702,7 +702,7 @@ export type PathConfig<ParamList extends {}> = {
 export type PathConfigMap<ParamList extends {}> = {
   [RouteName in keyof ParamList]?: NonNullable<
     ParamList[RouteName]
-  > extends NavigatorScreenParams<infer T, any>
+  > extends NavigatorScreenParams<infer T extends {}>
     ? string | PathConfig<T>
     : string | Omit<PathConfig<{}>, 'screens' | 'initialRouteName'>;
 };

package/src/useDescriptors.tsx

@@ -177,6 +177,7 @@ export default function useDescriptors<
       (acc, curr) =>
         Object.assign(
           acc,
+          // @ts-expect-error: we check for function but TS still complains
           typeof curr !== 'function' ? curr : curr({ route, navigation })
         ),
       {} as ScreenOptions

package/src/useNavigationBuilder.tsx

@@ -153,7 +153,12 @@ const getRouteConfigsFromChildren = <
           ? `'${
               typeof child.type === 'string' ? child.type : child.type?.name
             }'${
-              child.props?.name ? ` for the screen '${child.props.name}'` : ''
+              child.props != null &&
+              typeof child.props === 'object' &&
+              'name' in child.props &&
+              child.props?.name
+                ? ` for the screen '${child.props.name}'`
+                : ''
             }`
           : typeof child === 'object'
           ? JSON.stringify(child)