🐛 fix: Fix components

lobehub · Aug 30, 2024 · c21f99a · c21f99a
1 parent 6b5070d
commit c21f99a
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 67 deletions.
diff --git a/src/ModelIcon/index.tsx b/src/ModelIcon/index.tsx
@@ -24,61 +24,52 @@ const ModelIcon = forwardRef<any, ModelIconProps>(
       }
     }, [originModel]);
 
+    const props = {
+      ref,
+      size,
+      ...Render?.props,
+      ...rest,
+    };
+
     switch (type) {
       case 'avatar': {
-        if (!Render?.Icon) return <DefaultAvatar ref={ref} size={size} {...rest} />;
-        return <Render.Icon.Avatar ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
+        if (!Render?.Icon) return <DefaultAvatar {...props} />;
+        return <Render.Icon.Avatar {...props} />;
       }
       case 'mono': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
-        return <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
+        return <Render.Icon {...props} />;
       }
       case 'color': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
-        return Render.Icon?.Color ? (
-          <Render.Icon.Color ref={ref} size={size} {...(Render?.props || {})} {...rest} />
-        ) : (
-          <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
-        );
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
+        return Render.Icon?.Color ? <Render.Icon.Color {...props} /> : <Render.Icon {...props} />;
       }
       case 'combine': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
         return Render.Icon?.Combine ? (
-          <Render.Icon.Combine ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Combine type={'mono'} {...props} />
         ) : Render.Icon?.Brand ? (
-          <Render.Icon.Brand ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Brand {...props} />
         ) : Render.Icon?.Text ? (
-          <Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Text {...props} />
         ) : (
-          <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon {...props} />
         );
       }
       case 'combine-color': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
         return Render.Icon?.Combine ? (
-          <Render.Icon.Combine
-            ref={ref}
-            size={size}
-            type={'color'}
-            {...(Render?.props || {})}
-            {...rest}
-          />
+          <Render.Icon.Combine type={'color'} {...props} />
         ) : Render.Icon?.BrandColor ? (
-          <Render.Icon.BrandColor
-            ref={ref}
-            size={size}
-            type={'color'}
-            {...(Render?.props || {})}
-            {...rest}
-          />
+          <Render.Icon.BrandColor {...props} />
         ) : Render.Icon?.Text ? (
-          <Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Text {...props} />
         ) : (
-          <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon {...props} />
         );
       }
       default: {
-        return <DefaultIcon ref={ref} size={size} {...rest} />;
+        return <DefaultIcon {...props} />;
       }
     }
   },

diff --git a/src/ProviderIcon/index.tsx b/src/ProviderIcon/index.tsx
@@ -26,65 +26,56 @@ const ProviderIcon = forwardRef<any, ProviderIconProps>(
       }
     }, [originProvider]);
 
+    const props = {
+      ref,
+      size,
+      ...Render?.props,
+      ...rest,
+    };
+
     switch (type) {
       case 'avatar': {
-        if (!Render?.Icon) return <DefaultAvatar ref={ref} size={size} {...rest} />;
-        return <Render.Icon.Avatar ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
+        if (!Render?.Icon) return <DefaultAvatar {...props} />;
+        return <Render.Icon.Avatar {...props} />;
       }
       case 'mono': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
         if (!forceMono && originProvider === ModelProvider.LobeHub) {
           // @ts-ignore
-          return <Render.Icon.Color ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
+          return <Render.Icon.Color {...props} />;
         }
-        return <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
+        return <Render.Icon {...props} />;
       }
       case 'color': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
-        return Render.Icon?.Color ? (
-          <Render.Icon.Color ref={ref} size={size} {...(Render?.props || {})} {...rest} />
-        ) : (
-          <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
-        );
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
+        return Render.Icon?.Color ? <Render.Icon.Color {...props} /> : <Render.Icon {...props} />;
       }
       case 'combine': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
         return Render.Icon?.Combine ? (
-          <Render.Icon.Combine ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Combine type={'mono'} {...props} />
         ) : Render.Icon?.Brand ? (
-          <Render.Icon.Brand ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Brand {...props} />
         ) : Render.Icon?.Text ? (
-          <Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Text {...props} />
         ) : (
-          <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon {...props} />
         );
       }
       case 'combine-color': {
-        if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
+        if (!Render?.Icon) return <DefaultIcon {...props} />;
         return Render.Icon?.Combine ? (
-          <Render.Icon.Combine
-            ref={ref}
-            size={size}
-            type={'color'}
-            {...(Render?.props || {})}
-            {...rest}
-          />
+          <Render.Icon.Combine type={'color'} {...props} />
         ) : Render.Icon?.BrandColor ? (
-          <Render.Icon.BrandColor
-            ref={ref}
-            size={size}
-            type={'color'}
-            {...(Render?.props || {})}
-            {...rest}
-          />
+          <Render.Icon.BrandColor {...props} />
         ) : Render.Icon?.Text ? (
-          <Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon.Text {...props} />
         ) : (
-          <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
+          <Render.Icon {...props} />
         );
       }
       default: {
-        return <DefaultIcon ref={ref} size={size} {...rest} />;
+        return <DefaultIcon {...props} />;
       }
     }
   },