Merge pull request reactjs#16 from arasmussen/master

[fixed] ModalPortal's componentWillReceiveProps
jaksenko · Feb 26, 2015 · db8b725 · db8b725
2 parents 6fd8456 + 1b8e2d0
commit db8b725
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/components/ModalPortal.js b/lib/components/ModalPortal.js
@@ -45,12 +45,10 @@ var ModalPortal = module.exports = React.createClass({
     // Focus only needs to be set once when the modal is being opened
     if (!this.props.isOpen && newProps.isOpen) {
       this.setFocusAfterRender(true);
-    }
-
-    if (newProps.isOpen === true)
       this.open();
-    else if (newProps.isOpen === false)
+    } else if (this.props.isOpen && !newProps.isOpen) {
       this.close();
+    }
   },
 
   componentDidUpdate: function () {