Merge pull request #8 from zalmoxisus/lock

Lock changes

Author: zalmoxisus

src/instrument.js

@@ -12,7 +12,8 @@ export const ActionTypes = {
   TOGGLE_ACTION: 'TOGGLE_ACTION',
   SET_ACTIONS_ACTIVE: 'SET_ACTIONS_ACTIVE',
   JUMP_TO_STATE: 'JUMP_TO_STATE',
-  IMPORT_STATE: 'IMPORT_STATE'
+  IMPORT_STATE: 'IMPORT_STATE',
+  LOCK_CHANGES: 'LOCK_CHANGES'
 };
 
 /**
@@ -67,6 +68,10 @@ export const ActionCreators = {
 
   importState(nextLiftedState, noRecompute) {
     return { type: ActionTypes.IMPORT_STATE, nextLiftedState, noRecompute };
+  },
+
+  lockChanges(status) {
+    return { type: ActionTypes.LOCK_CHANGES, status };
   }
 };
 
@@ -175,7 +180,8 @@ export function liftReducerWith(reducer, initialCommittedState, monitorReducer,
     skippedActionIds: [],
     committedState: initialCommittedState,
     currentStateIndex: 0,
-    computedStates: []
+    computedStates: [],
+    dropNewActions: false
   };
 
   /**
@@ -190,7 +196,8 @@ export function liftReducerWith(reducer, initialCommittedState, monitorReducer,
       skippedActionIds,
       committedState,
       currentStateIndex,
-      computedStates
+      computedStates,
+      dropNewActions
     } = liftedState || initialLiftedState;
 
     if (!liftedState) {
@@ -309,6 +316,10 @@ export function liftReducerWith(reducer, initialCommittedState, monitorReducer,
         break;
       }
       case ActionTypes.PERFORM_ACTION: {
+        if (dropNewActions) {
+          return liftedState || initialLiftedState;
+        }
+
         // Auto-commit as new actions come in.
         if (options.maxAge && stagedActionIds.length === options.maxAge) {
           commitExcessActions(1);
@@ -363,6 +374,11 @@ export function liftReducerWith(reducer, initialCommittedState, monitorReducer,
 
         break;
       }
+      case ActionTypes.LOCK_CHANGES: {
+        dropNewActions = liftedAction.status;
+        minInvalidatedStateIndex = Infinity;
+        break;
+      }
       case '@@redux/INIT': {
         // Always recompute states on hot reload and init.
         minInvalidatedStateIndex = 0;
@@ -415,7 +431,8 @@ export function liftReducerWith(reducer, initialCommittedState, monitorReducer,
       skippedActionIds,
       committedState,
       currentStateIndex,
-      computedStates
+      computedStates,
+      dropNewActions
     };
   };
 }

test/instrument.spec.js

@@ -635,6 +635,33 @@ describe('instrument', () => {
     });
   });
 
+  describe('Lock Changes', () => {
+    it('should lock', () => {
+      store.dispatch({ type: 'INCREMENT' });
+      store.liftedStore.dispatch({ type: 'LOCK_CHANGES', status: true });
+      expect(store.liftedStore.getState().dropNewActions).toBe(true);
+      expect(store.liftedStore.getState().nextActionId).toBe(2);
+      expect(store.getState()).toBe(1);
+
+      store.dispatch({ type: 'INCREMENT' });
+      expect(store.liftedStore.getState().nextActionId).toBe(2);
+      expect(store.getState()).toBe(1);
+
+      liftedStore.dispatch(ActionCreators.toggleAction(1));
+      expect(store.getState()).toBe(0);
+      liftedStore.dispatch(ActionCreators.toggleAction(1));
+      expect(store.getState()).toBe(1);
+
+      store.liftedStore.dispatch({ type: 'LOCK_CHANGES', status: false });
+      expect(store.liftedStore.getState().dropNewActions).toBe(false);
+      expect(store.liftedStore.getState().nextActionId).toBe(2);
+
+      store.dispatch({ type: 'INCREMENT' });
+      expect(store.liftedStore.getState().nextActionId).toBe(3);
+      expect(store.getState()).toBe(2);
+    });
+  });
+
   it('throws if reducer is not a function', () => {
     expect(() =>
       createStore(undefined, instrument())