Merge pull request mallfoundry#676 from hbztd/fix/timeline

fix(flex): text child render fail
QingyunYang · Feb 4, 2024 · fd34065 · fd34065
2 parents b049aa6 + 5f86f91
commit fd34065
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/packages/core/src/flex/flex.tsx b/packages/core/src/flex/flex.tsx
@@ -8,7 +8,7 @@ import {
   cloneElement,
   CSSProperties,
   forwardRef,
-  ReactElement,
+  isValidElement,
   ReactNode,
   useMemo,
 } from "react"
@@ -78,12 +78,14 @@ const Flex = forwardRef((props: FlexProps, ref) => {
 
   const children = useMemo(
     () =>
-      Children.map(childrenProp, (item, index) =>
-        cloneElement(item as ReactElement, {
-          __dataIndex__: index,
-          __dataLength__: Children.count(childrenProp),
-        }),
-      ),
+      Children.map(childrenProp, (item, index) => {
+        return isValidElement<any>(item)
+          ? cloneElement(item, {
+              __dataIndex__: index,
+              __dataLength__: Children.count(childrenProp),
+            })
+          : item
+      }),
     [childrenProp],
   )