diff --git a/client/src/navigation/HomeNavigator.js b/client/src/navigation/HomeNavigator.js index 8c6149a3..69e6371f 100644 --- a/client/src/navigation/HomeNavigator.js +++ b/client/src/navigation/HomeNavigator.js @@ -1,5 +1,3 @@ -import React from 'react'; -import PropTypes from 'prop-types'; import { StackNavigator } from 'react-navigation'; import { Root } from '../screens/home'; @@ -31,12 +29,4 @@ const HomeNavigator = StackNavigator( }, ); -// this wrapper exists soley so we can pass the modalNavigation prop down to our child screens -const HomeNavigatorWrapper = ({ screenProps }) => ( - -); -HomeNavigatorWrapper.propTypes = { - screenProps: PropTypes.shape({}), -}; - -export default HomeNavigatorWrapper; +export default HomeNavigator; diff --git a/client/src/navigation/MainNavigator.js b/client/src/navigation/MainNavigator.js index 2e024508..95e862bb 100644 --- a/client/src/navigation/MainNavigator.js +++ b/client/src/navigation/MainNavigator.js @@ -1,7 +1,8 @@ import React, { Component } from 'react'; import { Platform, View } from 'react-native'; import PropTypes from 'prop-types'; -import { TabNavigator } from 'react-navigation'; +import { TabNavigator, NavigationActions } from 'react-navigation'; + import Icon from 'react-native-vector-icons/FontAwesome'; import { graphql, compose } from 'react-apollo'; import { connect } from 'react-redux'; @@ -43,11 +44,21 @@ const MainTabNavigator = TabNavigator( { Home: { screen: HomeNavigator, - navigationOptions: { + navigationOptions: ({ navigation }) => ({ tabBarLabel: 'Home', // eslint-disable-next-line react/prop-types tabBarIcon: ({ tintColor }) => , - }, + tabBarOnPress() { + const resetAction = NavigationActions.reset({ + index: 0, + key: 'Home', + actions: [ + NavigationActions.navigate({ routeName: 'Root' }), + ], + }); + navigation.dispatch(resetAction); + }, + }), }, Groups: { screen: GroupsNavigator,