Make Dropdown trigger/menu detection more robust

helpscout · Oct 6, 2017 · 587e2ec · 587e2ec
1 parent a9e098f
commit 587e2ec
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/components/Dropdown/index.js b/src/components/Dropdown/index.js
@@ -126,12 +126,16 @@ class Dropdown extends Component {
       className
     )
 
-    const triggerMarkup = React.cloneElement(children[0], {
+    const isChildTrigger = children && children[0] && React.isValidElement(children[0])
+    const isChildMenu = children && children[1] && React.isValidElement(children[1]) && children[1].type === Menu
+
+    const triggerMarkup = isChildTrigger ? React.cloneElement(children[0], {
       isActive: isOpen,
       ref: 'trigger',
       onFocus: handleOnTriggerFocus
-    })
-    const menuMarkup = isOpen ? React.cloneElement(children[1], {
+    }) : null
+
+    const menuMarkup = isOpen && isChildMenu ? React.cloneElement(children[1], {
       direction,
       isOpen,
       onClose: handleOnMenuClose,