fix(HeaderMenu,HeaderNavigation): handle null item (#4682)

* fix(HeaderMenu): handle null item * fix(HeaderNavigation): handle null item
carbon-design-system · Nov 15, 2019 · e8888a1 · e8888a1
1 parent a4785f3
commit e8888a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/react/src/components/UIShell/HeaderMenu.js b/packages/react/src/components/UIShell/HeaderMenu.js
@@ -212,10 +212,12 @@ class HeaderMenu extends React.Component {
    * sequence when they might not want to go through all the items.
    */
   _renderMenuItem = (item, index) => {
-    return React.cloneElement(item, {
-      ref: this.handleItemRef(index),
-      role: 'none',
-    });
+    if (React.isValidElement(item)) {
+      return React.cloneElement(item, {
+        ref: this.handleItemRef(index),
+        role: 'none',
+      });
+    }
   };
 }
 

diff --git a/packages/react/src/components/UIShell/HeaderNavigation.js b/packages/react/src/components/UIShell/HeaderNavigation.js
@@ -81,8 +81,10 @@ export default class HeaderNavigation extends React.Component {
    * `this.items` to properly manage focus.
    */
   _renderNavItem = (child, index) => {
-    return React.cloneElement(child, {
-      ref: this.handleItemRef(index),
-    });
+    if (React.isValidElement(child)) {
+      return React.cloneElement(child, {
+        ref: this.handleItemRef(index),
+      });
+    }
   };
 }