fix(TabSwitcher): add guard for null children (#484)

tillersystems · Apr 9, 2019 · a6577ee · a6577ee
1 parent 786acef
commit a6577ee
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/TabSwitcher/index.js b/src/TabSwitcher/index.js
@@ -28,17 +28,19 @@ const TabSwitcher = ({ children, defaultIndex, index, isCompacted, onChange }) =
 
   const content = Children.map(children, child => {
     // ignore random <div/>s etc.
-    if (typeof child.type === 'string') return child;
-    return cloneElement(child, {
-      activeIndex: isControlled ? index : activeIndex,
-      isCompacted,
-      onActiveTab: index => {
-        onChange && onChange(index);
-        if (!isControlled) {
-          setActiveIndex(index);
-        }
-      },
-    });
+    if (child) {
+      if (typeof child.type === 'string') return child;
+      return cloneElement(child, {
+        activeIndex: isControlled ? index : activeIndex,
+        isCompacted,
+        onActiveTab: index => {
+          onChange && onChange(index);
+          if (!isControlled) {
+            setActiveIndex(index);
+          }
+        },
+      });
+    }
   });
 
   return <div>{content}</div>;