Skip to content

Commit c21f99a

Browse files
canisminor1990canisminor1990
committed
🐛 fix: Fix components
1 parent 6b5070d commit c21f99a

File tree

2 files changed

+49
-67
lines changed

2 files changed

+49
-67
lines changed

‎src/ModelIcon/index.tsx

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,61 +24,52 @@ const ModelIcon = forwardRef<any, ModelIconProps>(
2424
}
2525
}, [originModel]);
2626

27+
const props = {
28+
ref,
29+
size,
30+
...Render?.props,
31+
...rest,
32+
};
33+
2734
switch (type) {
2835
case 'avatar': {
29-
if (!Render?.Icon) return <DefaultAvatar ref={ref} size={size} {...rest} />;
30-
return <Render.Icon.Avatar ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
36+
if (!Render?.Icon) return <DefaultAvatar {...props} />;
37+
return <Render.Icon.Avatar {...props} />;
3138
}
3239
case 'mono': {
33-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
34-
return <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
40+
if (!Render?.Icon) return <DefaultIcon {...props} />;
41+
return <Render.Icon {...props} />;
3542
}
3643
case 'color': {
37-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
38-
return Render.Icon?.Color ? (
39-
<Render.Icon.Color ref={ref} size={size} {...(Render?.props || {})} {...rest} />
40-
) : (
41-
<Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
42-
);
44+
if (!Render?.Icon) return <DefaultIcon {...props} />;
45+
return Render.Icon?.Color ? <Render.Icon.Color {...props} /> : <Render.Icon {...props} />;
4346
}
4447
case 'combine': {
45-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
48+
if (!Render?.Icon) return <DefaultIcon {...props} />;
4649
return Render.Icon?.Combine ? (
47-
<Render.Icon.Combine ref={ref} size={size} {...(Render?.props || {})} {...rest} />
50+
<Render.Icon.Combine type={'mono'} {...props} />
4851
) : Render.Icon?.Brand ? (
49-
<Render.Icon.Brand ref={ref} size={size} {...(Render?.props || {})} {...rest} />
52+
<Render.Icon.Brand {...props} />
5053
) : Render.Icon?.Text ? (
51-
<Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
54+
<Render.Icon.Text {...props} />
5255
) : (
53-
<Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
56+
<Render.Icon {...props} />
5457
);
5558
}
5659
case 'combine-color': {
57-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
60+
if (!Render?.Icon) return <DefaultIcon {...props} />;
5861
return Render.Icon?.Combine ? (
59-
<Render.Icon.Combine
60-
ref={ref}
61-
size={size}
62-
type={'color'}
63-
{...(Render?.props || {})}
64-
{...rest}
65-
/>
62+
<Render.Icon.Combine type={'color'} {...props} />
6663
) : Render.Icon?.BrandColor ? (
67-
<Render.Icon.BrandColor
68-
ref={ref}
69-
size={size}
70-
type={'color'}
71-
{...(Render?.props || {})}
72-
{...rest}
73-
/>
64+
<Render.Icon.BrandColor {...props} />
7465
) : Render.Icon?.Text ? (
75-
<Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
66+
<Render.Icon.Text {...props} />
7667
) : (
77-
<Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
68+
<Render.Icon {...props} />
7869
);
7970
}
8071
default: {
81-
return <DefaultIcon ref={ref} size={size} {...rest} />;
72+
return <DefaultIcon {...props} />;
8273
}
8374
}
8475
},

‎src/ProviderIcon/index.tsx

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,65 +26,56 @@ const ProviderIcon = forwardRef<any, ProviderIconProps>(
2626
}
2727
}, [originProvider]);
2828

29+
const props = {
30+
ref,
31+
size,
32+
...Render?.props,
33+
...rest,
34+
};
35+
2936
switch (type) {
3037
case 'avatar': {
31-
if (!Render?.Icon) return <DefaultAvatar ref={ref} size={size} {...rest} />;
32-
return <Render.Icon.Avatar ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
38+
if (!Render?.Icon) return <DefaultAvatar {...props} />;
39+
return <Render.Icon.Avatar {...props} />;
3340
}
3441
case 'mono': {
35-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
42+
if (!Render?.Icon) return <DefaultIcon {...props} />;
3643
if (!forceMono && originProvider === ModelProvider.LobeHub) {
3744
// @ts-ignore
38-
return <Render.Icon.Color ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
45+
return <Render.Icon.Color {...props} />;
3946
}
40-
return <Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />;
47+
return <Render.Icon {...props} />;
4148
}
4249
case 'color': {
43-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
44-
return Render.Icon?.Color ? (
45-
<Render.Icon.Color ref={ref} size={size} {...(Render?.props || {})} {...rest} />
46-
) : (
47-
<Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
48-
);
50+
if (!Render?.Icon) return <DefaultIcon {...props} />;
51+
return Render.Icon?.Color ? <Render.Icon.Color {...props} /> : <Render.Icon {...props} />;
4952
}
5053
case 'combine': {
51-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
54+
if (!Render?.Icon) return <DefaultIcon {...props} />;
5255
return Render.Icon?.Combine ? (
53-
<Render.Icon.Combine ref={ref} size={size} {...(Render?.props || {})} {...rest} />
56+
<Render.Icon.Combine type={'mono'} {...props} />
5457
) : Render.Icon?.Brand ? (
55-
<Render.Icon.Brand ref={ref} size={size} {...(Render?.props || {})} {...rest} />
58+
<Render.Icon.Brand {...props} />
5659
) : Render.Icon?.Text ? (
57-
<Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
60+
<Render.Icon.Text {...props} />
5861
) : (
59-
<Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
62+
<Render.Icon {...props} />
6063
);
6164
}
6265
case 'combine-color': {
63-
if (!Render?.Icon) return <DefaultIcon ref={ref} size={size} {...rest} />;
66+
if (!Render?.Icon) return <DefaultIcon {...props} />;
6467
return Render.Icon?.Combine ? (
65-
<Render.Icon.Combine
66-
ref={ref}
67-
size={size}
68-
type={'color'}
69-
{...(Render?.props || {})}
70-
{...rest}
71-
/>
68+
<Render.Icon.Combine type={'color'} {...props} />
7269
) : Render.Icon?.BrandColor ? (
73-
<Render.Icon.BrandColor
74-
ref={ref}
75-
size={size}
76-
type={'color'}
77-
{...(Render?.props || {})}
78-
{...rest}
79-
/>
70+
<Render.Icon.BrandColor {...props} />
8071
) : Render.Icon?.Text ? (
81-
<Render.Icon.Text ref={ref} size={size} {...(Render?.props || {})} {...rest} />
72+
<Render.Icon.Text {...props} />
8273
) : (
83-
<Render.Icon ref={ref} size={size} {...(Render?.props || {})} {...rest} />
74+
<Render.Icon {...props} />
8475
);
8576
}
8677
default: {
87-
return <DefaultIcon ref={ref} size={size} {...rest} />;
78+
return <DefaultIcon {...props} />;
8879
}
8980
}
9081
},

0 commit comments

Comments
 (0)