mirror of
https://github.com/multica-ai/multica.git
synced 2026-08-13 03:15:34 +02:00
tokens.css defined colours, radii and font families but not a single --text-* step, so font sizes had no baseline to align to and grew wherever they were needed: 51 distinct sizes across web + desktop, 370 written as arbitrary values, six at half a pixel (10.5 / 11.5 / 12.5 / 13.5 / 14.5 / 15.5px). text-xs and text-sm carried nearly all UI text while the range between them — 11, 13, 15px — could only be reached with arbitrary values. Hierarchy does not come from having more sizes; past a handful, each extra size makes the hierarchy blurrier. Add ten role-named steps, each with its own line-height so leading cannot fragment the way size did, and move every product-UI call site onto them. Steps are named for what the text is for, not for a t-shirt size, because that is what keeps the scale from drifting again. Six steps deliberately keep the exact size/line-height pairs of the Tailwind defaults they replace, so the ~1,900-call-site rename moves nothing on screen. The visible changes are confined to former arbitrary values snapping to a step: 8/9/10px -> micro (11px) on badges and overlines; 17 -> 18; 22 -> 24; 30 (text-3xl) -> 36 on headings and stat numbers; 12.8px -> label (13px) on small buttons and toggles. Half-pixel sizes are gone. This supersedes #6108, which was reverted by #6116 because the sidebar group labels rendered at the inherited 16px. The cause was not the scale but cn(): `text-<x>` is ambiguous in Tailwind, and tailwind-merge resolves it against a table listing only the default sizes, so it filed every role step under text-colour and dropped whichever of `text-caption` / `text-sidebar-foreground/70` came first. Registering the steps as a font-size class group restores the real conflict groups — size beats size, colour beats colour, the two coexist — and a test pins the list against the scale, since the failure is silent in source. Hand-written CSS is covered too. The transcript kept a 12.5px body long after every Tailwind call site was on the scale, so the "no half-pixel sizes" claim was true of the classes and false of the product; the editor's prose, code and mermaid ramps had the same blind spot, and seven of their eight values already equalled a step exactly. All now reference var(--text-*). The guard test reads raw `font-size:` declarations as well as class names, exempting only the 16px iOS input-zoom workaround in base.css and the landing pages' marketing ramp. apps/mobile (own NativeWind config) and apps/docs (fumadocs' own type system) keep Tailwind's default scale and are untouched. Landing display type (rem/clamp, 2.2-6.4rem) stays on its separate ramp, as do four decorative emoji / serif-hero sizes. Verified on a running local stack: pinned sidebar rows and group labels measure 12px/16px, nav items 14px/20px — identical to pre-migration. An audit of every rendered font size across the product surfaces finds nothing off the scale; the only exceptions are avatar initials and emoji, which actor-avatar.tsx sizes proportionally to the avatar diameter by design. Co-authored-by: Lambda <lambda@multica.ai> Co-authored-by: multica-agent <github@multica.ai>
105 lines
3.7 KiB
TypeScript
105 lines
3.7 KiB
TypeScript
import { CheckCircle2, ChevronRight } from "lucide-react";
|
|
import { useActorName } from "@multica/core/workspace/hooks";
|
|
import { Card } from "@multica/ui/components/ui/card";
|
|
import type { TimelineEntry } from "@multica/core/types";
|
|
import { useT } from "../../i18n";
|
|
|
|
interface ResolvedThreadBarProps {
|
|
/** The resolved root comment. */
|
|
entry: TimelineEntry;
|
|
/**
|
|
* Flat list of every nested reply under this thread root. Precomputed by
|
|
* `issue-detail.tsx`'s `timelineView` from the same walk that CommentCard
|
|
* uses, so the count + author list match what the expanded view renders
|
|
* (direct-children-only would undercount nested replies).
|
|
*/
|
|
replies: TimelineEntry[];
|
|
onExpand: () => void;
|
|
}
|
|
|
|
const MAX_NAMED_AUTHORS = 2;
|
|
|
|
// Distinct authors across `entries`, first-seen order, collapsed to a label
|
|
// ("Alice", "Alice, Bob", "Alice, Bob and 2 others"). Shared by both bars.
|
|
function useAuthorsLabel(entries: TimelineEntry[]): string {
|
|
const { t } = useT("issues");
|
|
const { getActorName } = useActorName();
|
|
|
|
const seen = new Set<string>();
|
|
const authors: Array<{ type: string; id: string }> = [];
|
|
for (const e of entries) {
|
|
const key = `${e.actor_type}:${e.actor_id}`;
|
|
if (seen.has(key)) continue;
|
|
seen.add(key);
|
|
authors.push({ type: e.actor_type, id: e.actor_id });
|
|
}
|
|
|
|
if (authors.length <= MAX_NAMED_AUTHORS) {
|
|
return authors.map((a) => getActorName(a.type, a.id)).join(", ");
|
|
}
|
|
const named = authors.slice(0, MAX_NAMED_AUTHORS).map((a) => getActorName(a.type, a.id)).join(", ");
|
|
return t(($) => $.comment.resolve.bar_authors_more, {
|
|
names: named,
|
|
count: authors.length - MAX_NAMED_AUTHORS,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Whole-thread fold — the ROOT comment is resolved ("Resolve thread"). The
|
|
* entire thread (root + every reply) collapses into this one bar.
|
|
*/
|
|
export function ResolvedThreadBar({ entry, replies, onExpand }: ResolvedThreadBarProps) {
|
|
const { t } = useT("issues");
|
|
const authorsLabel = useAuthorsLabel([entry, ...replies]);
|
|
const count = 1 + replies.length;
|
|
|
|
return (
|
|
<Card className="!py-0 !gap-0 overflow-hidden">
|
|
<button
|
|
type="button"
|
|
onClick={onExpand}
|
|
className="flex w-full items-center justify-between px-4 py-3 text-left transition-colors cursor-pointer hover:bg-muted/50"
|
|
>
|
|
<span className="flex min-w-0 items-center gap-2.5 text-body text-muted-foreground">
|
|
<CheckCircle2 className="h-4 w-4 shrink-0" />
|
|
<span className="truncate">
|
|
{t(($) => $.comment.resolve.bar, { count, authors: authorsLabel })}
|
|
</span>
|
|
</span>
|
|
<ChevronRight className="h-3.5 w-3.5 rotate-90 shrink-0 text-muted-foreground" />
|
|
</button>
|
|
</Card>
|
|
);
|
|
}
|
|
|
|
interface CommentsFoldBarProps {
|
|
/** The non-resolution replies folded behind this bar. */
|
|
replies: TimelineEntry[];
|
|
onExpand: () => void;
|
|
}
|
|
|
|
/**
|
|
* Middle fold — a REPLY is the resolution ("Resolve thread with comment"). The
|
|
* root and the resolution stay visible; the other replies fold behind this bar,
|
|
* which sits between them.
|
|
*/
|
|
export function CommentsFoldBar({ replies, onExpand }: CommentsFoldBarProps) {
|
|
const { t } = useT("issues");
|
|
const authorsLabel = useAuthorsLabel(replies);
|
|
|
|
return (
|
|
<button
|
|
type="button"
|
|
onClick={onExpand}
|
|
className="flex w-full items-center justify-between rounded-md bg-muted/45 px-3 py-2.5 text-left transition-colors cursor-pointer hover:bg-muted"
|
|
>
|
|
<span className="flex min-w-0 items-center gap-2.5 text-body text-muted-foreground">
|
|
<ChevronRight className="h-3.5 w-3.5 rotate-90 shrink-0" />
|
|
<span className="truncate">
|
|
{t(($) => $.comment.resolve.fold, { count: replies.length, authors: authorsLabel })}
|
|
</span>
|
|
</span>
|
|
</button>
|
|
);
|
|
}
|