Moved checks to close functions instead.

anchorchat · Jun 23, 2017 · d77ba18 · d77ba18
1 parent 14f26af
commit d77ba18
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/icon-menu/index.jsx b/src/icon-menu/index.jsx
@@ -83,22 +83,21 @@ class IconMenu extends Component {
 
   closeMenu() {
     const { onMenuClose } = this.props;
+    const { open } = this.state;
+
+    if (!open) {
+      return false;
+    }
 
     this.setState({
       open: false,
       positioned: false
     });
 
-    onMenuClose();
+    return onMenuClose();
   }
 
-  handleClickOutside = () => {
-    const { open } = this.state;
-
-    if (open) {
-      this.closeMenu();
-    }
-  }
+  handleClickOutside = () => this.closeMenu()
 
   applyCloseMenuToChildren(children) {
     return React.Children.map(

diff --git a/src/select/index.jsx b/src/select/index.jsx
@@ -104,19 +104,19 @@ class Select extends Component {
   }
 
   closeSelect() {
-    this.setState({
+    const { open } = this.state;
+
+    if (!open) {
+      return false;
+    }
+
+    return this.setState({
       open: false,
       positioned: false
     });
   }
 
-  handleClickOutside = () => {
-    const { open } = this.state;
-
-    if (open) {
-      this.closeSelect();
-    }
-  }
+  handleClickOutside = () => this.closeSelect()
 
   handleKeyUp = (event) => {
     if (event.which === 27) {