fix: toArray logic adjust for flatten array

react-component · Mar 9, 2020 · a63f8a5 · a63f8a5
1 parent cec7bb9
commit a63f8a5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Children/toArray.ts b/src/Children/toArray.ts
@@ -7,7 +7,13 @@ export default function toArray(
   let ret: React.ReactElement[] = [];
 
   React.Children.forEach(children, (child: any) => {
-    if (isFragment(child) && child.props) {
+    if (child === undefined || child === null) {
+      return;
+    }
+
+    if (Array.isArray(child)) {
+      ret = ret.concat(toArray(child));
+    } else if (isFragment(child) && child.props) {
       ret = ret.concat(toArray(child.props.children));
     } else {
       ret.push(child);