Maintain tab parentIndex when jumping tabs (#1775)

* Maintain tab parentIndex when jumping tabs [fixes #1758] * Fix ESLint errors
aksonov · Apr 8, 2017 · 30e8959 · 30e8959
1 parent 4b57417
commit 30e8959
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/src/Reducer.js b/src/Reducer.js
@@ -230,7 +230,7 @@ function inject(state, action, props, scenes) {
         props,
         scenes,
         state.index,
-        action,
+        { ...action, parentIndex: state.children[ind].parentIndex },
       );
 
       return { ...state, index: ind };

diff --git a/test/Reducer.test.js b/test/Reducer.test.js
@@ -18,6 +18,7 @@ export default function getCurrent(state) {
 const id = 0;
 const guid = () => id + 1;
 const noop = () => {};
+const component = React.Component;
 const scenesData = (
   <Scene
     key="root"
@@ -118,10 +119,20 @@ describe('handling actions', () => {
 
   beforeEach(() => {
     const scene = (
-      <Scene key="root" component={noop}>
+      <Scene key="root" component={component}>
         <Scene key="main" tabs>
-          <Scene key="hello" component={noop} initial />
-          <Scene key="world" component={noop} />
+          <Scene key="hello" component={component} initial />
+          <Scene key="world" component={component}>
+            <Scene key="world_content" component={component} />
+            <Scene key="maps" component={component}>
+              <Scene key="maps_content" component={component} />
+              <Scene key="map_tabs" component={component} tabs>
+                <Scene key="map_tab_1" component={component} />
+                <Scene key="map_tab_2" component={component} />
+                <Scene key="map_tab_3" component={component} />
+              </Scene>
+            </Scene>
+          </Scene>
         </Scene>
       </Scene>
     );
@@ -148,9 +159,28 @@ describe('handling actions', () => {
   it('switches to a correct tab on JUMP', () => {
     Actions.main();
     Actions.hello();
-
     expect(current.key).to.eq('hello_0_hello_');
   });
+
+  it('maintains scene parentIndex when switching tabs', () => {
+    Actions.world();
+    expect(current.key).to.eq('world_0_world_content');
+
+    Actions.maps({ type: 'push' });
+    expect(current.key).to.eq('maps_0_maps_content');
+
+    Actions.map_tabs();
+    expect(current.key).to.eq('map_tabs_0_map_tab_1_');
+    expect(current.parentIndex).to.eq(1);
+
+    Actions.map_tab_2();
+    expect(current.key).to.eq('map_tab_2_0_map_tab_2_');
+    expect(current.parentIndex).to.eq(1);
+
+    Actions.map_tab_3();
+    expect(current.key).to.eq('map_tab_3_0_map_tab_3_');
+    expect(current.parentIndex).to.eq(1);
+  });
 });
 
 describe('passing props from actions', () => {