{"parents":["220b4b6b50eb146c6e18934aa86afaa3250247ab"],"commit":{"authorEmail":"none@no-reply.com","shortRevision":"86305fba41","authorName":"jim","authoredAt":"2016-02-04T16:55:24-08:00","subject":"Error boundries should not unmount composite components which were not mounted.","revision":"86305fba4112761631ec1d1576bc71204399d6ef"},"files":[{"status":"M","path":"src\/core\/__tests__\/ReactErrorBoundaries-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js"}],"body":"","patch":"diff --git a\/src\/core\/__tests__\/ReactErrorBoundaries-test.js b\/src\/core\/__tests__\/ReactErrorBoundaries-test.js\nindex 19e8810a8e..b81d267f2a 100644\n--- a\/src\/core\/__tests__\/ReactErrorBoundaries-test.js\n+++ b\/src\/core\/__tests__\/ReactErrorBoundaries-test.js\n@@ -79,6 +79,40 @@ describe('ReactErrorBoundaries', function() {\n expect(EventPluginHub.putListener).toBeCalled();\n });\n \n+ it('correctly handles composite siblings', function() {\n+ class ErrorBoundary extends React.Component {\n+ constructor() {\n+ super();\n+ this.state = {error: false};\n+ }\n+ \n+ render() {\n+ if (!this.state.error) {\n+ return

{this.props.children}<\/div>;\n+ }\n+ return

Error has been caught<\/div>;\n+ }\n+ \n+ unstable_handleError() {\n+ this.setState({error: true});\n+ }\n+ }\n+\n+ function Broken() {\n+ throw new Error('Always broken.');\n+ }\n+\n+ function Composite() {\n+ return

;\n+ }\n+\n+ var container = document.createElement('div');\n+ ReactDOM.render(\n+ <\/ErrorBoundary>,\n+ container\n+ );\n+ ReactDOM.unmountComponentAtNode(container);\n+ });\n \n it('catches errors from children', function() {\n var log = [];\n@@ -144,15 +178,16 @@ describe('ReactErrorBoundaries', function() {\n var container = document.createElement('div');\n ReactDOM.render(, container);\n expect(container.textContent).toBe('Error: Please, do not render me.');\n+ ReactDOM.unmountComponentAtNode(container);\n expect(log).toEqual([\n 'Box render',\n 'Inquisitive render',\n 'Angry render',\n 'Inquisitive ref null',\n 'Inquisitive componentWillUnmount',\n- 'Angry componentWillUnmount',\n 'Box renderError',\n 'Box componentDidMount',\n+ 'Box componentWillUnmount',\n ]);\n });\n });\ndiff --git a\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js b\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js\nindex 3efdf37054..8914fb6eaf 100644\n--- a\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js\n+++ b\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js\n@@ -369,6 +369,9 @@ var ReactCompositeComponentMixin = {\n * @internal\n *\/\n unmountComponent: function() {\n+ if (!this._renderedComponent) {\n+ return;\n+ }\n var inst = this._instance;\n \n if (inst.componentWillUnmount) {\n"}

dillon1000/react

Files changed