[fixed] Handle falsey DropdownMenu children correctly

kyletsang · Aug 28, 2015 · 478300a · 478300a
1 parent 6a8ed3e
commit 478300a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/DropdownMenu.js b/src/DropdownMenu.js
@@ -2,7 +2,7 @@ import React from 'react';
 import keycode from 'keycode';
 import classNames from 'classnames';
 import RootCloseWrapper from 'react-overlays/lib/RootCloseWrapper';
-
+import ValidComponentChildren from './utils/ValidComponentChildren';
 import createChainedFunction from './utils/createChainedFunction';
 
 class DropdownMenu extends React.Component {
@@ -77,7 +77,7 @@ class DropdownMenu extends React.Component {
   }
 
   render() {
-    const items = React.Children.map(this.props.children, child => {
+    const items = ValidComponentChildren.map(this.props.children, child => {
       let {
         children,
         onKeyDown,

diff --git a/test/DropdownMenuSpec.js b/test/DropdownMenuSpec.js
@@ -76,6 +76,15 @@ describe('DropdownMenu', function() {
     node.className.should.match(/\bdropdown-menu-right\b/);
   });
 
+  it('handles empty children', function() {
+    ReactTestUtils.renderIntoDocument(
+      <DropdownMenu pullRight>
+        <MenuItem>Item</MenuItem>
+        { false && <MenuItem>Item 2</MenuItem> }
+      </DropdownMenu>
+    );
+  });
+
   describe('focusable state', function() {
     let focusableContainer;