fix: remove NonNullable to fix recursive infer in PathConfigMap

react-navigation · Apr 26, 2024 · 2a1e73e · 2a1e73e
1 parent d0abdee
commit 2a1e73e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/example/src/Screens/NotFound.tsx b/example/src/Screens/NotFound.tsx
@@ -14,7 +14,7 @@ export const NotFound = ({
       <Text style={styles.title}>404 Not Found ({route.path})</Text>
       <Button
         variant="filled"
-        onPress={() => navigation.navigate('Home')}
+        onPress={() => navigation.navigate('Home', { screen: 'Examples' })}
         style={styles.button}
       >
         Go to home

diff --git a/example/src/screens.tsx b/example/src/screens.tsx
@@ -76,7 +76,7 @@ export type RootDrawerParamList = {
 };
 
 export type RootStackParamList = ExampleScreensParamList & {
-  Home: NavigatorScreenParams<RootDrawerParamList> | undefined;
+  Home: NavigatorScreenParams<RootDrawerParamList>;
   NotFound: undefined;
 };
 

diff --git a/packages/core/src/types.tsx b/packages/core/src/types.tsx
@@ -1005,9 +1005,9 @@ export type PathConfig<ParamList extends {}> = {
 };
 
 export type PathConfigMap<ParamList extends {}> = {
-  [RouteName in keyof ParamList]?: NonNullable<
-    ParamList[RouteName]
-  > extends NavigatorScreenParams<infer T extends {}>
+  [RouteName in keyof ParamList]?: ParamList[RouteName] extends NavigatorScreenParams<
+    infer T
+  >
     ? string | PathConfig<T>
     : string | Omit<PathConfig<{}>, 'screens' | 'initialRouteName'>;
 };