Merge pull request #40 from ArondeParon/main

Allow `null` values in trailing and leading actions
marekrozmus · Jun 24, 2023 · 39cebe6 · 39cebe6
2 parents 38a60e5 + 2678bdc
commit 39cebe6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/LeadingActions.js b/src/LeadingActions.js
@@ -8,12 +8,15 @@ const LeadingActions = ({ children }) => {
   }
 
   if (Array.isArray(children)) {
-    return React.Children.map(children, (child, index) =>
-      React.cloneElement(child, {
+    return React.Children.map(children, (child, index) => {
+      if (!React.isValidElement(child)) {
+        return child;
+      }
+      return React.cloneElement(child, {
         leading: true,
         main: index === 0,
       })
-    );
+    });
   }
 
   return React.cloneElement(children, {

diff --git a/src/TrailingActions.js b/src/TrailingActions.js
@@ -8,12 +8,15 @@ const TrailingActions = ({ children }) => {
   }
 
   if (Array.isArray(children)) {
-    return React.Children.map(children, (child, index) =>
-      React.cloneElement(child, {
+    return React.Children.map(children, (child, index) => {
+      if (!React.isValidElement(child)) {
+        return child;
+      }
+      return React.cloneElement(child, {
         main: index === children.length - 1,
         trailing: true,
       })
-    );
+    });
   }
 
   return React.cloneElement(children, {