Merge pull request #576 from ipavlenko/fix/MINT-1158-ui-fixes

MINT-1158 Drawer (double click) on CBE pages fixed

src/layouts/partials/DrawerPartial/DrawerPartial.jsx

@@ -6,7 +6,7 @@ import { Translate } from 'react-redux-i18n'
 import classnames from 'classnames'
 import { connect } from 'react-redux'
 import menu from 'menu'
-import { drawerToggle } from 'redux/drawer/actions'
+import { drawerToggle, drawerHide } from 'redux/drawer/actions'
 import { logout } from 'redux/session/actions'
 import styles from '../styles'
 
@@ -18,14 +18,7 @@ export default class DrawerPartial extends PureComponent {
     isDrawerOpen: PropTypes.bool,
     isCBE: PropTypes.bool,
     handleDrawerToggle: PropTypes.func,
-  }
-
-  constructor (props) {
-    super(props)
-
-    this.state = {
-      isOpened: false,
-    }
+    handleDrawerHide: PropTypes.func,
   }
 
   render () {
@@ -67,7 +60,7 @@ export default class DrawerPartial extends PureComponent {
         innerDivStyle={styles.drawer.item.innerDivStyle}
         disabled={item.disabled}
         primaryText={<Translate value={item.title} />}
-        onTouchTap={this.props.handleDrawerToggle}
+        onTouchTap={this.props.handleDrawerHide}
         leftIcon={
           <FontIcon
             style={item.disabled ? styles.drawer.item.iconStyleDisabled : styles.drawer.item.iconStyle}
@@ -80,7 +73,6 @@ export default class DrawerPartial extends PureComponent {
             styleName='item'
             activeClassName='drawer-item-active'
             to={{ pathname: item.path }}
-            stopPropagation
           />
           : <div />
         }
@@ -99,6 +91,7 @@ function mapStateToProps (state) {
 function mapDispatchToProps (dispatch) {
   return {
     handleDrawerToggle: () => dispatch(drawerToggle()),
+    handleDrawerHide: () => dispatch(drawerHide()),
     handleLogout: () => dispatch(logout()),
   }
 }

src/redux/drawer/actions.js

@@ -1,6 +1,10 @@
 // TODO @ipavlenko: Implement a DrawerStack if there will be more than 1 drower
 export const DRAWER_TOGGLE = 'drawer/TOGGLE'
+export const DRAWER_HIDE = 'drawer/HIDE'
 
 export const drawerToggle = () => (dispatch) => {
   dispatch({ type: DRAWER_TOGGLE })
 }
+export const drawerHide = () => (dispatch) => {
+  dispatch({ type: DRAWER_HIDE })
+}

src/redux/drawer/reducer.js

@@ -11,6 +11,11 @@ export default (state = initialState, action) => {
         ...action.payload,
         isOpen: !state.isOpen,
       }
+    case actions.DRAWER_HIDE:
+      return {
+        ...action.payload,
+        isOpen: false,
+      }
     default:
       return state
   }