Unset active tab when unmounting <Tabs>

Issue #1312
metasfresh · Nov 5, 2017 · 9ec8afb · 9ec8afb
1 parent f4b4425
commit 9ec8afb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -55,6 +55,13 @@ export function activateTab(scope, tabId) {
     }
 }
 
+export function unselectTab(scope) {
+    return {
+        type: types.UNSELECT_TAB,
+        scope
+    }
+}
+
 export function initLayoutSuccess(layout, scope) {
     return {
         type: types.INIT_LAYOUT_SUCCESS,

diff --git a/src/components/tabs/Tabs.js b/src/components/tabs/Tabs.js
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import PropTypes from 'prop-types';
 
 import Tab from './Tab';
-import {activateTab} from '../../actions/WindowActions';
+import { activateTab, unselectTab } from '../../actions/WindowActions';
 
 class Tabs extends Component {
     constructor(props) {
@@ -24,6 +24,10 @@ class Tabs extends Component {
         }
     }
 
+    componentWillUnmount() {
+        this.props.dispatch(unselectTab('master'));
+    }
+
     handleClick = (e, id) => {
         e.preventDefault();
         this.setState({

diff --git a/src/constants/ActionTypes.js b/src/constants/ActionTypes.js
@@ -15,6 +15,7 @@ export const INIT_LAYOUT_SUCCESS = 'INIT_LAYOUT_SUCCESS';
 export const ADD_ROW_DATA = 'ADD_ROW_DATA';
 export const SORT_TAB = 'SORT_TAB';
 export const ACTIVATE_TAB = 'ACTIVATE_TAB';
+export const UNSELECT_TAB = 'UNSELECT_TAB';
 export const ADD_NEW_ROW = 'ADD_NEW_ROW';
 export const DELETE_ROW = 'DELETE_ROW';
 export const UPDATE_ROW_PROPERTY = 'UPDATE_ROW_PROPERTY';

diff --git a/src/reducers/windowHandler.js b/src/reducers/windowHandler.js
@@ -28,7 +28,9 @@ const initialState = {
         viewId: null
     },
     master: {
-        layout: {},
+        layout: {
+            activeTab: null
+        },
         data: [],
         rowData: {},
         saveStatus: {},
@@ -158,6 +160,15 @@ export default function windowHandler(state = initialState, action) {
                 }
             })
 
+        case types.UNSELECT_TAB:
+            return update(state, {
+                [action.scope]: {
+                    layout: {
+                        activeTab: { $set: null }
+                    }
+                }
+            })
+
         case types.ADD_ROW_DATA:
             return Object.assign({}, state, {
                 [action.scope]: Object.assign({}, state[action.scope], {