[fixed] SSR rendering issue with popup

fixes jquense#304
YeJIoOb · Feb 7, 2016 · fd6bada · fd6bada
1 parent 665549d
commit fd6bada
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/Popup.jsx b/src/Popup.jsx
@@ -46,6 +46,7 @@ module.exports = React.createClass({
 
   getInitialState() {
     return {
+      initialRender: true,
       status: this.props.open ? OPENING : CLOSED
     }
   },
@@ -68,9 +69,14 @@ module.exports = React.createClass({
   },
 
   componentDidMount() {
-    if (this.state.status === OPENING) {
-      this.open();
-    }
+    let isOpen = this.state.status === OPENING;
+
+    compat.batchedUpdates(() => {
+      this.setState({ initialRender: false })
+      if (isOpen) {
+        this.open();
+      }
+    })
   },
 
   componentDidUpdate(pvProps){
@@ -170,7 +176,10 @@ module.exports = React.createClass({
     })
   },
 
-  getOffsetForStatus(status){
+  getOffsetForStatus(status) {
+    if (this.state.initialRender)
+      return {}
+
     let _in = properties('top', this.props.dropUp ? '100%' : '-100%')
       , out = properties('top', 0)
     return {

diff --git a/src/util/compat.js b/src/util/compat.js
@@ -11,6 +11,9 @@ module.exports = {
 
   findDOMNode(component){
     return ReactDOM.findDOMNode(component)
-  }
+  },
 
+  batchedUpdates(cb) {
+    ReactDOM.unstable_batchedUpdates(cb)
+  }
 }