diff --git a/packages/bottom-tabs/src/types.tsx b/packages/bottom-tabs/src/types.tsx index 60aeb76048..7885794cf9 100644 --- a/packages/bottom-tabs/src/types.tsx +++ b/packages/bottom-tabs/src/types.tsx @@ -53,8 +53,8 @@ export type BottomTabNavigationProp< * @param [params] Params object for the route. */ jumpTo>( - ...args: ParamList[RouteName] extends void - ? [RouteName] + ...args: ParamList[RouteName] extends (undefined | any) + ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] ): void; }; diff --git a/packages/core/src/types.tsx b/packages/core/src/types.tsx index 049323757b..bda1ceb06a 100644 --- a/packages/core/src/types.tsx +++ b/packages/core/src/types.tsx @@ -274,8 +274,8 @@ type NavigationHelpersCommon< * @param [params] Params object for the route. */ navigate( - ...args: ParamList[RouteName] extends undefined - ? [RouteName] | [RouteName, undefined] + ...args: ParamList[RouteName] extends (undefined | any) + ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] ): void; @@ -298,7 +298,7 @@ type NavigationHelpersCommon< */ replace( ...args: ParamList[RouteName] extends undefined - ? [RouteName] | [RouteName, undefined] + ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] ): void; diff --git a/packages/material-bottom-tabs/src/types.tsx b/packages/material-bottom-tabs/src/types.tsx index 51270a2bd8..0414945f05 100644 --- a/packages/material-bottom-tabs/src/types.tsx +++ b/packages/material-bottom-tabs/src/types.tsx @@ -36,8 +36,8 @@ export type MaterialBottomTabNavigationProp< * @param [params] Params object for the route. */ jumpTo>( - ...args: ParamList[RouteName] extends void - ? [RouteName] + ...args: ParamList[RouteName] extends (undefined | any) + ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] ): void; }; diff --git a/packages/material-top-tabs/src/types.tsx b/packages/material-top-tabs/src/types.tsx index 5ee0730a48..25e622c56b 100644 --- a/packages/material-top-tabs/src/types.tsx +++ b/packages/material-top-tabs/src/types.tsx @@ -50,8 +50,8 @@ export type MaterialTopTabNavigationProp< * @param [params] Params object for the route. */ jumpTo>( - ...args: ParamList[RouteName] extends void - ? [RouteName] + ...args: ParamList[RouteName] extends (undefined | any) + ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] ): void; }; diff --git a/packages/stack/src/types.tsx b/packages/stack/src/types.tsx index 74085f5b84..e0564e2259 100644 --- a/packages/stack/src/types.tsx +++ b/packages/stack/src/types.tsx @@ -47,8 +47,8 @@ export type StackNavigationProp< * @param [params] Params object for the route. */ push( - ...args: ParamList[RouteName] extends void - ? [RouteName] + ...args: ParamList[RouteName] extends (undefined | any) + ? [RouteName] | [RouteName, ParamList[RouteName]] : [RouteName, ParamList[RouteName]] ): void;