feat: 相册点击直接进大图查看器,移除「选择图片」列表
- AlbumBubble: 点 +N 直接打开全屏查看器(从该图开始),删除中间的选择列表弹窗 - ImageLightbox: 底部加可滑动缩略图条(当前高亮+自动滚动定位),顶栏加下载按钮 - 下载按钮保证此前藏在 +N 列表里的图片仍可下载 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,17 +1,10 @@
|
||||
import { LoaderCircle, X } from "lucide-react";
|
||||
import { DownloadCloudIcon } from "../../icons/DownloadCloudIcon";
|
||||
import { useEffect, useState } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
import { useI18n } from "../../../i18n";
|
||||
import type { Attachment, Post } from "../../../types/post";
|
||||
import type { Post } from "../../../types/post";
|
||||
import { AttachmentDownloadPill } from "../AttachmentDownloadPill";
|
||||
import { BubbleImage } from "../BubbleImage";
|
||||
import { useLightbox } from "../overlays/ImageLightbox";
|
||||
import { autolink } from "../utils/autolink";
|
||||
import { downloadAttachment } from "../utils/downloadFile";
|
||||
import { formatBytes } from "../utils/formatBytes";
|
||||
import { postDisplayText } from "../utils/postText";
|
||||
import { useToast } from "../../Toast";
|
||||
|
||||
const MAX_VISIBLE = 4;
|
||||
|
||||
@@ -26,135 +19,9 @@ function albumItemClass(index: number, count: number) {
|
||||
return "";
|
||||
}
|
||||
|
||||
function ImageListDownloadButton({
|
||||
postId,
|
||||
attachment,
|
||||
}: {
|
||||
postId: string;
|
||||
attachment: Attachment;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const { showToast } = useToast();
|
||||
const [isDownloading, setIsDownloading] = useState(false);
|
||||
|
||||
const handleDownload = async () => {
|
||||
if (isDownloading) return;
|
||||
setIsDownloading(true);
|
||||
try {
|
||||
await downloadAttachment(postId, attachment.id, attachment.filename);
|
||||
showToast(t("downloadOk"));
|
||||
} catch {
|
||||
showToast(t("downloadFail"), "error");
|
||||
} finally {
|
||||
setIsDownloading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
handleDownload();
|
||||
}}
|
||||
disabled={isDownloading}
|
||||
className="flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-white/10 text-white transition hover:bg-white/20 disabled:cursor-wait"
|
||||
aria-label={
|
||||
isDownloading ? t("downloading") : `Download ${attachment.filename}`
|
||||
}
|
||||
aria-busy={isDownloading}
|
||||
>
|
||||
{isDownloading ? (
|
||||
<LoaderCircle className="h-4 w-4 animate-spin" strokeWidth={2.3} />
|
||||
) : (
|
||||
<DownloadCloudIcon className="h-4 w-4" />
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
function ImageListDialog({
|
||||
postId,
|
||||
images,
|
||||
onClose,
|
||||
onPick,
|
||||
}: {
|
||||
postId: string;
|
||||
images: Attachment[];
|
||||
onClose: () => void;
|
||||
onPick: (index: number) => void;
|
||||
}) {
|
||||
useEffect(() => {
|
||||
const onKey = (event: KeyboardEvent) => {
|
||||
if (event.key === "Escape") onClose();
|
||||
};
|
||||
window.addEventListener("keydown", onKey);
|
||||
return () => window.removeEventListener("keydown", onKey);
|
||||
}, [onClose]);
|
||||
|
||||
return createPortal(
|
||||
<div
|
||||
className="fixed inset-0 z-[100] flex items-center justify-center bg-black/75 px-4 backdrop-blur-sm"
|
||||
onClick={onClose}
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label="Image list"
|
||||
>
|
||||
<div
|
||||
className="w-full max-w-md overflow-hidden rounded-2xl border border-ark-line bg-ark-panel shadow-2xl"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<div className="flex items-center justify-between border-b border-ark-line px-4 py-3">
|
||||
<div className="text-sm font-semibold text-neutral-100">选择图片</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onClose}
|
||||
className="flex h-8 w-8 items-center justify-center rounded-full bg-white/10 text-white transition hover:bg-white/20"
|
||||
aria-label="Close"
|
||||
>
|
||||
<X className="h-4 w-4" />
|
||||
</button>
|
||||
</div>
|
||||
<div className="max-h-[70vh] overflow-y-auto p-2 [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
|
||||
{images.map((image, index) => (
|
||||
<div
|
||||
key={image.id}
|
||||
className="flex w-full items-center gap-3 rounded-xl p-2 text-left transition hover:bg-white/5"
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onPick(index)}
|
||||
className="flex min-w-0 flex-1 items-center gap-3 text-left"
|
||||
>
|
||||
<div className="h-16 w-16 shrink-0 overflow-hidden rounded-lg bg-black">
|
||||
<BubbleImage
|
||||
src={image.thumbnailUrl ?? image.url}
|
||||
className="h-full w-full object-cover"
|
||||
/>
|
||||
</div>
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="truncate text-sm font-medium text-neutral-100">
|
||||
图片 {index + 1}
|
||||
</div>
|
||||
<div className="mt-1 truncate text-xs text-neutral-400">
|
||||
{formatBytes(image.sizeBytes)}
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
<ImageListDownloadButton postId={postId} attachment={image} />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>,
|
||||
document.body,
|
||||
);
|
||||
}
|
||||
|
||||
export function AlbumBubble({ post }: { post: Post }) {
|
||||
const { openLightbox } = useLightbox();
|
||||
const { lang } = useI18n();
|
||||
const [listOpen, setListOpen] = useState(false);
|
||||
const images = post.attachments;
|
||||
const text = postDisplayText(post, lang);
|
||||
const visible = images.slice(0, MAX_VISIBLE);
|
||||
@@ -176,21 +43,22 @@ export function AlbumBubble({ post }: { post: Post }) {
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
if (isLastSlot) setListOpen(true);
|
||||
else openLightbox(images, i, text, post.id);
|
||||
}}
|
||||
className="block h-full w-full"
|
||||
aria-label={isLastSlot ? "Open image list" : "View image"}
|
||||
onClick={() => openLightbox(images, i, text, post.id)}
|
||||
className="group block h-full w-full"
|
||||
aria-label={
|
||||
isLastSlot ? `View all ${images.length} images` : "View image"
|
||||
}
|
||||
>
|
||||
<BubbleImage
|
||||
src={att.thumbnailUrl ?? att.url}
|
||||
loading="lazy"
|
||||
className="h-full w-full object-cover"
|
||||
className="h-full w-full object-cover transition duration-300 group-hover:scale-[1.03]"
|
||||
/>
|
||||
{isLastSlot ? (
|
||||
<div className="absolute inset-0 flex items-center justify-center bg-black/55 text-4xl font-bold text-white">
|
||||
+{extra}
|
||||
<div className="absolute inset-0 flex flex-col items-center justify-center gap-0.5 bg-black/60 text-white backdrop-blur-[1px] transition group-hover:bg-black/50">
|
||||
<span className="text-3xl font-bold leading-none md:text-4xl">
|
||||
+{extra}
|
||||
</span>
|
||||
</div>
|
||||
) : null}
|
||||
</button>
|
||||
@@ -206,17 +74,6 @@ export function AlbumBubble({ post }: { post: Post }) {
|
||||
{autolink(text)}
|
||||
</div>
|
||||
) : null}
|
||||
{listOpen ? (
|
||||
<ImageListDialog
|
||||
postId={post.id}
|
||||
images={images}
|
||||
onClose={() => setListOpen(false)}
|
||||
onPick={(index) => {
|
||||
setListOpen(false);
|
||||
openLightbox(images, index, text, post.id);
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user