Dont trap reactor is isDispatching if notify() throws error

Author: jordangarcia

src/reactor.js

@@ -125,10 +125,17 @@ class Reactor {
       throw e
     }
 
+
     if (this.__batchDepth > 0) {
       this.__batchDispatchCount++
     } else if (this.state !== prevState) {
-      this.__notify()
+      try {
+        this.__notify()
+      } catch (e) {
+        this.__isDispatching = false
+        throw e
+      }
+
       this.__isDispatching = false
     }
   }
@@ -305,7 +312,12 @@ class Reactor {
       if (this.__batchDispatchCount > 0) {
         // set to true to catch if dispatch called from observer
         this.__isDispatching = true
-        this.__notify()
+        try {
+          this.__notify()
+        } catch (e) {
+          this.__isDispatching = false
+          throw e
+        }
         this.__isDispatching = false
       }
       this.__batchDispatchCount = 0

tests/reactor-tests.js

@@ -209,6 +209,21 @@ describe('Reactor', () => {
 
         expect(() => reactor.dispatch('setTax', 5)).not.toThrow()
       })
+      it('should allow subsequent dispatches if an observer throws an error', () => {
+        var unWatchFn = reactor.observe([], state => {
+          throw new Error('observer error')
+        })
+
+        try {
+          checkoutActions.setTaxPercent(1)
+        } catch (e) {} // eslint-disable-line
+
+        unWatchFn()
+
+        expect(() => {
+          checkoutActions.setTaxPercent(2)
+        }).not.toThrow()
+      })
     }) // when dispatching a relevant action
 
     describe('#observe', () => {
@@ -987,6 +1002,9 @@ describe('Reactor', () => {
           },
           initialize() {
             this.on('add', (state, item) => state.push(toImmutable(item)))
+            this.on('error', (state, payload) => {
+              throw new Error('store error');
+            })
           },
         }),
       })
@@ -1078,6 +1096,19 @@ describe('Reactor', () => {
         new Error('Dispatch may not be called while a dispatch is in progress'))
     })
 
+    it('should allow subsequent dispatches if an error is raised by a store handler', () => {
+      expect(() => {
+        reactor.batch(() => {
+          reactor.dispatch('add', 'one')
+          reactor.dispatch('error')
+        })
+      }).toThrow(new Error('store error'))
+
+      expect(() => {
+        reactor.dispatch('add', 'three')
+      }).not.toThrow()
+    })
+
     it('should allow subsequent dispatches if an error is raised in an observer', () => {
       var unWatchFn = reactor.observe([], state => {
         throw new Error('observe error')