Prevents bad behaviour when dynamic children

evilchis94 · Nov 11, 2017 · 40bdbd1 · 40bdbd1
1 parent 7e5c334
commit 40bdbd1
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/Collapsible.js b/Collapsible.js
@@ -36,16 +36,24 @@ export default class Collapsible extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.collapsed !== this.props.collapsed) {
-      this._toggleCollapsed(nextProps.collapsed);
-    } else if (
-      nextProps.collapsed &&
-      nextProps.collapsedHeight !== this.props.collapsedHeight
-    ) {
-      this.state.height.setValue(nextProps.collapsedHeight);
+    if (!nextProps.collapsed && !this.props.collapsed) {
+        this.setState({measured: false}, () => this._componentWillReceiveProps(nextProps));
+    } else {
+        this._componentWillReceiveProps(nextProps);
     }
   }
 
+  _componentWillReceiveProps(nextProps) {
+      if (nextProps.collapsed !== this.props.collapsed) {
+        this._toggleCollapsed(nextProps.collapsed);
+      } else if (
+        nextProps.collapsed &&
+        nextProps.collapsedHeight !== this.props.collapsedHeight
+      ) {
+        this.state.height.setValue(nextProps.collapsedHeight);
+      }
+  }
+
   contentHandle = null;
 
   _handleRef = ref => {