mirror of
https://github.com/multica-ai/multica.git
synced 2026-07-28 05:46:58 +02:00
#1558 fixed the expand button covering trailing text, but also collapsed the reply editor's "empty = 1 line, has content = 2 lines" behavior by making the button row a permanent flex sibling below the editor. Restore the original absolute-positioned button row on both editors: - comment-input: back to `pb-8` container + `absolute bottom-1 right-1.5` buttons (pre-#1558 layout; never had the overlap bug). - reply-input: absolute buttons + `pb-7` gated on `!isEmpty || isExpanded`. Empty → single-line compact; any content → two-row layout with buttons below text (no overlap by construction). Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
115 lines
3.9 KiB
TypeScript
115 lines
3.9 KiB
TypeScript
"use client";
|
|
|
|
import { useRef, useState, useCallback } from "react";
|
|
import { ArrowUp, Loader2, Maximize2, Minimize2 } from "lucide-react";
|
|
import { Button } from "@multica/ui/components/ui/button";
|
|
import { Tooltip, TooltipTrigger, TooltipContent } from "@multica/ui/components/ui/tooltip";
|
|
import { cn } from "@multica/ui/lib/utils";
|
|
import { ContentEditor, type ContentEditorRef, useFileDropZone, FileDropOverlay } from "../../editor";
|
|
import { FileUploadButton } from "@multica/ui/components/common/file-upload-button";
|
|
import { useFileUpload } from "@multica/core/hooks/use-file-upload";
|
|
import { api } from "@multica/core/api";
|
|
|
|
interface CommentInputProps {
|
|
issueId: string;
|
|
onSubmit: (content: string, attachmentIds?: string[]) => Promise<void>;
|
|
}
|
|
|
|
function CommentInput({ issueId, onSubmit }: CommentInputProps) {
|
|
const editorRef = useRef<ContentEditorRef>(null);
|
|
const [isEmpty, setIsEmpty] = useState(true);
|
|
const [submitting, setSubmitting] = useState(false);
|
|
const [isExpanded, setIsExpanded] = useState(false);
|
|
const uploadMapRef = useRef<Map<string, string>>(new Map());
|
|
const { uploadWithToast } = useFileUpload(api);
|
|
const { isDragOver, dropZoneProps } = useFileDropZone({
|
|
onDrop: (files) => files.forEach((f) => editorRef.current?.uploadFile(f)),
|
|
});
|
|
|
|
const handleUpload = useCallback(async (file: File) => {
|
|
const result = await uploadWithToast(file, { issueId });
|
|
if (result) {
|
|
uploadMapRef.current.set(result.link, result.id);
|
|
}
|
|
return result;
|
|
}, [uploadWithToast, issueId]);
|
|
|
|
const handleSubmit = async () => {
|
|
const content = editorRef.current?.getMarkdown()?.replace(/(\n\s*)+$/, "").trim();
|
|
if (!content || submitting) return;
|
|
// Only send attachment IDs for uploads still present in the content.
|
|
const activeIds: string[] = [];
|
|
for (const [url, id] of uploadMapRef.current) {
|
|
if (content.includes(url)) activeIds.push(id);
|
|
}
|
|
setSubmitting(true);
|
|
try {
|
|
await onSubmit(content, activeIds.length > 0 ? activeIds : undefined);
|
|
editorRef.current?.clearContent();
|
|
setIsEmpty(true);
|
|
uploadMapRef.current.clear();
|
|
} finally {
|
|
setSubmitting(false);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<div
|
|
{...dropZoneProps}
|
|
className={cn(
|
|
"relative flex flex-col rounded-lg bg-card pb-8 ring-1 ring-border",
|
|
isExpanded ? "h-[70vh]" : "max-h-56",
|
|
)}
|
|
>
|
|
<div className="flex-1 min-h-0 overflow-y-auto px-3 py-2">
|
|
<ContentEditor
|
|
ref={editorRef}
|
|
placeholder="Leave a comment..."
|
|
onUpdate={(md) => setIsEmpty(!md.trim())}
|
|
onSubmit={handleSubmit}
|
|
onUploadFile={handleUpload}
|
|
debounceMs={100}
|
|
currentIssueId={issueId}
|
|
/>
|
|
</div>
|
|
<div className="absolute bottom-1 right-1.5 flex items-center gap-1">
|
|
<Tooltip>
|
|
<TooltipTrigger
|
|
render={
|
|
<button
|
|
type="button"
|
|
onClick={() => {
|
|
setIsExpanded((v) => !v);
|
|
editorRef.current?.focus();
|
|
}}
|
|
className="rounded-sm p-1.5 text-muted-foreground opacity-70 hover:opacity-100 hover:bg-accent/60 transition-all cursor-pointer"
|
|
>
|
|
{isExpanded ? <Minimize2 className="size-4" /> : <Maximize2 className="size-4" />}
|
|
</button>
|
|
}
|
|
/>
|
|
<TooltipContent side="top">{isExpanded ? "Collapse" : "Expand"}</TooltipContent>
|
|
</Tooltip>
|
|
<FileUploadButton
|
|
size="sm"
|
|
onSelect={(file) => editorRef.current?.uploadFile(file)}
|
|
/>
|
|
<Button
|
|
size="icon-sm"
|
|
disabled={isEmpty || submitting}
|
|
onClick={handleSubmit}
|
|
>
|
|
{submitting ? (
|
|
<Loader2 className="animate-spin" />
|
|
) : (
|
|
<ArrowUp />
|
|
)}
|
|
</Button>
|
|
</div>
|
|
{isDragOver && <FileDropOverlay />}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export { CommentInput };
|