Skip to content
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

feat(component): add primary variant to badge #518

Merged
merged 3 commits into from
Apr 14, 2021
Merged

feat(component): add primary variant to badge #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5f6502
feat(component): add primary variant to badge
Apr 13, 2021
0a5aec8
feat(component): test message change
Apr 14, 2021
6dff335
feat(component): update snapshot
Apr 14, 2021
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
2 changes: 1 addition & 1 deletion packages/big-design/src/components/Badge/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { StyledBadge } from './styled';

export interface BadgeProps extends HTMLAttributes<HTMLSpanElement>, MarginProps {
label: string;
variant?: 'danger' | 'secondary' | 'success' | 'warning';
variant?: 'danger' | 'secondary' | 'success' | 'warning' | 'primary';
}

export const Badge: React.FC<BadgeProps> = memo(({ className, style, label, ...props }) =>
Expand Down
21 changes: 21 additions & 0 deletions packages/big-design/src/components/Badge/__snapshots__/spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,27 @@ exports[`render default Badge 1`] = `
</span>
`;

exports[`render primary Badge 1`] = `
.c0 {
color: #FFFFFF;
border-radius: 0.25rem;
display: inline-block;
font-size: 0.75rem;
font-weight: 600;
line-height: 1.25rem;
text-align: center;
text-transform: uppercase;
padding: 0 0.5rem;
background-color: #3C64F4;
}

<span
class="c0"
>
Badge
</span>
`;

exports[`render secondary Badge 1`] = `
.c0 {
color: #FFFFFF;
Expand Down
7 changes: 7 additions & 0 deletions packages/big-design/src/components/Badge/spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ test('render secondary Badge', () => {
expect(container.firstChild).toHaveStyle(`background-color: ${theme.colors.secondary60}`);
});

test('render primary Badge', () => {
const { container } = render(<Badge label="Badge" variant="primary" />);

expect(container.firstChild).toMatchSnapshot();
expect(container.firstChild).toHaveStyle(`background-color: ${theme.colors.primary40}`);
});

test("doesn't render if label prop is invalid", () => {
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// @ts-ignore
Expand Down
6 changes: 6 additions & 0 deletions packages/big-design/src/components/Badge/styled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ export const StyledBadge = styled.span<Omit<BadgeProps, 'label'>>`
css`
background-color: ${theme.colors.danger40};
`}

${({ theme, variant }) =>
variant === 'primary' &&
css`
background-color: ${theme.colors.primary40};
`}
`;

StyledBadge.defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/PropTables/BadgePropTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const badgeProps: Prop[] = [
},
{
name: 'variant',
types: ['danger', 'secondary', 'success', 'warning'],
types: ['danger', 'secondary', 'success', 'warning', 'primary'],
description: 'Determines which badge to display.',
defaultValue: 'secondary',
},
Expand Down
7 changes: 4 additions & 3 deletions packages/docs/pages/Badge/BadgePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,19 @@ const BadgePage = () => (
<H1>Variants</H1>

<Text>
There are four types of variants to choose from: <Code>success</Code>, <Code>secondary</Code>,{' '}
<Code>warning</Code>, and <Code>danger</Code>. You can determine what type by using the{' '}
There are five types of variants to choose from: <Code>success</Code>, <Code>secondary</Code>,{' '}
<Code>warning</Code>, <Code>danger</Code>, and <Code>primary</Code>. You can determine what type by using the{' '}
<Code primary>variant</Code> prop.
</Text>

<CodePreview>
{/* jsx-to-string:start */}
<Grid gridColumns="repeat(4, min-content)">
<Grid gridColumns="repeat(5, min-content)">
<Badge variant="secondary" label="secondary" />
<Badge variant="success" label="success" />
<Badge variant="warning" label="warning" />
<Badge variant="danger" label="danger" />
<Badge variant="primary" label="primary" />
</Grid>
{/* jsx-to-string:end */}
</CodePreview>
Expand Down