refactor(webui): merge primitives into one module
- fold Show and Notice into a single primitives module with one shared stylesheet - keep the primitives barrel export intact while shrinking the folder footprint - consolidate the primitive tests into one combined suite
This commit is contained in:
parent
01a0333d7a
commit
2a7c03f398
5 changed files with 112 additions and 25 deletions
|
|
@ -1 +1 @@
|
||||||
export { Show } from './show';
|
export * from './primitives';
|
||||||
|
|
|
||||||
45
webui/src/components/primitives/primitives.module.css
Normal file
45
webui/src/components/primitives/primitives.module.css
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
.notice {
|
||||||
|
box-sizing: border-box;
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
margin: 0 0 12px;
|
||||||
|
padding: 10px 14px;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
border-radius: 8px;
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
color: rgba(255, 255, 255, 0.82);
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 500;
|
||||||
|
line-height: 1.4;
|
||||||
|
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice[data-tone='neutral'] {
|
||||||
|
border-color: rgba(255, 255, 255, 0.08);
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
color: rgba(255, 255, 255, 0.82);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice[data-tone='info'] {
|
||||||
|
border-color: rgba(var(--accent-light-rgb), 0.24);
|
||||||
|
background: rgba(var(--accent-light-rgb), 0.08);
|
||||||
|
color: rgba(255, 232, 188, 0.94);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice[data-tone='success'] {
|
||||||
|
border-color: rgba(110, 220, 150, 0.26);
|
||||||
|
background: rgba(110, 220, 150, 0.08);
|
||||||
|
color: rgba(210, 255, 228, 0.94);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice[data-tone='warning'] {
|
||||||
|
border-color: rgba(255, 200, 100, 0.26);
|
||||||
|
background: rgba(255, 200, 100, 0.08);
|
||||||
|
color: rgba(255, 232, 188, 0.94);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice[data-tone='danger'] {
|
||||||
|
border-color: rgba(255, 120, 120, 0.26);
|
||||||
|
background: rgba(255, 120, 120, 0.08);
|
||||||
|
color: rgba(255, 214, 214, 0.94);
|
||||||
|
}
|
||||||
|
|
@ -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 { Show } from './show';
|
import { Notice, Show } from './primitives';
|
||||||
|
|
||||||
describe('Show', () => {
|
describe('Show', () => {
|
||||||
it('renders children when the condition is true', () => {
|
it('renders children when the condition is true', () => {
|
||||||
|
|
@ -31,3 +31,22 @@ describe('Show', () => {
|
||||||
expect(screen.getByText('Ada')).toBeInTheDocument();
|
expect(screen.getByText('Ada')).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Notice', () => {
|
||||||
|
it('renders as a note by default', () => {
|
||||||
|
render(<Notice>Fallback message</Notice>);
|
||||||
|
|
||||||
|
expect(screen.getByText('Fallback message')).toHaveAttribute('role', 'note');
|
||||||
|
expect(screen.getByText('Fallback message')).toHaveAttribute('data-tone', 'info');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('supports tone overrides', () => {
|
||||||
|
render(
|
||||||
|
<Notice tone="warning">
|
||||||
|
<span>Provider fallback</span>
|
||||||
|
</Notice>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.getByRole('note')).toHaveAttribute('data-tone', 'warning');
|
||||||
|
});
|
||||||
|
});
|
||||||
46
webui/src/components/primitives/primitives.tsx
Normal file
46
webui/src/components/primitives/primitives.tsx
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
import clsx from 'clsx';
|
||||||
|
import { forwardRef, type ComponentPropsWithoutRef, type ReactNode } from 'react';
|
||||||
|
|
||||||
|
import styles from './primitives.module.css';
|
||||||
|
|
||||||
|
type ShowChildren<T> = ReactNode | ((value: NonNullable<T>) => ReactNode);
|
||||||
|
|
||||||
|
export interface ShowProps<T> {
|
||||||
|
children: ShowChildren<T>;
|
||||||
|
fallback?: ReactNode;
|
||||||
|
when: T;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Show<T>({ fallback = null, children, when }: ShowProps<T>) {
|
||||||
|
if (!when) {
|
||||||
|
return <>{fallback}</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof children === 'function') {
|
||||||
|
return <>{(children as (value: NonNullable<T>) => ReactNode)(when as NonNullable<T>)}</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return <>{children}</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type NoticeTone = 'neutral' | 'info' | 'success' | 'warning' | 'danger';
|
||||||
|
|
||||||
|
export type NoticeProps = Omit<ComponentPropsWithoutRef<'div'>, 'className'> & {
|
||||||
|
className?: string;
|
||||||
|
tone?: NoticeTone;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const Notice = forwardRef<HTMLDivElement, NoticeProps>(function Notice(
|
||||||
|
{ className, tone = 'info', role = 'note', ...props },
|
||||||
|
ref,
|
||||||
|
) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
ref={ref}
|
||||||
|
className={clsx(styles.notice, className)}
|
||||||
|
data-tone={tone}
|
||||||
|
role={role}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
import type { ReactNode } from 'react';
|
|
||||||
|
|
||||||
type ShowChildren<T> = ReactNode | ((value: NonNullable<T>) => ReactNode);
|
|
||||||
|
|
||||||
export function Show<T>({
|
|
||||||
fallback = null,
|
|
||||||
children,
|
|
||||||
when,
|
|
||||||
}: {
|
|
||||||
children: ShowChildren<T>;
|
|
||||||
fallback?: ReactNode;
|
|
||||||
when: T;
|
|
||||||
}) {
|
|
||||||
if (!when) {
|
|
||||||
return <>{fallback}</>;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof children === 'function') {
|
|
||||||
return <>{(children as (value: NonNullable<T>) => ReactNode)(when as NonNullable<T>)}</>;
|
|
||||||
}
|
|
||||||
|
|
||||||
return <>{children}</>;
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue