Fixed DEV mode issue with synchronously caused event (i.e. by accessed ref) of the same type within a handler calling an original handler too (fixes facebook#8559)

Author: Andarist

Diff for: src/renderers/shared/stack/reconciler/ReactCompositeComponent.js

@@ -568,7 +568,7 @@ var ReactCompositeComponent = {
       if (safely) {
         if (!skipLifecycle) {
           var name = this.getName() + '.componentWillUnmount()';
-          ReactErrorUtils.invokeGuardedCallback(name, inst.componentWillUnmount.bind(inst));
+          ReactErrorUtils.invokeGuardedCallbackWithCatch(name, inst.componentWillUnmount.bind(inst));
         }
       } else {
         if (__DEV__) {

Diff for: src/renderers/shared/utils/ReactErrorUtils.js

@@ -72,15 +72,15 @@ if (__DEV__) {
       func: (a: A) => void,
       a: A,
     ): void {
-      var boundFunc = function() {
+      var evtType = `react-${name}`;
+      var boundFunc = () => {
+        fakeNode.removeEventListener(evtType, boundFunc, false);
         func(a);
       };
-      var evtType = `react-${name}`;
       fakeNode.addEventListener(evtType, boundFunc, false);
       var evt = document.createEvent('Event');
       evt.initEvent(evtType, false, false);
       fakeNode.dispatchEvent(evt);
-      fakeNode.removeEventListener(evtType, boundFunc, false);
     };
   }
 }

Diff for: src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js

@@ -16,6 +16,7 @@ var ReactErrorUtils;
 describe('ReactErrorUtils', () => {
 
   beforeEach(() => {
+    jest.resetModules();
     ReactErrorUtils = require('ReactErrorUtils');
   });
 
@@ -71,5 +72,15 @@ describe('ReactErrorUtils', () => {
       __DEV__ = true;
       global.process = oldProcess;
     });
+
+    it('shouldn\'t call the callback again while executing synchronously induced other call in development', () => {
+      var callback = jest.fn(() => {
+        ReactErrorUtils.invokeGuardedCallback('foo', callback2, 'arg', true);
+      });
+      var callback2 = jest.fn();
+      ReactErrorUtils.invokeGuardedCallback('foo', callback, 'arg', true);
+      expect(callback).toHaveBeenCalledTimes(1);
+      expect(callback2).toHaveBeenCalledTimes(1);
+    });
   });
 });