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

withNavigation improvement (#3834)

Browse Source 
The navigation prop should also pass through, and be prioritized over context because it is more explicit

This also fixes an incorrect warning/invariant
This commit is contained in:
Eric Vicenti
2018-03-25 13:49:09 -04:00
parent 598f18688c
commit b41d268572
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/react-navigation/src/views/withNavigation.js vendored
View File

@@ -10,12 +10,14 @@ export default function withNavigation(Component) {
Component.name})`;
render() {
const navigationProp = this.props.navigation;
return (
<NavigationConsumer>
{navigation => {
{navigationContext => {
const navigation = navigationProp || navigationContext;
invariant(
!!navigation,
'withNavigationFocus can only be used on a view hierarchy of a navigator. The wrapped component is unable to get access to navigation from props or context.'
'withNavigation can only be used on a view hierarchy of a navigator. The wrapped component is unable to get access to navigation from props or context.'
);
return (
<Component