diff --git a/src/navigators/DrawerNavigator.js b/src/navigators/DrawerNavigator.js index 04c6091a05..711499e85a 100644 --- a/src/navigators/DrawerNavigator.js +++ b/src/navigators/DrawerNavigator.js @@ -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 => ( diff --git a/src/navigators/StackNavigator.js b/src/navigators/StackNavigator.js index 0994132428..196792d6bf 100644 --- a/src/navigators/StackNavigator.js +++ b/src/navigators/StackNavigator.js @@ -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)( diff --git a/src/navigators/SwitchNavigator.js b/src/navigators/SwitchNavigator.js index 752f38b9b3..0e741f76e9 100644 --- a/src/navigators/SwitchNavigator.js +++ b/src/navigators/SwitchNavigator.js @@ -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 => diff --git a/src/navigators/TabNavigator.js b/src/navigators/TabNavigator.js index 623a806a2b..36cdf29750 100644 --- a/src/navigators/TabNavigator.js +++ b/src/navigators/TabNavigator.js @@ -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 => (