Merge pull request reactjs#53 from ewiner/master

[fixed] Clear the closeWithTimeout timer before unmounting
loganscharen · Sep 11, 2015 · acd3c65 · acd3c65
2 parents 9e092ae + 02cf2c3
commit acd3c65
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/components/ModalPortal.js b/lib/components/ModalPortal.js
@@ -43,6 +43,10 @@ var ModalPortal = module.exports = React.createClass({
     }
   },
 
+  componentWillUnmount: function() {
+    clearTimeout(this.closeTimer);
+  },
+
   componentWillReceiveProps: function(newProps) {
     // Focus only needs to be set once when the modal is being opened
     if (!this.props.isOpen && newProps.isOpen) {
@@ -87,7 +91,7 @@ var ModalPortal = module.exports = React.createClass({
 
   closeWithTimeout: function() {
     this.setState({beforeClose: true}, function() {
-      setTimeout(this.closeWithoutTimeout, this.props.closeTimeoutMS);
+      this.closeTimer = setTimeout(this.closeWithoutTimeout, this.props.closeTimeoutMS);
     }.bind(this));
   },