minor fixes

This commit is contained in:
Clément Le Bihan
2024-01-09 17:13:36 +01:00
parent b5b94adc83
commit dd09827d08
6 changed files with 130 additions and 132 deletions
+3 -3
View File
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/ban-types */
import { NativeStackScreenProps, createNativeStackNavigator } from '@react-navigation/native-stack';
import { NativeStackNavigationProp, NativeStackScreenProps, createNativeStackNavigator } from '@react-navigation/native-stack';
import {
NavigationProp,
ParamListBase,
@@ -174,7 +174,7 @@ type RouteParams<Routes extends Record<string, Route>> = {
type PrivateRoutesParams = RouteParams<typeof protectedRoutes>;
type PublicRoutesParams = RouteParams<typeof publicRoutes>;
type TabsRoutesParams = RouteParams<typeof tabRoutes>;
type AppRouteParams = PrivateRoutesParams &
type AppRouteParams = Omit<PrivateRoutesParams, "Tabs"> & { Tabs: { screen: keyof TabsRoutesParams } } &
PublicRoutesParams &
TabsRoutesParams & { Oops: undefined };
@@ -324,4 +324,4 @@ export const Router = () => {
);
};
export const useNavigation = () => navigationHook<NavigationProp<AppRouteParams>>();
export const useNavigation = () => navigationHook<NativeStackNavigationProp<AppRouteParams>>();