diff --git a/src/navigators/DrawerNavigator.js b/src/navigators/DrawerNavigator.js index c935801..61eb45c 100644 --- a/src/navigators/DrawerNavigator.js +++ b/src/navigators/DrawerNavigator.js @@ -9,8 +9,6 @@ import DrawerView from '../views/Drawer/DrawerView'; import DrawerItems from '../views/Drawer/DrawerNavigatorItems'; import SafeAreaView from '../views/SafeAreaView'; -import NavigatorTypes from './NavigatorTypes'; - // A stack navigators props are the intersection between // the base navigator props (navgiation, screenProps, etc) // and the view's props @@ -66,16 +64,12 @@ const DrawerNavigator = (routeConfigs, config = {}) => { } = mergedConfig; const contentRouter = TabRouter(routeConfigs, tabsConfig); - const drawerRouter = TabRouter( { [drawerCloseRoute]: { - screen: createNavigator( - contentRouter, - routeConfigs, - config, - NavigatorTypes.DRAWER - )(props => ), + screen: createNavigator(contentRouter, routeConfigs, config)(props => ( + + )), }, [drawerOpenRoute]: { screen: () => null, @@ -89,26 +83,23 @@ const DrawerNavigator = (routeConfigs, config = {}) => { } ); - const navigator = createNavigator( - drawerRouter, - routeConfigs, - config, - NavigatorTypes.DRAWER - )(props => ( - - )); + const navigator = createNavigator(drawerRouter, routeConfigs, config)( + props => ( + + ) + ); return createNavigationContainer(navigator); }; diff --git a/src/navigators/NavigatorTypes.js b/src/navigators/NavigatorTypes.js deleted file mode 100644 index 59f297a..0000000 --- a/src/navigators/NavigatorTypes.js +++ /dev/null @@ -1,9 +0,0 @@ -const STACK = 'react-navigation/STACK'; -const TABS = 'react-navigation/TABS'; -const DRAWER = 'react-navigation/DRAWER'; - -export default { - STACK, - TABS, - DRAWER, -}; diff --git a/src/navigators/StackNavigator.js b/src/navigators/StackNavigator.js index 316ffc8..7f2abb2 100644 --- a/src/navigators/StackNavigator.js +++ b/src/navigators/StackNavigator.js @@ -3,7 +3,6 @@ import createNavigationContainer from '../createNavigationContainer'; import createNavigator from './createNavigator'; import CardStackTransitioner from '../views/CardStack/CardStackTransitioner'; import StackRouter from '../routers/StackRouter'; -import NavigatorTypes from './NavigatorTypes'; import NavigationActions from '../NavigationActions'; // A stack navigators props are the intersection between @@ -34,26 +33,23 @@ export default (routeConfigMap, stackConfig = {}) => { const router = StackRouter(routeConfigMap, stackRouterConfig); // Create a navigator with CardStackTransitioner as the view - const navigator = createNavigator( - router, - routeConfigMap, - stackConfig, - NavigatorTypes.STACK - )(props => ( - { - const { state, dispatch } = props.navigation; - dispatch(NavigationActions.completeTransition()); - onTransitionEnd && onTransitionEnd(); - }} - /> - )); + const navigator = createNavigator(router, routeConfigMap, stackConfig)( + props => ( + { + const { state, dispatch } = props.navigation; + dispatch(NavigationActions.completeTransition()); + onTransitionEnd && onTransitionEnd(); + }} + /> + ) + ); return createNavigationContainer(navigator); }; diff --git a/src/navigators/TabNavigator.js b/src/navigators/TabNavigator.js index 6f9f692..f8a3ede 100644 --- a/src/navigators/TabNavigator.js +++ b/src/navigators/TabNavigator.js @@ -8,8 +8,6 @@ import TabView from '../views/TabView/TabView'; import TabBarTop from '../views/TabView/TabBarTop'; import TabBarBottom from '../views/TabView/TabBarBottom'; -import NavigatorTypes from './NavigatorTypes'; - // A tab navigators props are the intersection between // the base navigator props (navgiation, screenProps, etc) // and the view's props @@ -30,12 +28,7 @@ const TabNavigator = (routeConfigs, config = {}) => { const router = TabRouter(routeConfigs, tabsConfig); - const navigator = createNavigator( - router, - routeConfigs, - config, - NavigatorTypes.TABS - )(props => ( + const navigator = createNavigator(router, routeConfigs, config)(props => ( { class Navigator extends React.Component { static router = router; - - static routeConfigs = routeConfigs; - static navigatorConfig = navigatorConfig; - static navigatorType = navigatorType; static navigationOptions = null; render() {