diff --git a/src/isomorphic/classic/class/ReactClass.js b/src/isomorphic/classic/class/ReactClass.js index 74c25242a6..eb9abcd797 100644 --- a/src/isomorphic/classic/class/ReactClass.js +++ b/src/isomorphic/classic/class/ReactClass.js @@ -13,7 +13,6 @@ var ReactComponent = require('ReactComponent'); var ReactElement = require('ReactElement'); -var ReactErrorUtils = require('ReactErrorUtils'); var ReactPropTypeLocations = require('ReactPropTypeLocations'); var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames'); var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue'); @@ -705,10 +704,7 @@ function bindAutoBindMethods(component) { var method = component.__reactAutoBindMap[autoBindKey]; component[autoBindKey] = bindAutoBindMethod( component, - ReactErrorUtils.guard( - method, - component.constructor.displayName + '.' + autoBindKey - ) + method ); } } diff --git a/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js index ee360b77f3..fc6af66049 100644 --- a/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js +++ b/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js @@ -161,6 +161,34 @@ describe('ReactBrowserEventEmitter', function() { expect(idCallOrder[2]).toBe(getID(GRANDPARENT)); }); + it('should continue bubbling if an error is thrown', function() { + ReactBrowserEventEmitter.putListener( + getID(CHILD), + ON_CLICK_KEY, + recordID.bind(null, getID(CHILD)) + ); + ReactBrowserEventEmitter.putListener( + getID(PARENT), + ON_CLICK_KEY, + function() { + recordID(getID(PARENT)); + throw new Error('Handler interrupted'); + } + ); + ReactBrowserEventEmitter.putListener( + getID(GRANDPARENT), + ON_CLICK_KEY, + recordID.bind(null, getID(GRANDPARENT)) + ); + expect(function() { + ReactTestUtils.Simulate.click(CHILD); + }).toThrow(); + expect(idCallOrder.length).toBe(3); + expect(idCallOrder[0]).toBe(getID(CHILD)); + expect(idCallOrder[1]).toBe(getID(PARENT)); + expect(idCallOrder[2]).toBe(getID(GRANDPARENT)); + }); + it('should set currentTarget', function() { ReactBrowserEventEmitter.putListener( getID(CHILD), diff --git a/src/renderers/shared/event/EventPluginHub.js b/src/renderers/shared/event/EventPluginHub.js index 801a06b13f..81faff015a 100644 --- a/src/renderers/shared/event/EventPluginHub.js +++ b/src/renderers/shared/event/EventPluginHub.js @@ -13,6 +13,7 @@ var EventPluginRegistry = require('EventPluginRegistry'); var EventPluginUtils = require('EventPluginUtils'); +var ReactErrorUtils = require('ReactErrorUtils'); var accumulateInto = require('accumulateInto'); var forEachAccumulated = require('forEachAccumulated'); @@ -282,6 +283,8 @@ var EventPluginHub = { 'processEventQueue(): Additional events were enqueued while processing ' + 'an event queue. Support for this has not yet been implemented.' ); + // This would be a good time to rethrow if any of the event handlers threw. + ReactErrorUtils.rethrowCaughtError(); }, /** diff --git a/src/renderers/shared/event/EventPluginUtils.js b/src/renderers/shared/event/EventPluginUtils.js index ef1206110b..dbdef8b95a 100644 --- a/src/renderers/shared/event/EventPluginUtils.js +++ b/src/renderers/shared/event/EventPluginUtils.js @@ -12,6 +12,7 @@ 'use strict'; var EventConstants = require('EventConstants'); +var ReactErrorUtils = require('ReactErrorUtils'); var invariant = require('invariant'); var warning = require('warning'); @@ -108,7 +109,9 @@ function forEachEventDispatch(event, cb) { */ function executeDispatch(event, listener, domID) { event.currentTarget = injection.Mount.getNode(domID); - var returnValue = listener(event, domID); + var type = event.type || 'unknown-event'; + var returnValue = + ReactErrorUtils.invokeGuardedCallback(type, listener, event, domID); event.currentTarget = null; return returnValue; } diff --git a/src/renderers/shared/reconciler/__tests__/ReactCompositeComponentError-test.js b/src/renderers/shared/reconciler/__tests__/ReactCompositeComponentError-test.js deleted file mode 100644 index d1672e5461..0000000000 --- a/src/renderers/shared/reconciler/__tests__/ReactCompositeComponentError-test.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright 2013-2015, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * @emails react-core - */ - -'use strict'; - -var React = require('React'); -var ReactErrorUtils = require('ReactErrorUtils'); - -describe('ReactCompositeComponent-error', function() { - - it('should be passed the component and method name', function() { - spyOn(ReactErrorUtils, 'guard').andCallThrough(); - var Component = React.createClass({ - someHandler: function() {}, - render: function() { - return
; - }, - }); - - void new Component(); - - expect(ReactErrorUtils.guard.mostRecentCall.args[1]) - .toEqual('Component.someHandler'); - }); - -}); diff --git a/src/shared/utils/ReactErrorUtils.js b/src/shared/utils/ReactErrorUtils.js index 745042ff6d..fb7fba9942 100644 --- a/src/shared/utils/ReactErrorUtils.js +++ b/src/shared/utils/ReactErrorUtils.js @@ -12,19 +12,57 @@ 'use strict'; +var caughtError = null; + var ReactErrorUtils = { /** - * Creates a guarded version of a function. This is supposed to make debugging - * of event handlers easier. To aid debugging with the browser's debugger, - * this currently simply returns the original function. + * Call a function while guarding against errors that happens within it. * - * @param {function} func Function to be executed - * @param {string} name The name of the guard - * @return {function} + * @param name (?String) name of the guard to use for logging or debugging + * @param func (Function) function to invoke + * @param a (*) a First argument + * @param b (*) b Second argument */ - guard: function(func, name) { - return func; + invokeGuardedCallback: function(name, func, a, b) { + try { + return func(a, b); + } catch(x) { + if (caughtError === null) { + caughtError = x; + } + return undefined; + } + }, + + /** + * During execution of guarded functions we will capture the first error which + * we will rethrow to be handled by the top level error handler. + */ + rethrowCaughtError: function() { + if (caughtError) { + var error = caughtError; + caughtError = null; + throw error; + } }, }; +if (__DEV__) { + /** + * To help development we can get better devtools integration by simulating a + * real browser event. + */ + if (typeof window !== 'undefined' && + typeof window.dispatchEvent === 'function' && + typeof Event === 'function') { + var fakeNode = document.createElement('react'); + ReactErrorUtils.invokeGuardedCallback = function(name, func, a, b) { + var boundFunc = func.bind(null, a, b); + fakeNode.addEventListener(name, boundFunc, false); + fakeNode.dispatchEvent(new Event(name)); + fakeNode.removeEventListener(name, boundFunc, false); + }; + } +} + module.exports = ReactErrorUtils;