Merge pull request #611 from kiwicom/fix-fragment-in-card

FIX: Fragment after Loading in Card
kiwicom · Nov 7, 2018 · aad4322 · aad4322
2 parents 6118e6b + b447a8e
commit aad4322
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/Card/index.js b/src/Card/index.js
@@ -130,9 +130,18 @@ class Card extends React.Component<Props, State> {
       // Jest test
       return [];
     }
-    return children[0].type.name === Loading.name && !children[0].props.loading
-      ? children[0].props.children
-      : children;
+
+    if (children[0].type.name === Loading.name && !children[0].props.loading) {
+      if (
+        !Array.isArray(children[0].props.children) &&
+        children[0].props.children.type.toString() === React.Fragment.toString()
+      ) {
+        return children[0].props.children.props.children;
+      }
+
+      return children[0].props.children;
+    }
+    return children;
   };
 
   isExpandableCardSection = (item: any) =>
@@ -151,7 +160,6 @@ class Card extends React.Component<Props, State> {
 
   hasAdjustedHeader = () => {
     const children = this.getChildren();
-
     // Check if first element is Header
     if (children[0] !== undefined && children[0].type.name !== CardHeader.name) {
       return false;