kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-04-24 04:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: change type of the navigation field in DrawerContentComponentProps (#121)

Browse Source
This commit is contained in:
Bryan Kok
2019-10-29 00:46:46 +08:00
parent 2bc25b6771
commit f92d3ed4a8
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/drawer/src/types.tsx
View File

@@ -3,7 +3,6 @@ import {
NavigationState,
NavigationRoute,
NavigationParams,
NavigationProp,
NavigationDescriptor,
SupportedThemes,
NavigationScreenConfig,
@@ -109,7 +108,7 @@ export type DrawerNavigatorItemsProps = {
};
export type DrawerContentComponentProps = DrawerNavigatorItemsProps & {
navigation: NavigationProp<NavigationDrawerState>;
navigation: NavigationScreenProp<NavigationDrawerState>;
descriptors: SceneDescriptorMap;
drawerOpenProgress: Animated.Node<number>;
screenProps: unknown;

5
packages/drawer/src/views/DrawerSidebar.tsx
View File

@@ -3,7 +3,7 @@ import { StyleSheet, View, ViewStyle } from 'react-native';
import {
NavigationActions,
NavigationRoute,
NavigationProp,
NavigationScreenProp,
} from 'react-navigation';
import Animated from 'react-native-reanimated';
import {
@@ -17,7 +17,7 @@ type Props = {
contentComponent?: React.ComponentType<DrawerContentComponentProps>;
contentOptions?: object;
screenProps?: unknown;
navigation: NavigationProp<NavigationDrawerState>;
navigation: NavigationScreenProp<NavigationDrawerState>;
descriptors: SceneDescriptorMap;
drawerOpenProgress: Animated.Node<number>;
drawerPosition: 'left' | 'right';
@@ -73,7 +73,6 @@ class DrawerSidebar extends React.PureComponent<Props> {
focused: boolean;
}) => {
if (focused) {
// @ts-ignore
this.props.navigation.closeDrawer();
} else {
this.props.navigation.dispatch(

4
packages/drawer/src/views/DrawerView.tsx
View File

@@ -4,7 +4,7 @@ import {
SceneView,
ThemeColors,
ThemeContext,
NavigationProp,
NavigationScreenProp,
} from 'react-navigation';
import { ScreenContainer } from 'react-native-screens';
@@ -41,7 +41,7 @@ type DrawerOptions = {
type Props = {
lazy: boolean;
navigation: NavigationProp<NavigationDrawerState>;
navigation: NavigationScreenProp<NavigationDrawerState>;
descriptors: SceneDescriptorMap;
navigationConfig: DrawerOptions & {
contentComponent?: React.ComponentType<DrawerContentComponentProps>;