Merge b9a3415 into ba2fe90

lib/components/Modal.js

@@ -86,6 +86,8 @@ export default class Modal extends Component {
     const parent = getParentElement(this.props.parentSelector);
     parent.appendChild(this.node);
     this.renderPortal(this.props);
+
+    this.mounted = true;
   }
 
   componentWillReceiveProps (newProps) {
@@ -101,6 +103,8 @@ export default class Modal extends Component {
   }
 
   componentWillUnmount () {
+    if (!this.mounted) return;
+
     if (this.props.ariaHideApp) {
       ariaAppHider.show(this.props.appElement);
     }

specs/Modal.spec.js

@@ -6,7 +6,7 @@
           react/no-render-return-value: "warn"
 */
 import TestUtils from 'react-addons-test-utils';
-import React from 'react';
+import React, { Component } from 'react';
 import sinon from 'sinon';
 import expect from 'expect';
 import ReactDOM from 'react-dom';
@@ -519,4 +519,37 @@ describe('Modal', () => {
       done();
     }, closeTimeoutMS);
   });
+
+  it('shouldn\'t throw if forcibly unmounted during mounting', () => {
+    /* eslint-disable camelcase, react/prop-types */
+    class Wrapper extends Component {
+      constructor (props) {
+        super(props);
+        this.state = { error: false };
+      }
+      unstable_handleError () {
+        this.setState({ error: true });
+      }
+      render () {
+        return this.state.error ? null : <div>{ this.props.children }</div>;
+      }
+    }
+    /* eslint-enable camelcase, react/prop-types */
+
+    const Throw = () => { throw new Error('reason'); };
+    const TestCase = () => (
+      <Wrapper>
+        <Modal />
+        <Throw />
+      </Wrapper>
+    );
+
+    const currentDiv = document.createElement('div');
+    document.body.appendChild(currentDiv);
+
+    const mount = () => ReactDOM.render(<TestCase />, currentDiv);
+    expect(mount).toNotThrow();
+
+    document.body.removeChild(currentDiv);
+  });
 });