fixed BACK action consumption when TabRouter is not back eligible

drash-course · Mar 27, 2018 · 1190099 · 1190099
1 parent 084c52e
commit 1190099
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/routers/TabRouter.js b/src/routers/TabRouter.js
@@ -125,13 +125,13 @@ export default (
       // handle the action, to allow inner tabs to change first
       let activeTabIndex = state.index;
       const isBackEligible =
-        action.key == null || action.key === activeTabLastState.key;
-      if (
-        action.type === NavigationActions.BACK &&
-        isBackEligible &&
-        shouldBackNavigateToInitialRoute
-      ) {
-        activeTabIndex = initialRouteIndex;
+        !action.key || action.key === activeTabLastState.key;
+      if (action.type === NavigationActions.BACK) {
+        if (isBackEligible && shouldBackNavigateToInitialRoute) {
+          activeTabIndex = initialRouteIndex;
+        } else {
+          return state;
+        }
       }
       let didNavigate = false;
       if (action.type === NavigationActions.NAVIGATE) {