From d6c1eaae5d1710fc78d5a493e53706204385e0ea Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 9 Oct 2025 04:21:03 -0400 Subject: [PATCH] fix inpainting thumbnails (#870) --- .../src/pages/PageEdit/BaseImageSelector.tsx | 30 +++++++++++++++---- .../app/src/pages/PageEdit/HistoryStack.tsx | 23 ++++++++++---- .../gallery-modal/src/lib/gallery-modal.tsx | 6 ++++ 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/frontend/apps/editor3d/app/src/pages/PageEdit/BaseImageSelector.tsx b/frontend/apps/editor3d/app/src/pages/PageEdit/BaseImageSelector.tsx index 3d3a7118cf..e7328376a9 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEdit/BaseImageSelector.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEdit/BaseImageSelector.tsx @@ -14,6 +14,13 @@ import { TutorialModalButton } from "@storyteller/ui-tutorial-modal"; export interface BaseSelectorImage { url: string; mediaToken: string; + + // Link to the thumbnail *template* URL of the image + // This is not a URL itself! It must be converted into a URL by replacing parameters. + thumbnailUrlTemplate?: string; + + // Link to the full image URL of the full image asset + fullImageUrl?: string; } export type BaseImageSelectorProps = { @@ -41,13 +48,13 @@ export const BaseImageSelector = ({ setSelectedGalleryImages([]); }; - const handleImageSelect = (id: string) => { + const handleImageSelect = (mediaToken: string) => { // If already selected, deselect it // Else if not selected and under max limit, select it - if (selectedGalleryImages.includes(id)) { + if (selectedGalleryImages.includes(mediaToken)) { setSelectedGalleryImages([]); } else { - setSelectedGalleryImages([id]); + setSelectedGalleryImages([mediaToken]); } }; @@ -56,12 +63,14 @@ export const BaseImageSelector = ({ if (selectedItems.length !== 1) { return; } - const item = selectedItems[0]; - if (!item.fullImage) return; + if (!item.fullImage) { + return + } const referenceImage: BaseSelectorImage = { url: item.fullImage, mediaToken: item.id, + thumbnailUrlTemplate: item.thumbnailUrlTemplate, }; sendImageEvent(referenceImage); }; @@ -92,6 +101,7 @@ export const BaseImageSelector = ({ // Attempt to resolve the CDN URL for the uploaded image token; fallback to data URL (async () => { let finalUrl = reader.result as string; + let thumbnailUrlTemplate = undefined; try { const api = new MediaFilesApi(); const result = await api.GetMediaFileByToken({ @@ -102,6 +112,12 @@ export const BaseImageSelector = ({ result.data.media_links?.cdn_url || result.data.public_bucket_url || finalUrl; + // NB(bt,2025-10-09): I think `thumbnail_template` is wrong and that + // `maybe_thumbnail_template` is the correct API field, but upstream + // seems to imply otherwise. Let's simply check both keys for now. + thumbnailUrlTemplate = + result.data.media_links?.thumbnail_template || + (result.data.media_links as any)?.maybe_thumbnail_template; } } catch (e) { console.warn( @@ -111,8 +127,10 @@ export const BaseImageSelector = ({ } const referenceImage: BaseSelectorImage = { - url: finalUrl, mediaToken, + url: finalUrl, + fullImageUrl: finalUrl, + thumbnailUrlTemplate: thumbnailUrlTemplate, }; toast.success("Image uploaded successfully!"); diff --git a/frontend/apps/editor3d/app/src/pages/PageEdit/HistoryStack.tsx b/frontend/apps/editor3d/app/src/pages/PageEdit/HistoryStack.tsx index 82bcc18be5..c306da54da 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEdit/HistoryStack.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEdit/HistoryStack.tsx @@ -71,6 +71,8 @@ export const HistoryStack = ({ ({ url: editedImage.cdn_url, mediaToken: editedImage.media_token, + thumbnailUrlTemplate: editedImage.maybe_thumbnail_template, + fullImageUrl: editedImage.cdn_url, }) as BaseSelectorImage, ), }; @@ -111,6 +113,18 @@ export const HistoryStack = ({ prevPendingCountRef.current = current; }, [pendingPlaceholders.length]); + const getImageThumbnailSource = (image: BaseSelectorImage) => { + if (!!image.thumbnailUrlTemplate) { + // NB: this is the preferred way to populate the history stack thumbnails + return image.thumbnailUrlTemplate.replace("{WIDTH}", "256"); + } + if (image.url.startsWith("data:")) { + return image.url; + } + console.warn("Using older image source for history stack image", image); + return `${image.url}?historystack+${sessionRandBuster.current}`; + }; + return (
@@ -202,13 +216,10 @@ export const HistoryStack = ({ onClick={() => handleSelectWithPreload(image)} >