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

Updated to react-navigation v1.0.0-beta.11

Browse Source
This commit is contained in:
Matt Hamil 2017-06-06 14:24:27 -05:00
parent 528b1ad812
commit 484c729154
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/routers/StackRouter.js
View File

@ -140,15 +140,17 @@ export default (
};
}
// Check if action wants to route to the route that is in-progress navigating
if (
inProgressNavigationRouteName !== null &&
inProgressNavigationRouteName === passedAction.routeName
) {
inProgressNavigationRouteName = null;
return false;
if (action.type === NavigationActions.NAVIGATE) {
// Check if action wants to route to the route that is in-progress navigating
if (
inProgressNavigationRouteName !== null &&
inProgressNavigationRouteName === passedAction.routeName
) {
inProgressNavigationRouteName = null;
return false;
}
inProgressNavigationRouteName = passedAction.routeName;
}
inProgressNavigationRouteName = passedAction.routeName;
// Check if a child scene wants to handle the action as long as it is not a reset to the root stack
if (action.type !== NavigationActions.RESET || action.key !== null) {