status-im/react-navigation
2
0
Fork 0
mirror of https://github.com/status-im/react-navigation.git synced 2025-02-24 17:18:09 +00:00
Code Issues Projects Releases Wiki Activity

Fixed issue with back button

Browse Source
This commit is contained in:
Matt Hamil 2017-06-06 17:24:13 -05:00
parent 484c729154
commit 7e96ad4189
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/routers/StackRouter.js
View File

@ -140,14 +140,22 @@ export default (
};
}
if (action.type === NavigationActions.NAVIGATE) {
if (passedAction.type === 'Navigation/BACK') {
inProgressNavigationRouteName = null;
}
if (
action.type === NavigationActions.NAVIGATE &&
passedAction.routeName !== 'DrawerOpen' &&
passedAction.routeName !== 'DrawerClose'
) {
// Check if action wants to route to the route that is in-progress navigating
if (
inProgressNavigationRouteName !== null &&
inProgressNavigationRouteName === passedAction.routeName
) {
inProgressNavigationRouteName = null;
return false;
return;
}
inProgressNavigationRouteName = passedAction.routeName;
}
@ -233,6 +241,7 @@ export default (
}
if (action.type === NavigationActions.SET_PARAMS) {
inProgressNavigationRouteName = null;
const lastRoute = state.routes.find(
/* $FlowFixMe */
(route: *) => route.key === action.key
@ -284,6 +293,7 @@ export default (
if (action.type === NavigationActions.BACK) {
let backRouteIndex = null;
inProgressNavigationRouteName = null;
if (action.key) {
const backRoute = state.routes.find(
/* $FlowFixMe */