refactor: simplify navigation list type

react-navigation · Mar 11, 2024 · 3e4373e · 3e4373e
1 parent 4550e64
commit 3e4373e
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 105 deletions.
diff --git a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx
@@ -72,6 +72,17 @@ function BottomTabNavigator({
   );
 }
 
+type BottomTabNavigationList<
+  ParamList extends ParamListBase,
+  NavigatorID extends string | undefined,
+> = {
+  [RouteName in keyof ParamList]: BottomTabNavigationProp<
+    ParamList,
+    RouteName,
+    NavigatorID
+  >;
+};
+
 export function createBottomTabNavigator<
   ParamList extends ParamListBase,
   NavigatorID extends string | undefined = undefined,
@@ -81,13 +92,7 @@ export function createBottomTabNavigator<
   TabNavigationState<ParamList>,
   BottomTabNavigationOptions,
   BottomTabNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: BottomTabNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  BottomTabNavigationList<ParamList, NavigatorID>,
   typeof BottomTabNavigator
 >;
 
@@ -100,13 +105,7 @@ export function createBottomTabNavigator<
     TabNavigationState<ParamList>,
     BottomTabNavigationOptions,
     BottomTabNavigationEventMap,
-    {
-      [RouteName in keyof ParamList]: BottomTabNavigationProp<
-        ParamList,
-        RouteName,
-        NavigatorID
-      >;
-    },
+    BottomTabNavigationList<ParamList, NavigatorID>,
     typeof BottomTabNavigator
   >,
 >(
@@ -117,13 +116,7 @@ export function createBottomTabNavigator<
   TabNavigationState<ParamList>,
   BottomTabNavigationOptions,
   BottomTabNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: BottomTabNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  BottomTabNavigationList<ParamList, NavigatorID>,
   typeof BottomTabNavigator
 > & { config: Config };
 

diff --git a/packages/drawer/src/navigators/createDrawerNavigator.tsx b/packages/drawer/src/navigators/createDrawerNavigator.tsx
@@ -75,6 +75,17 @@ function DrawerNavigator({
   );
 }
 
+type DrawerNavigationList<
+  ParamList extends ParamListBase,
+  NavigatorID extends string | undefined,
+> = {
+  [RouteName in keyof ParamList]: DrawerNavigationProp<
+    ParamList,
+    RouteName,
+    NavigatorID
+  >;
+};
+
 export function createDrawerNavigator<
   ParamList extends ParamListBase,
   NavigatorID extends string | undefined = undefined,
@@ -84,13 +95,7 @@ export function createDrawerNavigator<
   DrawerNavigationState<ParamList>,
   DrawerNavigationOptions,
   DrawerNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: DrawerNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  DrawerNavigationList<ParamList, NavigatorID>,
   typeof DrawerNavigator
 >;
 
@@ -103,13 +108,7 @@ export function createDrawerNavigator<
     DrawerNavigationState<ParamList>,
     DrawerNavigationOptions,
     DrawerNavigationEventMap,
-    {
-      [RouteName in keyof ParamList]: DrawerNavigationProp<
-        ParamList,
-        RouteName,
-        NavigatorID
-      >;
-    },
+    DrawerNavigationList<ParamList, NavigatorID>,
     typeof DrawerNavigator
   >,
 >(
@@ -120,13 +119,7 @@ export function createDrawerNavigator<
   DrawerNavigationState<ParamList>,
   DrawerNavigationOptions,
   DrawerNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: DrawerNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  DrawerNavigationList<ParamList, NavigatorID>,
   typeof DrawerNavigator
 > & { config: Config };
 

diff --git a/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx b/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx
@@ -72,6 +72,17 @@ function MaterialTopTabNavigator({
   );
 }
 
+type MaterialTopTabStackNavigationList<
+  ParamList extends ParamListBase,
+  NavigatorID extends string | undefined,
+> = {
+  [RouteName in keyof ParamList]: MaterialTopTabNavigationProp<
+    ParamList,
+    RouteName,
+    NavigatorID
+  >;
+};
+
 export function createMaterialTopTabNavigator<
   ParamList extends ParamListBase,
   NavigatorID extends string | undefined = undefined,
@@ -81,13 +92,7 @@ export function createMaterialTopTabNavigator<
   TabNavigationState<ParamList>,
   MaterialTopTabNavigationOptions,
   MaterialTopTabNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: MaterialTopTabNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  MaterialTopTabStackNavigationList<ParamList, NavigatorID>,
   typeof MaterialTopTabNavigator
 >;
 
@@ -100,13 +105,7 @@ export function createMaterialTopTabNavigator<
     TabNavigationState<ParamList>,
     MaterialTopTabNavigationOptions,
     MaterialTopTabNavigationEventMap,
-    {
-      [RouteName in keyof ParamList]: MaterialTopTabNavigationProp<
-        ParamList,
-        RouteName,
-        NavigatorID
-      >;
-    },
+    MaterialTopTabStackNavigationList<ParamList, NavigatorID>,
     typeof MaterialTopTabNavigator
   >,
 >(
@@ -117,13 +116,7 @@ export function createMaterialTopTabNavigator<
   TabNavigationState<ParamList>,
   MaterialTopTabNavigationOptions,
   MaterialTopTabNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: MaterialTopTabNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  MaterialTopTabStackNavigationList<ParamList, NavigatorID>,
   typeof MaterialTopTabNavigator
 > & { config: Config };
 

diff --git a/packages/native-stack/src/navigators/createNativeStackNavigator.tsx b/packages/native-stack/src/navigators/createNativeStackNavigator.tsx
@@ -86,6 +86,17 @@ function NativeStackNavigator({
   );
 }
 
+type NativeStackNavigationList<
+  ParamList extends ParamListBase,
+  NavigatorID extends string | undefined,
+> = {
+  [RouteName in keyof ParamList]: NativeStackNavigationProp<
+    ParamList,
+    RouteName,
+    NavigatorID
+  >;
+};
+
 export function createNativeStackNavigator<
   ParamList extends ParamListBase,
   NavigatorID extends string | undefined = undefined,
@@ -95,13 +106,7 @@ export function createNativeStackNavigator<
   StackNavigationState<ParamList>,
   NativeStackNavigationOptions,
   NativeStackNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: NativeStackNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  NativeStackNavigationList<ParamList, NavigatorID>,
   typeof NativeStackNavigator
 >;
 
@@ -114,13 +119,7 @@ export function createNativeStackNavigator<
     StackNavigationState<ParamList>,
     NativeStackNavigationOptions,
     NativeStackNavigationEventMap,
-    {
-      [RouteName in keyof ParamList]: NativeStackNavigationProp<
-        ParamList,
-        RouteName,
-        NavigatorID
-      >;
-    },
+    NativeStackNavigationList<ParamList, NavigatorID>,
     typeof NativeStackNavigator
   >,
 >(
@@ -131,13 +130,7 @@ export function createNativeStackNavigator<
   StackNavigationState<ParamList>,
   NativeStackNavigationOptions,
   NativeStackNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: NativeStackNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  NativeStackNavigationList<ParamList, NavigatorID>,
   typeof NativeStackNavigator
 > & { config: Config };
 

diff --git a/packages/stack/src/navigators/createStackNavigator.tsx b/packages/stack/src/navigators/createStackNavigator.tsx
@@ -105,6 +105,17 @@ function StackNavigator({
   );
 }
 
+type StackNavigationList<
+  ParamList extends ParamListBase,
+  NavigatorID extends string | undefined,
+> = {
+  [RouteName in keyof ParamList]: StackNavigationProp<
+    ParamList,
+    RouteName,
+    NavigatorID
+  >;
+};
+
 export function createStackNavigator<
   ParamList extends ParamListBase,
   NavigatorID extends string | undefined = undefined,
@@ -114,13 +125,7 @@ export function createStackNavigator<
   StackNavigationState<ParamList>,
   StackNavigationOptions,
   StackNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: StackNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  StackNavigationList<ParamList, NavigatorID>,
   typeof StackNavigator
 >;
 
@@ -133,13 +138,7 @@ export function createStackNavigator<
     StackNavigationState<ParamList>,
     StackNavigationOptions,
     StackNavigationEventMap,
-    {
-      [RouteName in keyof ParamList]: StackNavigationProp<
-        ParamList,
-        RouteName,
-        NavigatorID
-      >;
-    },
+    StackNavigationList<ParamList, NavigatorID>,
     typeof StackNavigator
   >,
 >(
@@ -150,13 +149,7 @@ export function createStackNavigator<
   StackNavigationState<ParamList>,
   StackNavigationOptions,
   StackNavigationEventMap,
-  {
-    [RouteName in keyof ParamList]: StackNavigationProp<
-      ParamList,
-      RouteName,
-      NavigatorID
-    >;
-  },
+  StackNavigationList<ParamList, NavigatorID>,
   typeof StackNavigator
 > & { config: Config };