refactor: hide config stuff in TypedNavigator (#11889)

react-navigation · Mar 12, 2024 · 8810790 · 8810790
1 parent afaa789
commit 8810790
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 35 deletions.
diff --git a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx
@@ -91,10 +91,9 @@ export function createBottomTabNavigator<
     };
     Navigator: typeof BottomTabNavigator;
   },
-  Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,
->(
-  config?: Config
-): TypedNavigator<TypeBag> &
-  (typeof config extends undefined ? {} : { config: Config }) {
+  Config extends StaticConfig<TypeBag> | undefined =
+    | StaticConfig<TypeBag>
+    | undefined,
+>(config?: Config): TypedNavigator<TypeBag, Config> {
   return createNavigatorFactory(BottomTabNavigator)(config);
 }
diff --git a/packages/core/src/types.tsx b/packages/core/src/types.tsx
@@ -861,16 +861,20 @@ export type NavigatorTypeBag<
   Navigator: Navigator;
 };
 
-export type TypedNavigator<Bag extends NavigatorTypeBagBase> =
-  TypedNavigatorInternal<
-    Bag['ParamList'],
-    Bag['NavigatorID'],
-    Bag['State'],
-    Bag['ScreenOptions'],
-    Bag['EventMap'],
-    Bag['NavigationList'],
-    Bag['Navigator']
-  >;
+export type TypedNavigator<
+  Bag extends NavigatorTypeBagBase,
+  Config = unknown,
+> = TypedNavigatorInternal<
+  Bag['ParamList'],
+  Bag['NavigatorID'],
+  Bag['State'],
+  Bag['ScreenOptions'],
+  Bag['EventMap'],
+  Bag['NavigationList'],
+  Bag['Navigator']
+> & {
+  config: undefined extends Config ? unknown : Config;
+};
 
 type TypedNavigatorInternal<
   ParamList extends ParamListBase,

diff --git a/packages/drawer/src/navigators/createDrawerNavigator.tsx b/packages/drawer/src/navigators/createDrawerNavigator.tsx
@@ -94,10 +94,9 @@ export function createDrawerNavigator<
     };
     Navigator: typeof DrawerNavigator;
   },
-  Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,
->(
-  config?: Config
-): TypedNavigator<TypeBag> &
-  (typeof config extends undefined ? {} : { config: Config }) {
+  Config extends StaticConfig<TypeBag> | undefined =
+    | StaticConfig<TypeBag>
+    | undefined,
+>(config?: Config): TypedNavigator<TypeBag, Config> {
   return createNavigatorFactory(DrawerNavigator)(config);
 }
diff --git a/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx b/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx
@@ -91,10 +91,9 @@ export function createMaterialTopTabNavigator<
     };
     Navigator: typeof MaterialTopTabNavigator;
   },
-  Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,
->(
-  config?: Config
-): TypedNavigator<TypeBag> &
-  (typeof config extends undefined ? {} : { config: Config }) {
+  Config extends StaticConfig<TypeBag> | undefined =
+    | StaticConfig<TypeBag>
+    | undefined,
+>(config?: Config): TypedNavigator<TypeBag, Config> {
   return createNavigatorFactory(MaterialTopTabNavigator)(config);
 }
diff --git a/packages/native-stack/src/navigators/createNativeStackNavigator.tsx b/packages/native-stack/src/navigators/createNativeStackNavigator.tsx
@@ -105,10 +105,9 @@ export function createNativeStackNavigator<
     };
     Navigator: typeof NativeStackNavigator;
   },
-  Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,
->(
-  config?: Config
-): TypedNavigator<TypeBag> &
-  (typeof config extends undefined ? {} : { config: Config }) {
+  Config extends StaticConfig<TypeBag> | undefined =
+    | StaticConfig<TypeBag>
+    | undefined,
+>(config?: Config): TypedNavigator<TypeBag, Config> {
   return createNavigatorFactory(NativeStackNavigator)(config);
 }
diff --git a/packages/stack/src/navigators/createStackNavigator.tsx b/packages/stack/src/navigators/createStackNavigator.tsx
@@ -124,10 +124,9 @@ export function createStackNavigator<
     };
     Navigator: typeof StackNavigator;
   },
-  Config extends StaticConfig<TypeBag> = StaticConfig<TypeBag>,
->(
-  config?: Config
-): TypedNavigator<TypeBag> &
-  (typeof config extends undefined ? {} : { config: Config }) {
+  Config extends StaticConfig<TypeBag> | undefined =
+    | StaticConfig<TypeBag>
+    | undefined,
+>(config?: Config): TypedNavigator<TypeBag, Config> {
   return createNavigatorFactory(StackNavigator)(config);
 }