Skip to content

feat(Badge): Add badge of neutral color #367

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
benjitrosch merged 9 commits into from
Jun 23, 2023
Merged

feat(Badge): Add badge of neutral color #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a9bbed0
feat(Button): support different html tags
yoshi6jp Jun 22, 2023
6962d21
feat(Button): improve type system
yoshi6jp Jun 23, 2023
2097742
test(Button): Omit generics from the test code.
yoshi6jp Jun 23, 2023
77262d9
feat(Dropdown): Add Details Element
yoshi6jp Jun 14, 2023
035e486
fix import
yoshi6jp Jun 14, 2023
e86e493
fix type
yoshi6jp Jun 23, 2023
6ceeaee
feat(Dropdown): Add Details Element
yoshi6jp Jun 14, 2023
099bcba
feat(Collapse): Add collapse details
yoshi6jp Jun 15, 2023
6f707db
feat(Badge): Add badge of neutral color
yoshi6jp Jun 16, 2023
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
182 changes: 128 additions & 54 deletions src/Badge/Badge.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,74 +10,56 @@ export default {
} as Meta

export const Default: Story<BadgeProps> = (args) => {
return <Badge {...args}>Example</Badge>
return <Badge {...args}>Badge</Badge>
}
Default.args = {}

export const Colors: Story<BadgeProps> = (args) => {
export const BrandColors: Story<BadgeProps> = (args) => {
return (
<div>
<div>
<Badge {...args}>neutral</Badge>
<Badge {...args} color="primary">
primary
</Badge>
<Badge {...args} color="secondary">
secondary
</Badge>
<Badge {...args} color="accent">
accent
</Badge>
<Badge {...args} color="ghost">
ghost
</Badge>
</div>
<div>
<Badge {...args} color="success">
success
</Badge>
<Badge {...args} color="info">
info
</Badge>
<Badge {...args} color="warning">
warning
</Badge>
<Badge {...args} color="error">
error
</Badge>
</div>
<div className="flex gap-2 items-center">
<Badge {...args}>default</Badge>
<Badge {...args} color="neutral">
neutral
</Badge>
<Badge {...args} color="primary">
primary
</Badge>
<Badge {...args} color="secondary">
secondary
</Badge>
<Badge {...args} color="accent">
accent
</Badge>
<Badge {...args} color="ghost">
ghost
</Badge>
</div>
)
}
Colors.args = {
className: 'm-1'
}

export const Outline: Story<BadgeProps> = (args) => {
return (
<div>
<Badge {...args} variant="outline">
neutral
</Badge>
<Badge {...args} color="primary" variant="outline">
<div className="flex gap-2 items-center">
<Badge {...args}>default</Badge>
<Badge {...args} color="primary">
primary
</Badge>
<Badge {...args} color="secondary" variant="outline">
<Badge {...args} color="secondary">
secondary
</Badge>
<Badge {...args} color="accent" variant="outline">
<Badge {...args} color="accent">
accent
</Badge>
</div>
)
}
Outline.args = {
className: 'm-1'
variant: 'outline',
}

export const Sizes: Story<BadgeProps> = (args) => {
return (
<div>
<div className="flex gap-2 items-center">
<Badge {...args} size="lg">
987,654
</Badge>
Expand All @@ -93,9 +75,6 @@ export const Sizes: Story<BadgeProps> = (args) => {
</div>
)
}
Sizes.args = {
className: 'm-1'
}

export const Empty: Story<BadgeProps> = (args) => {
return (
Expand All @@ -107,17 +86,112 @@ export const Empty: Story<BadgeProps> = (args) => {
</div>
)
}
Empty.args = {}
Empty.args = {
color: 'primary',
}

export const BadgeInText: Story<BadgeProps> = (args) => {
export const StateColors: Story<BadgeProps> = (args) => {
return (
<div className="flex gap-2 items-center">
<h2 className="text-xl gap-2">
Heading{' '}
<Badge {...args} color="info">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
className="inline-block w-4 h-4 stroke-current"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M6 18L18 6M6 6l12 12"
></path>
</svg>
info
</Badge>
<Badge {...args} color="success">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
className="inline-block w-4 h-4 stroke-current"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M6 18L18 6M6 6l12 12"
></path>
</svg>
success
</Badge>
<Badge {...args} color="warning">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
className="inline-block w-4 h-4 stroke-current"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M6 18L18 6M6 6l12 12"
></path>
</svg>
warning
</Badge>
<Badge {...args} color="error">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
className="inline-block w-4 h-4 stroke-current"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M6 18L18 6M6 6l12 12"
></path>
</svg>
error
</Badge>
</div>
)
}
StateColors.args = {
className: 'gap-2',
}

export const BadgeInText: Story<BadgeProps> = (args) => {
return (
<div className="flex flex-col gap-2 items-center">
<h2 className="text-xl">
Heading
<Badge {...args} size="lg">
NEW
</Badge>
</h2>
<h3 className="text-xl">
Heading
<Badge {...args} size="md">
NEW
</Badge>
</h3>
<h4 className="text-base">
Heading
<Badge {...args} size="sm">
NEW
</Badge>
</h4>

<h5 className="text-sm">
Heading
<Badge {...args} size="xs">
NEW
</Badge>
</h5>
</div>
)
}
Expand All @@ -126,13 +200,13 @@ BadgeInText.args = {}
export const BadgeInAButton: Story<BadgeProps> = (args) => {
return (
<div className="flex gap-2 items-center">
<Button className="gap-2">
<Button>
Inbox
<Badge {...args}>+99</Badge>
</Button>
<Button className="gap-2">
<Button>
Inbox
<Badge {...args} color="primary">
<Badge {...args} color="secondary">
+99
</Badge>
</Button>
Expand Down
1 change: 1 addition & 0 deletions src/Badge/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const Badge = forwardRef<HTMLDivElement, BadgeProps>(
'badge-sm': size === 'sm',
'badge-xs': size === 'xs',
'badge-outline': variant === 'outline' || outline,
'badge-neutral': color === 'neutral',
'badge-primary': color === 'primary',
'badge-secondary': color === 'secondary',
'badge-accent': color === 'accent',
Expand Down
Loading