refactor(webui): move badge into primitives
- move the shared badge primitive and styling out of the form component module - keep primary-button badge styling working via a data-slot hook instead of a form-local class - update the import pages and primitive tests to consume the new home for Badge
This commit is contained in:
parent
9da8251e43
commit
a65fbfd532
9 changed files with 86 additions and 68 deletions
|
|
@ -449,48 +449,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.badge {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
min-width: 2ch;
|
|
||||||
padding: 1px 7px;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
border-radius: 999px;
|
|
||||||
font-size: 0.74rem;
|
|
||||||
font-weight: 700;
|
|
||||||
line-height: 1.2;
|
|
||||||
white-space: nowrap;
|
|
||||||
vertical-align: middle;
|
|
||||||
color: rgba(255, 255, 255, 0.45);
|
|
||||||
background: rgba(255, 255, 255, 0.05);
|
|
||||||
border-color: rgba(255, 255, 255, 0.08);
|
|
||||||
|
|
||||||
&[data-tone='info'] {
|
|
||||||
color: rgb(var(--accent-light-rgb));
|
|
||||||
background: rgba(var(--accent-rgb), 0.12);
|
|
||||||
border-color: rgba(var(--accent-light-rgb), 0.12);
|
|
||||||
}
|
|
||||||
|
|
||||||
&[data-tone='success'] {
|
|
||||||
color: #4ade80;
|
|
||||||
background: rgba(74, 222, 128, 0.12);
|
|
||||||
border-color: rgba(74, 222, 128, 0.12);
|
|
||||||
}
|
|
||||||
|
|
||||||
&[data-tone='warning'] {
|
|
||||||
color: #fbbf24;
|
|
||||||
background: rgba(251, 191, 36, 0.12);
|
|
||||||
border-color: rgba(251, 191, 36, 0.12);
|
|
||||||
}
|
|
||||||
|
|
||||||
&[data-tone='danger'] {
|
|
||||||
color: #f87171;
|
|
||||||
background: rgba(248, 113, 113, 0.12);
|
|
||||||
border-color: rgba(248, 113, 113, 0.12);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.button {
|
.button {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
@ -576,7 +534,7 @@
|
||||||
color: rgba(0, 0, 0, 0.55);
|
color: rgba(0, 0, 0, 0.55);
|
||||||
}
|
}
|
||||||
|
|
||||||
&[data-variant='primary'] .badge {
|
&[data-variant='primary'] [data-slot='badge'] {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: rgba(0, 0, 0, 0.18);
|
background: rgba(0, 0, 0, 0.18);
|
||||||
border-color: rgba(0, 0, 0, 0.22);
|
border-color: rgba(0, 0, 0, 0.22);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ import { useState } from 'react';
|
||||||
import { describe, expect, it } from 'vitest';
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Badge,
|
|
||||||
Button,
|
Button,
|
||||||
Checkbox,
|
Checkbox,
|
||||||
FormActions,
|
FormActions,
|
||||||
|
|
@ -115,8 +114,6 @@ function FormDemo() {
|
||||||
/>
|
/>
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
<Badge tone="warning">12</Badge>
|
|
||||||
|
|
||||||
<FormError message="Validation failed" />
|
<FormError message="Validation failed" />
|
||||||
|
|
||||||
<FormActions>
|
<FormActions>
|
||||||
|
|
@ -170,7 +167,6 @@ describe('form primitives', () => {
|
||||||
fireEvent.click(highPriority);
|
fireEvent.click(highPriority);
|
||||||
expect(highPriority).toHaveAttribute('aria-pressed', 'true');
|
expect(highPriority).toHaveAttribute('aria-pressed', 'true');
|
||||||
|
|
||||||
expect(screen.getByText('12')).toHaveAttribute('data-tone', 'warning');
|
|
||||||
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
|
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
|
||||||
expect(screen.getByRole('button', { name: 'Save' })).toHaveAttribute('data-variant', 'primary');
|
expect(screen.getByRole('button', { name: 'Save' })).toHaveAttribute('data-variant', 'primary');
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -283,22 +283,6 @@ export const OptionButton = forwardRef<HTMLButtonElement, OptionButtonProps>(fun
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
type BaseBadgeProps = ComponentPropsWithoutRef<'span'>;
|
|
||||||
|
|
||||||
export type BadgeTone = 'neutral' | 'info' | 'success' | 'warning' | 'danger';
|
|
||||||
|
|
||||||
export type BadgeProps = Omit<BaseBadgeProps, 'className'> & {
|
|
||||||
className?: string;
|
|
||||||
tone?: BadgeTone;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Badge = forwardRef<HTMLSpanElement, BadgeProps>(function Badge(
|
|
||||||
{ className, tone = 'neutral', ...props },
|
|
||||||
ref,
|
|
||||||
) {
|
|
||||||
return <span ref={ref} className={clsx(styles.badge, className)} data-tone={tone} {...props} />;
|
|
||||||
});
|
|
||||||
|
|
||||||
type BaseButtonProps = ComponentPropsWithoutRef<typeof BaseButton>;
|
type BaseButtonProps = ComponentPropsWithoutRef<typeof BaseButton>;
|
||||||
|
|
||||||
export type ButtonProps = Omit<BaseButtonProps, 'className'> & {
|
export type ButtonProps = Omit<BaseButtonProps, 'className'> & {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
export {
|
export {
|
||||||
Button,
|
Button,
|
||||||
Badge,
|
|
||||||
FormActions,
|
FormActions,
|
||||||
FormError,
|
FormError,
|
||||||
FormField,
|
FormField,
|
||||||
|
|
|
||||||
|
|
@ -43,3 +43,45 @@
|
||||||
background: rgba(255, 120, 120, 0.08);
|
background: rgba(255, 120, 120, 0.08);
|
||||||
color: rgba(255, 214, 214, 0.94);
|
color: rgba(255, 214, 214, 0.94);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.badge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-width: 2ch;
|
||||||
|
padding: 1px 7px;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: 999px;
|
||||||
|
font-size: 0.74rem;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.2;
|
||||||
|
white-space: nowrap;
|
||||||
|
vertical-align: middle;
|
||||||
|
color: rgba(255, 255, 255, 0.45);
|
||||||
|
background: rgba(255, 255, 255, 0.05);
|
||||||
|
border-color: rgba(255, 255, 255, 0.08);
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge[data-tone='info'] {
|
||||||
|
color: rgb(var(--accent-light-rgb));
|
||||||
|
background: rgba(var(--accent-rgb), 0.12);
|
||||||
|
border-color: rgba(var(--accent-light-rgb), 0.12);
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge[data-tone='success'] {
|
||||||
|
color: #4ade80;
|
||||||
|
background: rgba(74, 222, 128, 0.12);
|
||||||
|
border-color: rgba(74, 222, 128, 0.12);
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge[data-tone='warning'] {
|
||||||
|
color: #fbbf24;
|
||||||
|
background: rgba(251, 191, 36, 0.12);
|
||||||
|
border-color: rgba(251, 191, 36, 0.12);
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge[data-tone='danger'] {
|
||||||
|
color: #f87171;
|
||||||
|
background: rgba(248, 113, 113, 0.12);
|
||||||
|
border-color: rgba(248, 113, 113, 0.12);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { render, screen } from '@testing-library/react';
|
import { render, screen } from '@testing-library/react';
|
||||||
import { describe, expect, it } from 'vitest';
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
import { Notice, Show } from './primitives';
|
import { Badge, Notice, Show } from './primitives';
|
||||||
|
|
||||||
describe('Show', () => {
|
describe('Show', () => {
|
||||||
it('renders children when the condition is true', () => {
|
it('renders children when the condition is true', () => {
|
||||||
|
|
@ -50,3 +50,18 @@ describe('Notice', () => {
|
||||||
expect(screen.getByRole('note')).toHaveAttribute('data-tone', 'warning');
|
expect(screen.getByRole('note')).toHaveAttribute('data-tone', 'warning');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Badge', () => {
|
||||||
|
it('renders with neutral styling by default', () => {
|
||||||
|
render(<Badge>12</Badge>);
|
||||||
|
|
||||||
|
expect(screen.getByText('12')).toHaveAttribute('data-slot', 'badge');
|
||||||
|
expect(screen.getByText('12')).toHaveAttribute('data-tone', 'neutral');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('supports tone overrides', () => {
|
||||||
|
render(<Badge tone="warning">12</Badge>);
|
||||||
|
|
||||||
|
expect(screen.getByText('12')).toHaveAttribute('data-tone', 'warning');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,30 @@ export function Show<T>({ fallback = null, children, when }: ShowProps<T>) {
|
||||||
return <>{children}</>;
|
return <>{children}</>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type BaseBadgeProps = ComponentPropsWithoutRef<'span'>;
|
||||||
|
|
||||||
|
export type BadgeTone = 'neutral' | 'info' | 'success' | 'warning' | 'danger';
|
||||||
|
|
||||||
|
export type BadgeProps = Omit<BaseBadgeProps, 'className'> & {
|
||||||
|
className?: string;
|
||||||
|
tone?: BadgeTone;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const Badge = forwardRef<HTMLSpanElement, BadgeProps>(function Badge(
|
||||||
|
{ className, tone = 'neutral', ...props },
|
||||||
|
ref,
|
||||||
|
) {
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
ref={ref}
|
||||||
|
className={clsx(styles.badge, className)}
|
||||||
|
data-slot="badge"
|
||||||
|
data-tone={tone}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
export type NoticeTone = 'neutral' | 'info' | 'success' | 'warning' | 'danger';
|
export type NoticeTone = 'neutral' | 'info' | 'success' | 'warning' | 'danger';
|
||||||
|
|
||||||
export type NoticeProps = Omit<ComponentPropsWithoutRef<'div'>, 'className'> & {
|
export type NoticeProps = Omit<ComponentPropsWithoutRef<'div'>, 'className'> & {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ import clsx from 'clsx';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Badge,
|
|
||||||
Button,
|
Button,
|
||||||
OptionButton,
|
OptionButton,
|
||||||
OptionButtonGroup,
|
OptionButtonGroup,
|
||||||
|
|
@ -11,6 +10,7 @@ import {
|
||||||
Select,
|
Select,
|
||||||
Switch,
|
Switch,
|
||||||
} from '@/components/form/form';
|
} from '@/components/form/form';
|
||||||
|
import { Badge } from '@/components/primitives';
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
ImportAutoFilter,
|
ImportAutoFilter,
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
import clsx from 'clsx';
|
import clsx from 'clsx';
|
||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
|
|
||||||
import { Badge, Button, Checkbox, TextInput } from '@/components/form/form';
|
import { Button, Checkbox, TextInput } from '@/components/form/form';
|
||||||
import { Notice } from '@/components/primitives';
|
import { Badge, Notice } from '@/components/primitives';
|
||||||
|
|
||||||
import type { SingleSearchState } from '../-import.store';
|
import type { SingleSearchState } from '../-import.store';
|
||||||
import type { ImportTrackResult } from '../-import.types';
|
import type { ImportTrackResult } from '../-import.types';
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue