feat(ui): 共享组件补齐——Card 面色分层 + Button link/lg + 4 原子件
- Card 新增 tone(panel/card/soft)/flat/interactive;cardClass 兼容旧字符串签名 - Button 新增 link(coral 文字链) 变体与 lg 尺寸 - 新增原子件 Eyebrow(统一眉题) / StatusDot(状态点·读屏可见) / Skeleton(motion-safe 占位) / Meter(进度条·progressbar) - PageHeader/SectionHeader 用 display/title 字阶 + Eyebrow 眉题
This commit is contained in:
@@ -1,20 +1,29 @@
|
|||||||
import type { HTMLAttributes, ReactNode } from "react";
|
import type { HTMLAttributes, ReactNode } from "react";
|
||||||
|
|
||||||
import { cardClass } from "@/lib/ui/variants";
|
import { cardClass, type CardTone } from "@/lib/ui/variants";
|
||||||
|
|
||||||
interface CardProps extends HTMLAttributes<HTMLElement> {
|
interface CardProps extends HTMLAttributes<HTMLElement> {
|
||||||
children: ReactNode;
|
children: ReactNode;
|
||||||
as?: "article" | "div" | "section";
|
as?: "article" | "div" | "section";
|
||||||
|
tone?: CardTone;
|
||||||
|
flat?: boolean;
|
||||||
|
interactive?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Card({
|
export function Card({
|
||||||
as: Component = "div",
|
as: Component = "div",
|
||||||
children,
|
children,
|
||||||
className,
|
className,
|
||||||
|
tone,
|
||||||
|
flat,
|
||||||
|
interactive,
|
||||||
...props
|
...props
|
||||||
}: CardProps) {
|
}: CardProps) {
|
||||||
return (
|
return (
|
||||||
<Component className={cardClass(className)} {...props}>
|
<Component
|
||||||
|
className={cardClass({ tone, flat, interactive, className })}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
{children}
|
{children}
|
||||||
</Component>
|
</Component>
|
||||||
);
|
);
|
||||||
|
|||||||
23
apps/web/components/ui/Eyebrow.tsx
Normal file
23
apps/web/components/ui/Eyebrow.tsx
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import type { ReactNode } from "react";
|
||||||
|
|
||||||
|
import { cn } from "@/lib/ui/variants";
|
||||||
|
|
||||||
|
interface EyebrowProps {
|
||||||
|
children: ReactNode;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 眉题/小标签:无衬线、eyebrow 字号(含正字距 0.08em)、说明色、大写。
|
||||||
|
// 统一各页此前 mono/uppercase 互不一致的小标签写法。
|
||||||
|
export function Eyebrow({ children, className }: EyebrowProps) {
|
||||||
|
return (
|
||||||
|
<p
|
||||||
|
className={cn(
|
||||||
|
"font-sans text-eyebrow uppercase text-muted-soft",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</p>
|
||||||
|
);
|
||||||
|
}
|
||||||
45
apps/web/components/ui/Meter.tsx
Normal file
45
apps/web/components/ui/Meter.tsx
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import { cn } from "@/lib/ui/variants";
|
||||||
|
|
||||||
|
export type MeterTone = "accent" | "success" | "warning" | "danger" | "info";
|
||||||
|
|
||||||
|
const meterTones: Record<MeterTone, string> = {
|
||||||
|
accent: "bg-cinnabar",
|
||||||
|
success: "bg-pass",
|
||||||
|
warning: "bg-overdue",
|
||||||
|
danger: "bg-conflict",
|
||||||
|
info: "bg-info",
|
||||||
|
};
|
||||||
|
|
||||||
|
interface MeterProps {
|
||||||
|
/** 0..1,超出范围自动夹取。 */
|
||||||
|
value: number;
|
||||||
|
tone?: MeterTone;
|
||||||
|
label?: string;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 进度条:语义色填充,宽度过渡走动效 token;对读屏暴露 progressbar。
|
||||||
|
export function Meter({ value, tone = "accent", label, className }: MeterProps) {
|
||||||
|
const pct = Math.max(0, Math.min(1, value)) * 100;
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
"h-1.5 w-full overflow-hidden rounded-full bg-line/60",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
role="progressbar"
|
||||||
|
aria-valuenow={Math.round(pct)}
|
||||||
|
aria-valuemin={0}
|
||||||
|
aria-valuemax={100}
|
||||||
|
aria-label={label}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
"h-full rounded-full transition-[width] duration-base ease-standard",
|
||||||
|
meterTones[tone],
|
||||||
|
)}
|
||||||
|
style={{ width: `${pct}%` }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
import type { ReactNode } from "react";
|
import type { ReactNode } from "react";
|
||||||
|
|
||||||
|
import { Eyebrow } from "./Eyebrow";
|
||||||
|
|
||||||
interface PageHeaderProps {
|
interface PageHeaderProps {
|
||||||
title: string;
|
title: string;
|
||||||
eyebrow?: string;
|
eyebrow?: string;
|
||||||
@@ -16,12 +18,8 @@ export function PageHeader({
|
|||||||
return (
|
return (
|
||||||
<header className="mb-6 flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
|
<header className="mb-6 flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
|
||||||
<div>
|
<div>
|
||||||
{eyebrow ? (
|
{eyebrow ? <Eyebrow className="mb-1.5">{eyebrow}</Eyebrow> : null}
|
||||||
<p className="mb-1 font-mono text-xs uppercase tracking-wide text-ink-soft/70">
|
<h1 className="font-serif text-display-sm text-ink">{title}</h1>
|
||||||
{eyebrow}
|
|
||||||
</p>
|
|
||||||
) : null}
|
|
||||||
<h1 className="font-serif text-2xl text-ink">{title}</h1>
|
|
||||||
{description ? (
|
{description ? (
|
||||||
<p className="mt-2 max-w-2xl text-sm leading-6 text-ink-soft">
|
<p className="mt-2 max-w-2xl text-sm leading-6 text-ink-soft">
|
||||||
{description}
|
{description}
|
||||||
|
|||||||
@@ -2,8 +2,11 @@ import type { ReactNode } from "react";
|
|||||||
|
|
||||||
import { cn } from "@/lib/ui/variants";
|
import { cn } from "@/lib/ui/variants";
|
||||||
|
|
||||||
|
import { Eyebrow } from "./Eyebrow";
|
||||||
|
|
||||||
interface SectionHeaderProps {
|
interface SectionHeaderProps {
|
||||||
title: string;
|
title: string;
|
||||||
|
eyebrow?: string;
|
||||||
description?: ReactNode;
|
description?: ReactNode;
|
||||||
action?: ReactNode;
|
action?: ReactNode;
|
||||||
className?: string;
|
className?: string;
|
||||||
@@ -11,6 +14,7 @@ interface SectionHeaderProps {
|
|||||||
|
|
||||||
export function SectionHeader({
|
export function SectionHeader({
|
||||||
title,
|
title,
|
||||||
|
eyebrow,
|
||||||
description,
|
description,
|
||||||
action,
|
action,
|
||||||
className,
|
className,
|
||||||
@@ -18,7 +22,8 @@ export function SectionHeader({
|
|||||||
return (
|
return (
|
||||||
<div className={cn("flex items-start justify-between gap-4", className)}>
|
<div className={cn("flex items-start justify-between gap-4", className)}>
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<h2 className="font-serif text-base text-ink">{title}</h2>
|
{eyebrow ? <Eyebrow className="mb-1">{eyebrow}</Eyebrow> : null}
|
||||||
|
<h2 className="font-serif text-title-md text-ink">{title}</h2>
|
||||||
{description ? (
|
{description ? (
|
||||||
<p className="mt-1 text-sm leading-6 text-ink-soft">{description}</p>
|
<p className="mt-1 text-sm leading-6 text-ink-soft">{description}</p>
|
||||||
) : null}
|
) : null}
|
||||||
|
|||||||
18
apps/web/components/ui/Skeleton.tsx
Normal file
18
apps/web/components/ui/Skeleton.tsx
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { cn } from "@/lib/ui/variants";
|
||||||
|
|
||||||
|
interface SkeletonProps {
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 加载占位:柔和线条底 + motion-safe 脉冲(尊重 prefers-reduced-motion)。
|
||||||
|
export function Skeleton({ className }: SkeletonProps) {
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
className={cn(
|
||||||
|
"block rounded-md bg-line/60 motion-safe:animate-pulse",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
41
apps/web/components/ui/StatusDot.tsx
Normal file
41
apps/web/components/ui/StatusDot.tsx
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import { cn } from "@/lib/ui/variants";
|
||||||
|
|
||||||
|
export type StatusTone =
|
||||||
|
| "neutral"
|
||||||
|
| "accent"
|
||||||
|
| "success"
|
||||||
|
| "warning"
|
||||||
|
| "danger"
|
||||||
|
| "info";
|
||||||
|
|
||||||
|
const dotTones: Record<StatusTone, string> = {
|
||||||
|
neutral: "bg-ink-soft",
|
||||||
|
accent: "bg-cinnabar",
|
||||||
|
success: "bg-pass",
|
||||||
|
warning: "bg-overdue",
|
||||||
|
danger: "bg-conflict",
|
||||||
|
info: "bg-info",
|
||||||
|
};
|
||||||
|
|
||||||
|
interface StatusDotProps {
|
||||||
|
tone?: StatusTone;
|
||||||
|
/** 提供 label 时对读屏可见(不单靠颜色传达状态)。 */
|
||||||
|
label?: string;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 状态点:语义色圆点,配合文案使用;有 label 时暴露给读屏。
|
||||||
|
export function StatusDot({ tone = "neutral", label, className }: StatusDotProps) {
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={cn(
|
||||||
|
"inline-block h-2 w-2 shrink-0 rounded-full",
|
||||||
|
dotTones[tone],
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
role={label ? "img" : undefined}
|
||||||
|
aria-label={label}
|
||||||
|
aria-hidden={label ? undefined : true}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -50,6 +50,33 @@ describe("ui variants", () => {
|
|||||||
expect(inputClass()).toContain(transitionUi);
|
expect(inputClass()).toContain(transitionUi);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("builds a coral inline link button variant", () => {
|
||||||
|
const klass = buttonClass({ variant: "link" });
|
||||||
|
|
||||||
|
expect(klass).toContain("text-cinnabar");
|
||||||
|
expect(klass).toContain("underline-offset-4");
|
||||||
|
expect(klass).toContain("hover:underline");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("supports a large button size for prominent CTAs", () => {
|
||||||
|
expect(buttonClass({ size: "lg" })).toContain("px-5");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("layers card surface tones and can drop the shadow", () => {
|
||||||
|
expect(cardClass({ tone: "card" })).toContain("bg-surface-card");
|
||||||
|
expect(cardClass({ tone: "soft" })).toContain("bg-surface-soft");
|
||||||
|
expect(cardClass()).toContain("bg-panel");
|
||||||
|
expect(cardClass({ flat: true })).not.toContain("shadow-paper");
|
||||||
|
expect(cardClass({ interactive: true })).toContain("hover:border-cinnabar/40");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps the legacy string cardClass signature working", () => {
|
||||||
|
const klass = cardClass("mt-4");
|
||||||
|
expect(klass).toContain("mt-4");
|
||||||
|
expect(klass).toContain("bg-panel");
|
||||||
|
expect(klass).toContain("rounded-lg");
|
||||||
|
});
|
||||||
|
|
||||||
it("keeps warning badges readable on the paper background", () => {
|
it("keeps warning badges readable on the paper background", () => {
|
||||||
const klass = badgeClass({ variant: "warning" });
|
const klass = badgeClass({ variant: "warning" });
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,12 @@ export type ButtonVariant =
|
|||||||
| "secondary"
|
| "secondary"
|
||||||
| "outline"
|
| "outline"
|
||||||
| "ghost"
|
| "ghost"
|
||||||
| "danger";
|
| "danger"
|
||||||
|
| "link";
|
||||||
|
|
||||||
export type ButtonSize = "sm" | "md" | "icon";
|
export type ButtonSize = "sm" | "md" | "lg" | "icon";
|
||||||
|
|
||||||
|
export type CardTone = "panel" | "card" | "soft";
|
||||||
|
|
||||||
export type BadgeVariant =
|
export type BadgeVariant =
|
||||||
| "neutral"
|
| "neutral"
|
||||||
@@ -48,11 +51,13 @@ const buttonVariants: Record<ButtonVariant, string> = {
|
|||||||
outline: `border-cinnabar bg-transparent text-cinnabar hover:bg-[var(--color-cinnabar-wash)] active:bg-[var(--color-cinnabar-wash)] ${disabledFade}`,
|
outline: `border-cinnabar bg-transparent text-cinnabar hover:bg-[var(--color-cinnabar-wash)] active:bg-[var(--color-cinnabar-wash)] ${disabledFade}`,
|
||||||
ghost: `border-transparent bg-transparent text-ink-soft hover:bg-[var(--color-cinnabar-wash)] hover:text-cinnabar ${disabledFade}`,
|
ghost: `border-transparent bg-transparent text-ink-soft hover:bg-[var(--color-cinnabar-wash)] hover:text-cinnabar ${disabledFade}`,
|
||||||
danger: `border-conflict bg-transparent text-conflict hover:bg-conflict/10 ${disabledFade}`,
|
danger: `border-conflict bg-transparent text-conflict hover:bg-conflict/10 ${disabledFade}`,
|
||||||
|
link: `border-transparent bg-transparent text-cinnabar underline-offset-4 hover:text-cinnabar-active hover:underline ${disabledFade}`,
|
||||||
};
|
};
|
||||||
|
|
||||||
const buttonSizes: Record<ButtonSize, string> = {
|
const buttonSizes: Record<ButtonSize, string> = {
|
||||||
sm: "px-3 py-1.5 text-xs",
|
sm: "px-3 py-1.5 text-xs",
|
||||||
md: "px-4 py-2",
|
md: "px-4 py-2",
|
||||||
|
lg: "px-5 py-2.5 text-base",
|
||||||
icon: "h-9 w-9 p-0",
|
icon: "h-9 w-9 p-0",
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -91,8 +96,30 @@ export function badgeClass({
|
|||||||
return cn(badgeBase, badgeVariants[variant], className);
|
return cn(badgeBase, badgeVariants[variant], className);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function cardClass(className?: string): string {
|
const cardTones: Record<CardTone, string> = {
|
||||||
return cn("rounded-lg border border-line bg-panel shadow-paper", className);
|
panel: "bg-panel",
|
||||||
|
card: "bg-surface-card",
|
||||||
|
soft: "bg-surface-soft",
|
||||||
|
};
|
||||||
|
|
||||||
|
interface CardClassOptions {
|
||||||
|
tone?: CardTone;
|
||||||
|
flat?: boolean;
|
||||||
|
interactive?: boolean;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 兼容旧签名 cardClass("extra"),同时支持面色分层/去阴影/可交互卡片。
|
||||||
|
export function cardClass(opts?: string | CardClassOptions): string {
|
||||||
|
const o: CardClassOptions = typeof opts === "string" ? { className: opts } : opts ?? {};
|
||||||
|
const tone = o.tone ?? "panel";
|
||||||
|
return cn(
|
||||||
|
"rounded-lg border border-line",
|
||||||
|
cardTones[tone],
|
||||||
|
o.flat ? null : "shadow-paper",
|
||||||
|
o.interactive ? `${transitionUi} hover:border-cinnabar/40 hover:shadow-paper` : null,
|
||||||
|
o.className,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const fieldTextBase = "block text-sm font-medium text-ink";
|
const fieldTextBase = "block text-sm font-medium text-ink";
|
||||||
|
|||||||
Reference in New Issue
Block a user