[IconMenu] Fix controlled IconMenus to honor onRequestChange (#5704)

mui · Dec 2, 2016 · 14441c8 · 14441c8
1 parent 825ea44
commit 14441c8
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/IconMenu/IconMenu.js b/src/IconMenu/IconMenu.js
@@ -179,16 +179,16 @@ class IconMenu extends Component {
 
     if (this.props.open !== null) {
       this.props.onRequestChange(false, reason);
+    } else {
+      this.setState({open: false}, () => {
+        // Set focus on the icon button when the menu close
+        if (isKeyboard) {
+          const iconButton = this.refs.iconButton;
+          ReactDOM.findDOMNode(iconButton).focus();
+          iconButton.setKeyboardFocus();
+        }
+      });
     }
-
-    this.setState({open: false}, () => {
-      // Set focus on the icon button when the menu close
-      if (isKeyboard) {
-        const iconButton = this.refs.iconButton;
-        ReactDOM.findDOMNode(iconButton).focus();
-        iconButton.setKeyboardFocus();
-      }
-    });
   }
 
   open(reason, event) {