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

Fix issue undefined is not an object evaluating r.default, see https://github.com/aksonov/react-native-router-flux/issues/3124 (#4699)

Browse Source
This commit is contained in:
Erwan Baynaud
2018-09-24 17:56:03 +00:00
committed by Brent Vatne
parent 86ac9b6d5d
commit 103f448883
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/navigators/DrawerNavigator.js
View File

@@ -4,7 +4,7 @@ import SafeAreaView from 'react-native-safe-area-view';
import createNavigator from './createNavigator';
import createNavigationContainer from '../createNavigationContainer';
import TabRouter from '../routers/TabRouter';
import tabRouter from '../routers/TabRouter';
import DrawerScreen from '../views/Drawer/DrawerScreen';
import DrawerView from '../views/Drawer/DrawerView';
import DrawerItems from '../views/Drawer/DrawerNavigatorItems';
@@ -63,8 +63,8 @@ const DrawerNavigator = (routeConfigs, config = {}) => {
...tabsConfig
} = mergedConfig;
const contentRouter = TabRouter(routeConfigs, tabsConfig);
const drawerRouter = TabRouter(
const contentRouter = tabRouter(routeConfigs, tabsConfig);
const drawerRouter = tabRouter(
{
[drawerCloseRoute]: {
screen: createNavigator(contentRouter, routeConfigs, config)(props => (

4
src/navigators/StackNavigator.js
View File

@@ -2,7 +2,7 @@ import React from 'react';
import createNavigationContainer from '../createNavigationContainer';
import createNavigator from './createNavigator';
import CardStackTransitioner from '../views/CardStack/CardStackTransitioner';
import StackRouter from '../routers/StackRouter';
import stackRouter from '../routers/StackRouter';
import NavigationActions from '../NavigationActions';
// A stack navigators props are the intersection between
@@ -33,7 +33,7 @@ export default (routeConfigMap, stackConfig = {}) => {
navigationOptions,
};
const router = StackRouter(routeConfigMap, stackRouterConfig);
const router = stackRouter(routeConfigMap, stackRouterConfig);
// Create a navigator with CardStackTransitioner as the view
const navigator = createNavigator(router, routeConfigMap, stackConfig)(

4
src/navigators/SwitchNavigator.js
View File

@@ -1,11 +1,11 @@
import React from 'react';
import SwitchRouter from '../routers/SwitchRouter';
import switchRouter from '../routers/SwitchRouter';
import SwitchView from '../views/SwitchView/SwitchView';
import createNavigationContainer from '../createNavigationContainer';
import createNavigator from '../navigators/createNavigator';
export default (routeConfigMap, switchConfig = {}) => {
const router = SwitchRouter(routeConfigMap, switchConfig);
const router = switchRouter(routeConfigMap, switchConfig);
const navigator = createNavigator(router, routeConfigMap, switchConfig)(
props => <SwitchView {...props} />

4
src/navigators/TabNavigator.js
View File

@@ -3,7 +3,7 @@ import { Platform } from 'react-native';
import createNavigator from './createNavigator';
import createNavigationContainer from '../createNavigationContainer';
import TabRouter from '../routers/TabRouter';
import tabRouter from '../routers/TabRouter';
import TabView from '../views/TabView/TabView';
import TabBarTop from '../views/TabView/TabBarTop';
import TabBarBottom from '../views/TabView/TabBarBottom';
@@ -28,7 +28,7 @@ const TabNavigator = (routeConfigs, config = {}) => {
...tabsConfig
} = mergedConfig;
const router = TabRouter(routeConfigs, tabsConfig);
const router = tabRouter(routeConfigs, tabsConfig);
const navigator = createNavigator(router, routeConfigs, config)(props => (
<TabView