Skip to content

Commit d9559ee

Browse files
authored
fix(web): render stored HEIC attachments (pingdotgg#10429)
1 parent abd33b1 commit d9559ee

8 files changed

Lines changed: 239 additions & 13 deletions

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

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,12 @@ import {
161161
type ComposerBannerStackContent,
162162
type ComposerBannerStackItem,
163163
} from "./ComposerBannerStack";
164-
import { compressImageForStash, prepareImageForAttachment } from "../../lib/imageCompression";
164+
import {
165+
compressImageForStash,
166+
isHeicImageFile,
167+
prepareImageForAttachment,
168+
} from "../../lib/imageCompression";
169+
import { AttachmentImage } from "../media/AttachmentImage";
165170
import {
166171
fileAttachmentTooLargeMessage,
167172
formatAttachmentSize,
@@ -4860,12 +4865,22 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
48604865
alt=""
48614866
className="size-full object-cover"
48624867
fallback={
4863-
<PierreEntryIcon
4864-
pathValue={image.name}
4865-
kind="file"
4866-
theme={resolvedTheme}
4867-
className="m-auto size-3.5"
4868-
/>
4868+
isHeicImageFile({ name: image.name, type: image.mimeType }) ? (
4869+
<AttachmentImage
4870+
name={image.name}
4871+
mimeType={image.mimeType}
4872+
src={image.previewUrl}
4873+
alt=""
4874+
className="size-full object-cover"
4875+
/>
4876+
) : (
4877+
<PierreEntryIcon
4878+
pathValue={image.name}
4879+
kind="file"
4880+
theme={resolvedTheme}
4881+
className="m-auto size-3.5"
4882+
/>
4883+
)
48694884
}
48704885
/>
48714886
) : (
@@ -6729,9 +6744,19 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
67296744
alt={image.name}
67306745
className="h-full w-full object-cover"
67316746
fallback={
6732-
<span className="flex h-full items-center justify-center px-1 text-3xs text-secondary-label">
6733-
{image.name}
6734-
</span>
6747+
isHeicImageFile({ name: image.name, type: image.mimeType }) ? (
6748+
<AttachmentImage
6749+
name={image.name}
6750+
mimeType={image.mimeType}
6751+
src={image.previewUrl}
6752+
alt={image.name}
6753+
className="h-full w-full object-cover"
6754+
/>
6755+
) : (
6756+
<span className="flex h-full items-center justify-center px-1 text-3xs text-secondary-label">
6757+
{image.name}
6758+
</span>
6759+
)
67356760
}
67366761
/>
67376762
</button>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
233233
key={`${index}:${item.src}`}
234234
src={item.src}
235235
name={item.name}
236+
mimeType={item.mimeType}
236237
onError={() => setFailedImageSrc(item.src)}
237238
/>
238239
)}

‎apps/web/src/components/chat/ExpandedImagePreview.test.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,27 @@ describe("resolveMarkdownMediaPreview", () => {
4545
});
4646

4747
describe("buildExpandedImagePreview", () => {
48+
it("keeps MIME type for stored images without a filename extension", () => {
49+
const preview = buildExpandedImagePreview(
50+
[
51+
{
52+
type: "image",
53+
id: "heic-1",
54+
name: "photo",
55+
mimeType: "image/heic",
56+
sizeBytes: 3,
57+
previewUrl: "blob:heic",
58+
},
59+
],
60+
"heic-1",
61+
);
62+
expect(preview?.images[0]).toMatchObject({
63+
name: "photo",
64+
mimeType: "image/heic",
65+
src: "blob:heic",
66+
});
67+
});
68+
4869
it("builds a signed-asset preview for a persisted video attachment", () => {
4970
const preview = buildAttachmentVideoPreview(EnvironmentId.make("environment-1"), {
5071
type: "file",

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { resolveProtocolRelativeMediaUrl } from "../media/mediaContent";
2222
export interface ExpandedImageItem {
2323
src: string | null;
2424
name: string;
25+
mimeType?: string;
2526
type?: "video";
2627
/** The preview created this object URL and must revoke it; other blob URLs belong to the timeline. */
2728
ownsSrc?: boolean;
@@ -182,7 +183,15 @@ export function buildExpandedImagePreview(
182183
}
183184
const previewableImages = images.flatMap((image) =>
184185
image.type === "image" && image.previewUrl
185-
? [{ id: image.id, src: image.previewUrl, name: image.name, source: image.source }]
186+
? [
187+
{
188+
id: image.id,
189+
src: image.previewUrl,
190+
name: image.name,
191+
mimeType: image.mimeType,
192+
source: image.source,
193+
},
194+
]
186195
: [],
187196
);
188197
if (previewableImages.length === 0) {
@@ -196,6 +205,7 @@ export function buildExpandedImagePreview(
196205
images: previewableImages.map((image) => ({
197206
src: image.src,
198207
name: image.name,
208+
mimeType: image.mimeType,
199209
...(image.source?.kind === "snap-shot" ? { source: image.source } : {}),
200210
})),
201211
index: selectedIndex,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ import type {
161161
import { Button, InlineButton } from "../ui/button";
162162
import { MorphIcon } from "~/components/MorphIcon";
163163
import { useAssetUrlRefresh, useAssetUrls, useAssetUrlState } from "../../assets/assetUrls";
164+
import { AttachmentImage } from "../media/AttachmentImage";
164165
import { MediaVideoPlayer } from "../media/MediaVideoPlayer";
165166
import { getVirtualizedScrollFadeClassName } from "../ui/scroll-area";
166167
import {
@@ -2300,7 +2301,9 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
23002301
ctx.onImageExpand(preview);
23012302
}}
23022303
>
2303-
<img
2304+
<AttachmentImage
2305+
name={image.name}
2306+
mimeType={image.mimeType}
23042307
src={image.previewUrl}
23052308
alt={image.name}
23062309
className="block size-full object-cover"

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
windowControlsOverlayHeight,
66
} from "../../lib/windowControlsOverlay";
77

8+
import { AttachmentImage } from "../media/AttachmentImage";
9+
810
const MAX_ZOOM = 8;
911

1012
// The viewer lays out below the native caption strip so its controls never share a row with
@@ -21,11 +23,13 @@ export interface ZoomableImageHandle {
2123
export function ZoomableImage({
2224
src,
2325
name,
26+
mimeType,
2427
onError,
2528
ref,
2629
}: {
2730
src: string;
2831
name: string;
32+
mimeType?: string | undefined;
2933
onError: () => void;
3034
ref?: Ref<ZoomableImageHandle>;
3135
}) {
@@ -227,7 +231,9 @@ export function ZoomableImage({
227231
setDragging(false);
228232
}}
229233
>
230-
<img
234+
<AttachmentImage
235+
name={name}
236+
mimeType={mimeType}
231237
src={src}
232238
alt={name}
233239
draggable={false}
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
import { act, type SyntheticEvent } from "react";
2+
import { create, type ReactTestRenderer } from "react-test-renderer";
3+
import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
4+
import { AttachmentImage } from "./AttachmentImage";
5+
import { prepareImageForAttachment } from "../../lib/imageCompression";
6+
7+
vi.mock("../../lib/imageCompression", async (importOriginal) => ({
8+
...(await importOriginal<typeof import("../../lib/imageCompression")>()),
9+
prepareImageForAttachment: vi.fn(),
10+
}));
11+
12+
let renderer: ReactTestRenderer;
13+
const fetchImage = vi.fn();
14+
const revokeUrl = vi.fn();
15+
const decodeError = {} as SyntheticEvent<HTMLImageElement>;
16+
const jpeg = new File(["jpeg"], "photo.jpg", { type: "image/jpeg" });
17+
18+
beforeEach(() => {
19+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
20+
vi.stubGlobal("fetch", fetchImage);
21+
vi.spyOn(URL, "createObjectURL").mockReturnValue("blob:jpeg");
22+
vi.spyOn(URL, "revokeObjectURL").mockImplementation(revokeUrl);
23+
fetchImage.mockResolvedValue(new Response(new Blob(["heic"])));
24+
vi.mocked(prepareImageForAttachment).mockResolvedValue({
25+
ok: true,
26+
file: jpeg,
27+
recompressed: true,
28+
});
29+
});
30+
31+
afterEach(async () => {
32+
await act(() => renderer?.unmount());
33+
vi.restoreAllMocks();
34+
vi.unstubAllGlobals();
35+
vi.clearAllMocks();
36+
});
37+
38+
it.each([
39+
{ name: "photo.HEIC", mimeType: undefined },
40+
{ name: "photo", mimeType: "image/heif" },
41+
])(
42+
"converts $name after native decoding fails and releases its preview",
43+
async ({ name, mimeType }) => {
44+
await act(() => {
45+
renderer = create(
46+
<AttachmentImage src="https://environment.test/photo" name={name} mimeType={mimeType} />,
47+
);
48+
});
49+
expect(fetchImage).not.toHaveBeenCalled();
50+
await act(() => renderer.root.findByType("img").props.onError(decodeError));
51+
expect(renderer.root.findByType("img").props.src).toBe("blob:jpeg");
52+
expect(prepareImageForAttachment).toHaveBeenCalledWith(
53+
expect.objectContaining({ name, type: "image/heic" }),
54+
50 * 1024 * 1024,
55+
);
56+
await act(() => renderer.unmount());
57+
expect(revokeUrl).toHaveBeenCalledWith("blob:jpeg");
58+
},
59+
);
60+
61+
it("leaves PNG errors to the caller without fetching or converting", async () => {
62+
const onError = vi.fn();
63+
await act(() => {
64+
renderer = create(<AttachmentImage src="blob:png" name="photo.png" onError={onError} />);
65+
});
66+
await act(() => renderer.root.findByType("img").props.onError(decodeError));
67+
expect(onError).toHaveBeenCalledWith(decodeError);
68+
expect(fetchImage).not.toHaveBeenCalled();
69+
});
70+
71+
it("reports failed HEIC conversion through the existing error handler", async () => {
72+
const onError = vi.fn();
73+
vi.mocked(prepareImageForAttachment).mockResolvedValue({ ok: false, reason: "unreadable" });
74+
await act(() => {
75+
renderer = create(<AttachmentImage src="blob:heic" name="photo.heif" onError={onError} />);
76+
});
77+
await act(() => renderer.root.findByType("img").props.onError(decodeError));
78+
expect(onError).toHaveBeenCalledWith(decodeError);
79+
expect(URL.createObjectURL).not.toHaveBeenCalled();
80+
});
81+
82+
it("discards an old decode when navigating to a different source", async () => {
83+
let finishDecode!: (result: Awaited<ReturnType<typeof prepareImageForAttachment>>) => void;
84+
vi.mocked(prepareImageForAttachment).mockReturnValue(
85+
new Promise((resolve) => {
86+
finishDecode = resolve;
87+
}),
88+
);
89+
await act(() => {
90+
renderer = create(<AttachmentImage src="blob:first" name="photo.heic" />);
91+
});
92+
await act(() => renderer.root.findByType("img").props.onError(decodeError));
93+
await act(() => renderer.update(<AttachmentImage src="blob:second" name="photo.heic" />));
94+
await act(() => finishDecode({ ok: true, file: jpeg, recompressed: true }));
95+
expect(renderer.root.findByType("img").props.src).toBe("blob:second");
96+
expect(URL.createObjectURL).not.toHaveBeenCalled();
97+
expect(fetchImage.mock.calls[0]?.[1].signal.aborted).toBe(true);
98+
});
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import {
2+
useEffect,
3+
useEffectEvent,
4+
useState,
5+
type ComponentProps,
6+
type SyntheticEvent,
7+
} from "react";
8+
import {
9+
isHeicImageFile,
10+
MAX_COMPRESSIBLE_SOURCE_BYTES,
11+
prepareImageForAttachment,
12+
} from "../../lib/imageCompression";
13+
14+
type AttachmentImageProps = ComponentProps<"img"> & { name: string; mimeType?: string | undefined };
15+
16+
export function AttachmentImage({ name, mimeType, ...props }: AttachmentImageProps) {
17+
return isHeicImageFile({ name, type: mimeType ?? "" }) ? (
18+
<HeicImage key={props.src} {...props} name={name} />
19+
) : (
20+
<img {...props} />
21+
);
22+
}
23+
24+
function HeicImage({ name, src, onError, ...props }: Omit<AttachmentImageProps, "mimeType">) {
25+
const [decodeError, setDecodeError] = useState<SyntheticEvent<HTMLImageElement> | null>(null);
26+
const [previewUrl, setPreviewUrl] = useState<string>();
27+
28+
const reportError = useEffectEvent((event: SyntheticEvent<HTMLImageElement>) => onError?.(event));
29+
30+
useEffect(() => {
31+
if (!decodeError || !src) return;
32+
const controller = new AbortController();
33+
let objectUrl: string | undefined;
34+
const decode = async () => {
35+
try {
36+
const response = await fetch(src, { signal: controller.signal });
37+
if (!response.ok) return reportError(decodeError);
38+
const blob = await response.blob();
39+
if (controller.signal.aborted) return;
40+
const result = await prepareImageForAttachment(
41+
new File([blob], name, { type: "image/heic" }),
42+
MAX_COMPRESSIBLE_SOURCE_BYTES,
43+
);
44+
if (controller.signal.aborted) return;
45+
if (!result.ok) return reportError(decodeError);
46+
objectUrl = URL.createObjectURL(result.file);
47+
setPreviewUrl(objectUrl);
48+
} catch {
49+
if (!controller.signal.aborted) reportError(decodeError);
50+
}
51+
};
52+
void decode();
53+
return () => {
54+
controller.abort();
55+
if (objectUrl) URL.revokeObjectURL(objectUrl);
56+
};
57+
}, [decodeError, name, src]);
58+
59+
return (
60+
<img {...props} src={previewUrl ?? src} onError={decodeError ? onError : setDecodeError} />
61+
);
62+
}

0 commit comments

Comments
 (0)