Do not clobber existing tab stack if possible (#1918)

aksonov · Jun 13, 2017 · 58fe836 · 58fe836
1 parent 473665f
commit 58fe836
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/Reducer.js b/src/Reducer.js
@@ -226,12 +226,20 @@ function inject(state, action, props, scenes) {
         resetHistoryStack(state.children[ind]);
       }
 
-      state.children[ind] = getInitialState(
-        props,
-        scenes,
-        state.index,
-        { ...action, parentIndex: state.children[ind].parentIndex },
-      );
+      const activeChild = state.children[state.index];
+      const incomingChild = state.children[ind];
+
+      const incomingChildHadTabs = incomingChild.tabs;
+      const incomingChildWasActive = incomingChild.children.length > 1;
+      const activeChildIsIncomingChild = activeChild.sceneKey === action.key;
+      if (incomingChildHadTabs || !incomingChildWasActive || activeChildIsIncomingChild) {
+        state.children[ind] = getInitialState(
+          { ...props },
+          scenes,
+          state.index,
+          { ...action, parentIndex: state.children[ind].parentIndex },
+        );
+      }
 
       return { ...state, index: ind };
     }