[Popper] Fix update logic

mui · Jul 20, 2018 · 6c83148 · 6c83148
1 parent ba2ba25
commit 6c83148
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/docs/src/pages/utils/popper/PositionedPopper.js b/docs/src/pages/utils/popper/PositionedPopper.js
@@ -28,7 +28,7 @@ class PositionedPopper extends React.Component {
     const { currentTarget } = event;
     this.setState(state => ({
       anchorEl: currentTarget,
-      open: !state.placement === placement || !state.open,
+      open: state.placement !== placement || !state.open,
       placement,
     }));
   };

diff --git a/packages/material-ui/src/Popper/Popper.js b/packages/material-ui/src/Popper/Popper.js
@@ -43,13 +43,14 @@ class Popper extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (prevProps.open && !this.props.open && !this.props.transition) {
+    if (prevProps.open !== this.props.open && !this.props.open && !this.props.transition) {
       // Otherwise handleExited will call this.
       this.handleClose();
     }
 
     // Let's update the popper position.
     if (
+      prevProps.open !== this.props.open ||
       prevProps.anchorEl !== this.props.anchorEl ||
       prevProps.popperOptions !== this.props.popperOptions ||
       prevProps.modifiers !== this.props.modifiers ||
@@ -93,15 +94,15 @@ class Popper extends React.Component {
     } = this.props;
     const popperNode = ReactDOM.findDOMNode(this);
 
+    if (!popperNode || !anchorEl || !open) {
+      return;
+    }
+
     if (this.popper) {
       this.popper.destroy();
       this.popper = null;
     }
 
-    if (!popperNode || !anchorEl || !open) {
-      return;
-    }
-
     this.popper = new PopperJS(getAnchorEl(anchorEl), popperNode, {
       placement: flipPlacement(theme, placement),
       ...popperOptions,