fix(TabSwitcher): check that child is not null (#519)

tillersystems · May 6, 2019 · 0f07300 · 0f07300
1 parent 55cab58
commit 0f07300
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/src/TabSwitcher/index.js b/src/TabSwitcher/index.js
@@ -27,24 +27,26 @@ const TabSwitcher = ({ children, defaultIndex, index, isCompacted, onChange }) =
   const [activeIndex, setActiveIndex] = useState(defaultIndex);
 
   const content = Children.map(children, child => {
-    if (child.type.displayName === 'Panes') {
-      return cloneElement(child, {
-        activeIndex: isControlled ? index : activeIndex,
-        isCompacted: isCompacted,
-      });
-    } else if (child.type.displayName === 'Tabs') {
-      return cloneElement(child, {
-        activeIndex: isControlled ? index : activeIndex,
-        isCompacted: isCompacted,
-        onActiveTab: index => {
-          onChange && onChange(index);
-          if (!isControlled) {
-            setActiveIndex(index);
-          }
-        },
-      });
-    } else {
-      return child;
+    if (child) {
+      if (child.type.displayName === 'Panes') {
+        return cloneElement(child, {
+          activeIndex: isControlled ? index : activeIndex,
+          isCompacted: isCompacted,
+        });
+      } else if (child.type.displayName === 'Tabs') {
+        return cloneElement(child, {
+          activeIndex: isControlled ? index : activeIndex,
+          isCompacted: isCompacted,
+          onActiveTab: index => {
+            onChange && onChange(index);
+            if (!isControlled) {
+              setActiveIndex(index);
+            }
+          },
+        });
+      } else {
+        return child;
+      }
     }
   });