fix progress

BouyguesTelecom · Nov 26, 2024 · fa2307b · fa2307b
1 parent 8943490
commit fa2307b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/packages/react/components/progress/Progress.native.tsx b/packages/react/components/progress/Progress.native.tsx
@@ -95,24 +95,23 @@ const Progress = React.forwardRef(
       return (
         <View style={styles.progress} {...others} ref={ref}>
           {Array.isArray(children) &&
-            children.map(
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              (child: any, index: number) =>
-                (child &&
-                  child.type.name === 'ProgressItem' &&
-                  React.cloneElement(child, {
-                    key: index,
-                    style: [
-                      index === 0 && styles.progressItemFirst,
-                      index === children.length - 1 && styles.progressItemSecond,
-                      {
-                        backgroundColor: getColorStyle(child.props.status),
-                        height: height,
-                      },
-                    ],
-                  })) ||
-                child,
-            )}
+            children.map((child, index: number) => {
+              if (child && child?.type?.render?.displayName === 'ProgressItem') {
+                return React.cloneElement(child, {
+                  key: index,
+                  style: [
+                    index === 0 && styles.progressItemFirst,
+                    index === children.length - 1 && styles.progressItemSecond,
+                    {
+                      backgroundColor: getColorStyle(child.props.status),
+                      height: height,
+                    },
+                  ],
+                })
+              }
+
+              return child
+            })}
         </View>
       )
     }

diff --git a/packages/react/components/progress/item/ProgressItem.native.tsx b/packages/react/components/progress/item/ProgressItem.native.tsx
@@ -16,8 +16,7 @@ const ProgressItem = React.forwardRef(
   ({ children, percent, status, ...others }: ProgressItemProps, ref: React.Ref<ViewType>): JSX.Element => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const givenProps = others as any
-    const givenstyle = givenProps.style
-
+    const { style } = givenProps
     const animation = useRef(new Animated.Value(0)).current
 
     useEffect(() => {
@@ -37,7 +36,7 @@ const ProgressItem = React.forwardRef(
     })
 
     return (
-      <Animated.View ref={ref} style={[{ width }, ...givenstyle]} {...others}>
+      <Animated.View ref={ref} style={[{ width }, ...style]}>
         {children}
       </Animated.View>
     )