Merge pull request #122 from react-component/fix-not-found-content-em…

…pty-style Fix dropdown style when notFoundContent is empty
react-component · Oct 12, 2016 · 93bcfb7 · 93bcfb7
2 parents 59ad5ed + 8d7e5a5
commit 93bcfb7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/assets/index.less b/assets/index.less
@@ -331,6 +331,7 @@
     position: absolute;
     outline: none;
 
+    &:empty,
     &-hidden {
       display: none;
     }

diff --git a/src/DropdownMenu.jsx b/src/DropdownMenu.jsx
@@ -127,13 +127,16 @@ const DropdownMenu = React.createClass({
   },
 
   render() {
-    return (<div
-      style={{ overflow: 'auto' }}
-      onFocus={this.props.onPopupFocus}
-      onMouseDown={preventDefaultEvent}
-    >
-      {this.renderMenu()}
-    </div>);
+    const renderMenu = this.renderMenu();
+    return renderMenu ? (
+      <div
+        style={{ overflow: 'auto' }}
+        onFocus={this.props.onPopupFocus}
+        onMouseDown={preventDefaultEvent}
+      >
+        {renderMenu}
+      </div>
+    ) : null;
   },
 });