Skip to content

fix: standardize icon sizing inside Badge component #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SB2318 merged 3 commits into from
Jun 6, 2026
+21 −69
Merged

fix: standardize icon sizing inside Badge component #1038

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1922d7
Refactor Badge component to improve icon rendering
Tharsiga-21 Jun 2, 2026
cb57b6f
Merge branch 'web' into patch-1
SB2318 Jun 4, 2026
8ee89da
Update Badge.tsx
Tharsiga-21 Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 21 additions & 69 deletions src/components/ui/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ const sizeClasses: Record<BadgeSize, string> = {
md: "px-3.5 py-1 text-sm",
};

const iconSizeClasses: Record<BadgeSize, string> = {
sm: "w-3 h-3",
md: "w-4 h-4",
};

const interactiveClasses =
"focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-current disabled:cursor-not-allowed disabled:opacity-60";

Expand All @@ -62,87 +67,34 @@ const getBadgeClasses = (
.filter(Boolean)
.join(" ");

const renderBadgeContent = (
icon: React.ReactNode,
children: React.ReactNode,
label?: string
) => {
const content = children ?? label;

return (
<span
className={`inline-flex items-center gap-1.5 rounded-full font-medium transition-colors ${variantClasses[variant]} ${sizeClasses[size]}`}
>
{icon && <span className="flex-shrink-0">{icon}</span>}
{content}
</>
);
};

const Badge = (props: BadgeProps) => {
if (props.as === "button") {
const {
as: Component,
label,
children,
variant = "default",
size = "md",
icon,
className,
type = "button",
...buttonProps
} = props;

return (
<Component
type={type}
className={getBadgeClasses(variant, size, true, className)}
{...buttonProps}
>
{renderBadgeContent(icon, children, label)}
</Component>
);
}

if (props.as === "a") {
const {
as: Component,
label,
children,
variant = "default",
size = "md",
icon,
className,
...anchorProps
} = props;

return (
<Component
className={getBadgeClasses(variant, size, true, className)}
{...anchorProps}
>
{renderBadgeContent(icon, children, label)}
</Component>
);
}

const {
as: Component = "span",
label,
children,
variant = "default",
size = "md",
icon,
className,
...spanProps
} = props;
className = "",
...restProps
} = props as BadgeSpanProps & BadgeButtonProps & BadgeAnchorProps;

const isInteractive = Component === "button" || Component === "a";

Copy link
Copy Markdown
Owner

@SB2318 SB2318 Jun 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The icon sizing improvements look good, but this PR also removes existing Badge functionality (as, children, className, button/anchor rendering). These are API-breaking changes unrelated to the stated scope of standardizing icon sizing. Please preserve the existing Badge API and integrate the icon sizing updates into the current implementation instead. Also remove or reuse the unused interactiveClasses variable.

return (
<Component
className={getBadgeClasses(variant, size, false, className)}
{...spanProps}
className={getBadgeClasses(variant, size, isInteractive, className)}
{...restProps}
>
{renderBadgeContent(icon, children, label)}
{icon && (
<span
className={`inline-flex items-center justify-center shrink-0 text-current ${iconSizeClasses[size]}`}
aria-hidden="true"
>
{icon}
</span>
)}
{children ?? label}
</Component>
);
};
Expand Down
Loading