Merge pull request #36 from canalplus/add_global_state

Switch strategy view point (exit to enter) which fix issue strategy

Author: FlorentD

dev/dev.jsx

@@ -5,11 +5,11 @@ import {connect, Provider} from 'react-redux';
 import {Binder, StrapeBinder, keysInit, keysReducer, activeKeyBinder} from '../src';
 
 const logger = store => next => action => {
-  // console.group(action.type);
-  // console.info('dispatching', action);
+  console.group(action.type);
+  console.info('dispatching', action);
   const result = next(action);
-  // console.info('next state', store.getState());
-  // console.groupEnd(action.type);
+  console.info('next state', store.getState());
+  console.groupEnd(action.type);
   return result;
 };
 

src/redux/actions.js

@@ -39,6 +39,8 @@ export function _activeKeyBinder(binderId, id, memory = false) {
       } else {
         newState[binderId].selectedId = id || newState[binderId].selectedId;
       }
+      newState.selectedId = newState[binderId].selectedId;
+      newState.currentStrapeId = binderId;
       globalStore.dispatch({
         type: ACTIVE_KEYBINDER,
         state: newState,
@@ -127,6 +129,7 @@ export function updateSelectedId(binderId, selectedId, marginLeft) {
     const newState = clone(globalStore.getState()[NAME]);
     newState[binderId].selectedId = selectedId;
     newState[binderId].marginLeft = marginLeft;
+    newState.selectedId = selectedId;
     globalStore.dispatch({
       type: UPDATE_SELECTED_KEY,
       state: newState,

src/redux/reducer.js

@@ -6,6 +6,8 @@ import {
 } from './actions';
 
 const initialKeysSate = {
+  selectedId: null,
+  currentStrapeId: null,
   getBinder: function(binderId) {
     return this[binderId] || {marginLeft: 0};
   },

test/redux/actions.spec.js

@@ -32,8 +32,8 @@ describe('redux/actions.js', () => {
       sinon.test(function() {
         const store = createStore((state = {
           '@@keys': {
-            binderId: {active: false},
-            binderId2: {active: true},
+            binderId: {active: false, elements: [{id: '1'}]},
+            binderId2: {active: true, elements: [{id: '2'}]},
           },
         }) => state);
         listener._init({store: store}); // init globalStore
@@ -43,8 +43,10 @@ describe('redux/actions.js', () => {
           .withArgs({
             type: actions.ACTIVE_KEYBINDER,
             state: {
-              binderId: {active: true, selectedId: undefined},
-              binderId2: {active: false},
+              binderId: {active: true, elements: {0: {id: '1'}}, selectedId: '1'},
+              binderId2: {active: false, elements: {0: {id: '2'}}},
+              currentStrapeId: 'binderId',
+              selectedId: '1',
             },
           });
         actions._activeKeyBinder('binderId');
@@ -64,7 +66,7 @@ describe('redux/actions.js', () => {
     it('should keep in memory the selected Id when memory is true', sinon.test(function() {
       const store = createStore((state = {
         '@@keys': {
-          binderId: {active: false},
+          binderId: {active: false, selectedId: '2', elements: [{id: '1'}]},
           binderId2: {active: true, selectedId: '3'},
         },
       }) => state);
@@ -75,8 +77,10 @@ describe('redux/actions.js', () => {
         .withArgs({
           type: actions.ACTIVE_KEYBINDER,
           state: {
-            binderId: {active: true, selectedId: undefined},
+            binderId: {active: true, elements: {0: {id: '1'}}, selectedId: '2'},
             binderId2: {active: false, selectedId: '3'},
+            currentStrapeId: 'binderId',
+            selectedId: '2',
           },
         });
       actions._activeKeyBinder('binderId', null, true);
@@ -142,6 +146,7 @@ describe('redux/actions.js', () => {
         .withArgs({
           type: actions.UPDATE_SELECTED_KEY,
           state: {
+            selectedId: 2,
             binderId: {active: false, selectedId: 2, marginLeft: 10},
           },
         });