Skip to content

Commit ec06bc2

Browse files
committed
Fix a potential bug in icon default size passing in sidebar
1 parent 6f64455 commit ec06bc2

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

packages/oxygen-ui/src/components/Sidebar/SidebarItemIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ export const SidebarItemIcon: React.FC<SidebarItemIconProps> = ({
8585

8686
const iconWithSize = React.isValidElement(children)
8787
? React.cloneElement(children, {
88-
size: (children.props as { size?: number }).size ?? 20,
8988
...(children.props as object),
89+
size: (children.props as { size?: number }).size ?? 20,
9090
} as React.Attributes)
9191
: children;
9292

packages/oxygen-ui/src/components/UserMenu/UserMenuItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ export const UserMenuItem: React.FC<UserMenuItemProps> = ({
8585
<ListItemIcon>
8686
{React.isValidElement(icon)
8787
? React.cloneElement(icon, {
88-
size: (icon.props as { size?: number }).size ?? 18,
8988
...(icon.props as object),
89+
size: (icon.props as { size?: number }).size ?? 18,
9090
} as React.Attributes)
9191
: icon}
9292
</ListItemIcon>

packages/oxygen-ui/src/components/UserMenu/UserMenuLogout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ export const UserMenuLogout: React.FC<UserMenuLogoutProps> = ({
7575
<ListItemIcon>
7676
{React.isValidElement(icon)
7777
? React.cloneElement(icon, {
78-
size: (icon.props as { size?: number }).size ?? 18,
7978
...(icon.props as object),
79+
size: (icon.props as { size?: number }).size ?? 18,
8080
} as React.Attributes)
8181
: icon}
8282
</ListItemIcon>

0 commit comments

Comments
 (0)