kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-03-29 00:38:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken references to context

Browse Source
This commit is contained in:
Eric Vicenti
2018-10-29 23:10:04 -07:00
parent 04c40bb0b2
commit b039101470
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/src/views/NavigationConsumer.js
View File

@@ -1,3 +1,5 @@
import { NavigationConsumer } from './NavigationContext';
import NavigationContext from './NavigationContext';
export default NavigationConsumer;
const { Consumer } = NavigationContext;
export default Consumer;

6
packages/core/src/views/NavigationProvider.js
View File

@@ -1,3 +1,5 @@
import { NavigationProvider } from './NavigationContext';
import NavigationContext from './NavigationContext';
export default NavigationProvider;
const { Provider } = NavigationContext;
export default Provider;

6
packages/core/src/views/SceneView.js
View File

@@ -1,13 +1,13 @@
import React from 'react';
import { NavigationProvider } from './NavigationContext';
import NavigationContext from './NavigationContext';
export default class SceneView extends React.PureComponent {
render() {
const { screenProps, component: Component, navigation } = this.props;
return (
<NavigationProvider value={navigation}>
<NavigationContext.Provider value={navigation}>
<Component screenProps={screenProps} navigation={navigation} />
</NavigationProvider>
</NavigationContext.Provider>
);
}
}

6
packages/core/src/views/__tests__/NavigationEvents-test.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import renderer from 'react-test-renderer';
import NavigationEvents from '../NavigationEvents';
import { NavigationProvider } from '../NavigationContext';
import NavigationContext from '../NavigationContext';
const createListener = () => () => {};
@@ -72,9 +72,9 @@ const NavigationEventsTestComp = ({
}) => {
if (withContext) {
return (
<NavigationProvider value={navigation}>
<NavigationContext.Provider value={navigation}>
<NavigationEvents {...props} />
</NavigationProvider>
</NavigationContext.Provider>
);
} else {
return <NavigationEvents navigation={navigation} {...props} />;

6
packages/core/src/views/withNavigation.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import hoistStatics from 'hoist-non-react-statics';
import invariant from '../utils/invariant';
import { NavigationConsumer } from './NavigationContext';
import NavigationContext from './NavigationContext';
export default function withNavigation(Component) {
class ComponentWithNavigation extends React.Component {
@@ -11,7 +11,7 @@ export default function withNavigation(Component) {
render() {
const navigationProp = this.props.navigation;
return (
<NavigationConsumer>
<NavigationContext.Consumer>
{navigationContext => {
const navigation = navigationProp || navigationContext;
invariant(
@@ -26,7 +26,7 @@ export default function withNavigation(Component) {
/>
);
}}
</NavigationConsumer>
</NavigationContext.Consumer>
);
}
}