New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue undefined is not an object evaluating r.default #4699

Merged
merged 1 commit into from Sep 24, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+9 −9
Diff settings

Always

Just for now

@@ -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 => (
@@ -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)(
@@ -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} />
@@ -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
ProTip! Use n and p to navigate between commits in a pull request.