mirror of
https://github.com/multica-ai/multica.git
synced 2026-08-12 00:45:55 +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>
199 lines
6.9 KiB
TypeScript
199 lines
6.9 KiB
TypeScript
"use client";
|
|
|
|
import { useRef, useState } from "react";
|
|
import { toast } from "sonner";
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from "@multica/ui/components/ui/dialog";
|
|
import { Button } from "@multica/ui/components/ui/button";
|
|
import { FileUploadButton } from "@multica/ui/components/common/file-upload-button";
|
|
import {
|
|
ContentEditor,
|
|
type ContentEditorRef,
|
|
useFileDropZone,
|
|
FileDropOverlay,
|
|
useUploadGate,
|
|
useEditorUpload,
|
|
} from "../editor";
|
|
import {
|
|
useCreateFeedback,
|
|
useFeedbackDraftStore,
|
|
FEEDBACK_KINDS,
|
|
type FeedbackKind,
|
|
} from "@multica/core/feedback";
|
|
import { useCurrentWorkspace } from "@multica/core/paths";
|
|
import { useT } from "../i18n";
|
|
import { useShortcut } from "@multica/core/shortcuts";
|
|
import { ShortcutKeycaps } from "../common/shortcut-keycaps";
|
|
|
|
const MAX_MESSAGE_LEN = 10000;
|
|
|
|
const FEEDBACK_KIND_SET = new Set<FeedbackKind>(FEEDBACK_KINDS);
|
|
|
|
function composeFeedbackInitialMessage(draftMessage: string, incomingInitialMessage: string) {
|
|
const draft = draftMessage.trim();
|
|
const incoming = incomingInitialMessage.trim();
|
|
if (!incoming) return draftMessage;
|
|
if (!draft) return incomingInitialMessage;
|
|
if (draft.includes(incoming)) return draftMessage;
|
|
return `${draftMessage}
|
|
|
|
---
|
|
|
|
${incomingInitialMessage}`;
|
|
}
|
|
|
|
export function FeedbackModal({
|
|
onClose,
|
|
data,
|
|
initialMessage,
|
|
}: {
|
|
onClose: () => void;
|
|
data?: Record<string, unknown> | null;
|
|
initialMessage?: string;
|
|
}) {
|
|
const sendShortcut = useShortcut("send");
|
|
const { t } = useT("modals");
|
|
const { t: tEditor } = useT("editor");
|
|
const workspace = useCurrentWorkspace();
|
|
const draft = useFeedbackDraftStore((s) => s.draft);
|
|
const setDraft = useFeedbackDraftStore((s) => s.setDraft);
|
|
const clearDraft = useFeedbackDraftStore((s) => s.clearDraft);
|
|
|
|
const editorRef = useRef<ContentEditorRef>(null);
|
|
const incomingInitialMessage =
|
|
initialMessage ?? (typeof data?.initialMessage === "string" ? data.initialMessage : "");
|
|
const kind = typeof data?.kind === "string" && FEEDBACK_KIND_SET.has(data.kind as FeedbackKind)
|
|
? (data.kind as FeedbackKind)
|
|
: undefined;
|
|
const seededMessage = composeFeedbackInitialMessage(draft.message, incomingInitialMessage);
|
|
const [message, setMessage] = useState(seededMessage);
|
|
const { isDragOver, dropZoneProps } = useFileDropZone({
|
|
onDrop: (files) => files.forEach((f) => editorRef.current?.uploadFile(f)),
|
|
});
|
|
const { uploadWithToast } = useEditorUpload();
|
|
// The handler already refused to submit mid-upload, but the button stayed
|
|
// clickable — so the only feedback was a toast fired after the click.
|
|
const uploadGate = useUploadGate(editorRef);
|
|
const mutation = useCreateFeedback();
|
|
|
|
const canSubmit =
|
|
message.trim().length > 0 &&
|
|
message.length <= MAX_MESSAGE_LEN &&
|
|
!mutation.isPending &&
|
|
!uploadGate.uploading;
|
|
|
|
const handleSubmit = async () => {
|
|
// The button can use debounced `message` state, but the keyboard shortcut
|
|
// must not: Command+Enter can arrive before ContentEditor's 150ms onUpdate
|
|
// fires. The editor ref below is the submit-time source of truth.
|
|
if (mutation.isPending) return;
|
|
// Keep the toast on this path: the shortcut can fire while the button is
|
|
// disabled and off-screen, so a silent no-op would read as a dead ⌘+Enter.
|
|
if (uploadGate.isBlocked()) {
|
|
toast.info(t(($) => $.feedback.toast_uploading));
|
|
return;
|
|
}
|
|
// Read from the editor ref at submit time — `message` state lags 150ms
|
|
// behind keystrokes due to `debounceMs`, so ⌘+Enter fired immediately
|
|
// after typing would otherwise submit stale content.
|
|
const latest = editorRef.current?.getMarkdown()?.trim() ?? "";
|
|
if (!latest) return;
|
|
if (latest.length > MAX_MESSAGE_LEN) {
|
|
toast.error(t(($) => $.feedback.toast_too_long));
|
|
return;
|
|
}
|
|
try {
|
|
await mutation.mutateAsync({
|
|
message: latest,
|
|
url: typeof window !== "undefined" ? window.location.href : undefined,
|
|
workspace_id: workspace?.id,
|
|
kind,
|
|
});
|
|
clearDraft();
|
|
toast.success(t(($) => $.feedback.toast_sent));
|
|
onClose();
|
|
} catch (err) {
|
|
const msg =
|
|
err instanceof Error && err.message
|
|
? err.message
|
|
: t(($) => $.feedback.toast_failed);
|
|
toast.error(msg);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<Dialog open onOpenChange={(v) => !v && onClose()}>
|
|
<DialogContent className="sm:max-w-2xl !h-[28rem] p-0 gap-0 flex flex-col overflow-hidden">
|
|
<DialogHeader className="px-5 pt-4 pb-2 shrink-0">
|
|
<DialogTitle>{t(($) => $.feedback.title)}</DialogTitle>
|
|
<p className="mt-1 text-caption text-muted-foreground">
|
|
{t(($) => $.feedback.github_hint_prefix)}
|
|
<a
|
|
href="https://github.com/multica-ai/multica/issues"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
className="text-brand underline decoration-brand/40 underline-offset-2 hover:decoration-brand"
|
|
>
|
|
{t(($) => $.feedback.github_hint_link)}
|
|
</a>
|
|
</p>
|
|
</DialogHeader>
|
|
|
|
<div className="flex-1 min-h-0 px-5 pb-3">
|
|
<div
|
|
{...dropZoneProps}
|
|
className="relative h-full overflow-y-auto rounded-lg border-1 border-border transition-colors focus-within:border-brand"
|
|
>
|
|
<ContentEditor
|
|
ref={editorRef}
|
|
defaultValue={seededMessage}
|
|
placeholder={t(($) => $.feedback.placeholder)}
|
|
onUpdate={(md) => { setMessage(md); setDraft({ message: md }); }}
|
|
onUploadFile={(file) => uploadWithToast(file)}
|
|
onUploadingChange={uploadGate.onUploadingChange}
|
|
onSubmit={handleSubmit}
|
|
debounceMs={150}
|
|
showBubbleMenu={false}
|
|
className="px-3 py-2"
|
|
/>
|
|
{isDragOver && <FileDropOverlay />}
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex items-center justify-between px-4 py-3 border-t shrink-0">
|
|
<FileUploadButton
|
|
size="sm"
|
|
multiple
|
|
onSelect={(file) => editorRef.current?.uploadFile(file)}
|
|
/>
|
|
<Button
|
|
size="sm"
|
|
onClick={handleSubmit}
|
|
disabled={!canSubmit}
|
|
aria-disabled={uploadGate.uploading || undefined}
|
|
aria-busy={uploadGate.uploading || undefined}
|
|
>
|
|
{mutation.isPending
|
|
? t(($) => $.feedback.sending)
|
|
: uploadGate.uploading
|
|
? tEditor(($) => $.upload.in_progress)
|
|
: t(($) => $.feedback.send)}
|
|
{sendShortcut ? (
|
|
<ShortcutKeycaps
|
|
shortcut={sendShortcut}
|
|
decorative
|
|
className="ml-1"
|
|
keyClassName="border-background/30 bg-background/15 text-primary-foreground shadow-none"
|
|
/>
|
|
) : null}
|
|
</Button>
|
|
</div>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|