Skip to content

Commit 4746607

Browse files
committed
fix(web): retain fallback until native preview loads
1 parent 00131aa commit 4746607

2 files changed

Lines changed: 26 additions & 11 deletions

File tree

‎apps/web/src/components/chat/ComposerImageThumbnail.browser.test.tsx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect, it, vi } from "vite-plus/test";
22

3-
import { render } from "../../../test/render";
3+
import { act, render } from "../../../test/render";
44
import { createComposerImageThumbnail } from "../../lib/imageCompression";
55
import { ComposerImageThumbnail } from "./ComposerImageThumbnail";
66

@@ -15,17 +15,29 @@ it("keeps a native preview available after thumbnail generation has failed", asy
1515
.mockRejectedValue(new Error("Thumbnail decoder unavailable"));
1616
expect(await createComposerImageThumbnail(file)).toBeNull();
1717

18+
const container = document.createElement("div");
19+
const holdLoad = (event: Event) => event.stopPropagation();
20+
container.addEventListener("load", holdLoad, true);
21+
using complete = vi.spyOn(HTMLImageElement.prototype, "complete", "get").mockReturnValue(false);
1822
await using screen = await render(
1923
<ComposerImageThumbnail
2024
file={file}
2125
alt={file.name}
2226
className="size-16 object-cover"
2327
fallback={<span>Preview unavailable</span>}
2428
/>,
29+
{ container },
2530
);
2631
using revoke = vi.spyOn(URL, "revokeObjectURL");
32+
await expect.element(screen.getByText("Preview unavailable")).toBeVisible();
33+
const loadingImage = screen.container.querySelector("img")!;
34+
await loadingImage.decode();
35+
complete.mockRestore();
36+
container.removeEventListener("load", holdLoad, true);
37+
await act(() => loadingImage.dispatchEvent(new Event("load")));
2738
const image = screen.getByRole("img", { name: file.name });
2839
await expect.element(image).toBeVisible();
40+
await expect.element(screen.getByText("Preview unavailable")).not.toBeInTheDocument();
2941
const src = image.element().getAttribute("src");
3042
expect(src).toMatch(/^blob:/);
3143
await screen.unmount();

‎apps/web/src/components/chat/ComposerImageThumbnail.tsx‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,19 @@ export const ComposerImageThumbnail = memo(function ComposerImageThumbnail({
6262
}, [file]);
6363

6464
return src && failedSrc !== src ? (
65-
<img
66-
ref={(image) => {
67-
if (image?.complete && image.naturalWidth > 0) setLoadedSrc(src);
68-
}}
69-
src={src}
70-
alt={alt}
71-
onLoad={() => setLoadedSrc(src)}
72-
onError={() => setFailedSrc(src)}
73-
className={cn(className, loadedSrc !== src && "invisible")}
74-
/>
65+
<span className="relative block size-full">
66+
{loadedSrc !== src && fallback}
67+
<img
68+
ref={(image) => {
69+
if (image?.complete && image.naturalWidth > 0) setLoadedSrc(src);
70+
}}
71+
src={src}
72+
alt={alt}
73+
onLoad={() => setLoadedSrc(src)}
74+
onError={() => setFailedSrc(src)}
75+
className={cn(className, loadedSrc !== src && "invisible absolute inset-0")}
76+
/>
77+
</span>
7578
) : (
7679
fallback
7780
);

0 commit comments

Comments
 (0)