mirror of
https://github.com/yusufipk/OpenFrame.git
synced 2026-09-11 17:46:06 +00:00
A comment held one image, and the paste handler took the first item off the clipboard and dropped the rest. Reviewing a cut usually means several screenshots about the same moment, which meant one comment per screenshot or one screenshot and a paragraph describing the others. Editing a comment could not attach anything at all: the edit box had no paste handler, no file picker and no way to remove what was already there. A comment now carries up to five images, in the composer, in a reply and in the editor. One paste stages every image on the clipboard, the file picker takes a multiple selection, and a drop lands on whichever editor is open. Over the cap the extras are refused out loud rather than dropped quietly. A single image still fills the width; several tile into a grid, and either opens full screen on click. The images move into their own table. `comments.imageUrl` stays and follows the first of them, so a reader that has not been updated keeps working, and the migration copies the existing attachments across so the new table is complete from the first read. Every path that resolves a URL back to a comment now asks the new table: R2 cleanup, the orphan sweep, the storage accounting and the reference checks that decide whether an object can be deleted. Left on the old column they would have treated images two through five as unreferenced and swept them. Detaching an image while editing only breaks the link. The file stays in R2 and in the assets pane, which is where it is deleted from and where its bytes are already billed.
129 lines
3.9 KiB
TypeScript
129 lines
3.9 KiB
TypeScript
'use client';
|
|
|
|
import { memo } from 'react';
|
|
import { Trash2 } from 'lucide-react';
|
|
import { Button } from '@/components/ui/button';
|
|
import { cn } from '@/lib/utils';
|
|
import { useObjectUrls } from '@/components/video-page/hooks/use-object-urls';
|
|
import type { CommentImage } from '@/components/video-page/types';
|
|
|
|
interface ImageAttachmentStripProps {
|
|
/** Images already saved on the comment being edited, if any. */
|
|
existingUrls?: string[];
|
|
onRemoveExisting?: (url: string) => void;
|
|
/** Files staged in this editor and not uploaded yet. */
|
|
files: File[];
|
|
onRemoveFile: (index: number) => void;
|
|
compact?: boolean;
|
|
className?: string;
|
|
}
|
|
|
|
/**
|
|
* The row of thumbnails under an editor, showing what will be sent with it.
|
|
* Saved images come first, then the ones staged in this session.
|
|
*/
|
|
export const ImageAttachmentStrip = memo(function ImageAttachmentStrip({
|
|
existingUrls = [],
|
|
onRemoveExisting,
|
|
files,
|
|
onRemoveFile,
|
|
compact = false,
|
|
className,
|
|
}: ImageAttachmentStripProps) {
|
|
const previewUrls = useObjectUrls(files);
|
|
|
|
if (existingUrls.length === 0 && previewUrls.length === 0) return null;
|
|
|
|
const tileSize = compact ? 'h-14 w-14' : 'h-20 w-20';
|
|
const buttonSize = compact ? 'h-5 w-5' : 'h-6 w-6';
|
|
const iconSize = compact ? 'h-2.5 w-2.5' : 'h-3 w-3';
|
|
|
|
const tile = (key: string, src: string, alt: string, onRemove: () => void) => (
|
|
<div
|
|
key={key}
|
|
className={cn(
|
|
'group/attachment relative shrink-0 overflow-hidden rounded-md border bg-muted',
|
|
tileSize
|
|
)}
|
|
>
|
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
|
<img src={src} alt={alt} className="h-full w-full object-cover" />
|
|
<div className="absolute inset-0 flex items-center justify-center bg-black/50 opacity-0 transition-opacity group-hover/attachment:opacity-100">
|
|
<Button size="icon" variant="destructive" className={buttonSize} onClick={onRemove}>
|
|
<Trash2 className={iconSize} />
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<div className={cn('mb-2 flex flex-wrap gap-2', className)}>
|
|
{existingUrls.map((url, index) =>
|
|
tile(url, url, `Attachment ${index + 1}`, () => onRemoveExisting?.(url))
|
|
)}
|
|
{previewUrls.map((url, index) =>
|
|
tile(`staged-${index}`, url, `Preview ${index + 1}`, () => onRemoveFile(index))
|
|
)}
|
|
</div>
|
|
);
|
|
});
|
|
|
|
interface CommentImageGalleryProps {
|
|
images: CommentImage[];
|
|
onOpen: (url: string) => void;
|
|
compact?: boolean;
|
|
className?: string;
|
|
}
|
|
|
|
/** The images saved on a comment. One fills the width; several tile into a grid. */
|
|
export const CommentImageGallery = memo(function CommentImageGallery({
|
|
images,
|
|
onOpen,
|
|
compact = false,
|
|
className,
|
|
}: CommentImageGalleryProps) {
|
|
if (images.length === 0) return null;
|
|
|
|
if (images.length === 1) {
|
|
return (
|
|
<div
|
|
className={cn(
|
|
'flex cursor-pointer items-center justify-center overflow-hidden rounded-md bg-muted transition-opacity hover:opacity-90',
|
|
compact ? 'max-h-40' : 'max-h-60',
|
|
className
|
|
)}
|
|
onClick={() => onOpen(images[0].url)}
|
|
>
|
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
|
<img
|
|
src={images[0].url}
|
|
alt="Attachment"
|
|
className={cn('w-auto object-contain', compact ? 'max-h-40' : 'max-h-60')}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className={cn('grid grid-cols-2 gap-1.5', className)}>
|
|
{images.map((image, index) => (
|
|
<div
|
|
key={image.id}
|
|
className={cn(
|
|
'cursor-pointer overflow-hidden rounded-md bg-muted transition-opacity hover:opacity-90',
|
|
compact ? 'h-20' : 'h-24'
|
|
)}
|
|
onClick={() => onOpen(image.url)}
|
|
>
|
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
|
<img
|
|
src={image.url}
|
|
alt={`Attachment ${index + 1}`}
|
|
className="h-full w-full object-cover"
|
|
/>
|
|
</div>
|
|
))}
|
|
</div>
|
|
);
|
|
});
|