kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-13 17:47:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix type signature for setParams (#24)

Browse Source
This commit is contained in:
Satyajit Sahoo
2019-07-23 00:53:38 +02:00
committed by GitHub
parent d3e200d727
commit 30b8fb26b1
9 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
example/StackNavigator.tsx
View File

@@ -36,8 +36,9 @@ export type StackNavigationOptions = {
};
export type StackNavigationProp<
ParamList extends ParamListBase
> = NavigationProp<ParamList, StackNavigationOptions> & {
ParamList extends ParamListBase,
RouteName extends keyof ParamList = string
> = NavigationProp<ParamList, RouteName, StackNavigationOptions> & {
/**
* Push a new screen onto the stack.
*

8
example/TabNavigator.tsx
View File

@@ -29,10 +29,10 @@ export type TabNavigationOptions = {
title?: string;
};
export type TabNavigationProp<ParamList extends ParamListBase> = NavigationProp<
ParamList,
TabNavigationOptions
> & {
export type TabNavigationProp<
ParamList extends ParamListBase,
RouteName extends keyof ParamList = string
> = NavigationProp<ParamList, RouteName, TabNavigationOptions> & {
/**
* Jump to an existing tab.
*

14
example/index.tsx
View File

@@ -3,7 +3,7 @@ import { render } from 'react-dom';
import {
NavigationContainer,
CompositeNavigationProp,
NavigationProp,
NavigationHelpers,
RouteProp,
InitialState,
} from '../src';
@@ -30,8 +30,8 @@ const First = ({
route,
}: {
navigation: CompositeNavigationProp<
StackNavigationProp<StackParamList>,
NavigationProp<TabParamList>
StackNavigationProp<StackParamList, 'first'>,
NavigationHelpers<TabParamList>
>;
route: RouteProp<StackParamList, 'first'>;
}) => (
@@ -62,8 +62,8 @@ const Second = ({
navigation,
}: {
navigation: CompositeNavigationProp<
StackNavigationProp<StackParamList>,
NavigationProp<TabParamList>
StackNavigationProp<StackParamList, 'second'>,
NavigationHelpers<TabParamList>
>;
}) => {
const [count, setCount] = React.useState(0);
@@ -98,7 +98,7 @@ const Fourth = ({
navigation,
}: {
navigation: CompositeNavigationProp<
TabNavigationProp<TabParamList>,
TabNavigationProp<TabParamList, 'fourth'>,
StackNavigationProp<StackParamList>
>;
}) => (
@@ -123,7 +123,7 @@ const Fifth = ({
navigation,
}: {
navigation: CompositeNavigationProp<
TabNavigationProp<TabParamList>,
TabNavigationProp<TabParamList, 'fifth'>,
StackNavigationProp<StackParamList>
>;
}) => (