kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-12 22:30:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug with wrong label&icon in Drawer (#1914)

Browse Source 
* fixed bug with wrong label&icon in Drawer

* itemPress in Drawer now always navigates to first screen of a nested StackRouter

* used eslint formatting

* added comments
This commit is contained in:
Nicolas Beck
2017-07-04 08:26:16 +02:00
parent 20c035ded7
commit feeb77778f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/react-navigation/src/views/Drawer/DrawerSidebar.js vendored
View File

@@ -4,6 +4,7 @@ import React, { PureComponent } from 'react';
import { StyleSheet, View } from 'react-native';
import withCachedChildNavigation from '../../withCachedChildNavigation';
import NavigationActions from '../../NavigationActions';
import type {
NavigationScreenProp,
@@ -44,8 +45,14 @@ class DrawerSidebar extends PureComponent<void, Props, void> {
const DrawerScreen = this.props.router.getComponentForRouteName(
'DrawerClose'
);
const { [routeKey]: childNavigation } = this.props.childNavigationProps;
return DrawerScreen.router.getScreenOptions(
this.props.childNavigationProps[routeKey],
childNavigation.state.index !== undefined // if the child screen is a StackRouter then always show the screen options of its first screen (see #1914)
? {
...childNavigation,
state: { ...childNavigation.state, index: 0 },
}
: childNavigation,
this.props.screenProps
);
};
@@ -78,7 +85,10 @@ class DrawerSidebar extends PureComponent<void, Props, void> {
_onItemPress = ({ route, focused }: DrawerItem) => {
this.props.navigation.navigate('DrawerClose');
if (!focused) {
this.props.navigation.navigate(route.routeName);
const subAction = route.index !== undefined && route.index !== 0 // if the child screen is a StackRouter then always navigate to its first screen (see #1914)
? NavigationActions.navigate({ routeName: route.routes[0].routeName })
: undefined;
this.props.navigation.navigate(route.routeName, undefined, subAction);
}
};