Fix useNavigation params typing

This fix react-navigation#49
Aure77 · Nov 18, 2019 · 35233e9 · 35233e9
1 parent 0b08542
commit 35233e9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Hooks.ts b/src/Hooks.ts
@@ -17,7 +17,10 @@ import {
   EventType,
 } from 'react-navigation';
 
-export function useNavigation<S>(): NavigationScreenProp<S & NavigationRoute> {
+export function useNavigation<S, P = NavigationParams>(): NavigationScreenProp<
+  S & NavigationRoute,
+  P
+> {
   const navigation = useContext(NavigationContext) as any; // TODO typing?
   if (!navigation) {
     throw new Error(
@@ -32,7 +35,7 @@ export function useNavigation<S>(): NavigationScreenProp<S & NavigationRoute> {
 export function useNavigationParam<T extends keyof NavigationParams>(
   paramName: T
 ) {
-  return useNavigation().getParam(paramName);
+  return useNavigation().getParam(paramName); // TODO typing ?
 }
 
 export function useNavigationState() {

diff --git a/src/__tests__/Hooks.test.tsx b/src/__tests__/Hooks.test.tsx
@@ -19,17 +19,23 @@ import {
 
 interface DetailsScreenParams {
   from: string;
+  id: number;
 }
 
 const HomeScreen = () => {
   const { navigate } = useNavigation();
-  const params: DetailsScreenParams = { from: 'Home' };
+  const params: DetailsScreenParams = { from: 'Home', id: 1 };
   return navigate('Details', params);
 };
 
 const DetailsScreen = () => {
   const from = useNavigationParam('from');
-  return <p>{from}</p>;
+  const id = useNavigation<unknown, DetailsScreenParams>().getParam('id');
+  return (
+    <p>
+      {from}:{id}
+    </p>
+  );
 };
 
 const OtherScreen = () => {
@@ -102,7 +108,7 @@ describe('AppNavigator1 Stack', () => {
 
   it('useNavigationParam: Get passed parameter', () => {
     const children = navigationContainer.toJSON().children;
-    expect(children).toContain('Home');
+    expect(children).toStrictEqual(['Home', ':', '1']);
   });
 
   afterEach(() => {