Skip to content

Commit 910ef8a

Browse files
committed
fix(web): render stored HEIC attachments
1 parent c57a04b commit 910ef8a

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
@@ -147,7 +147,12 @@ import {
147147
type ComposerBannerStackContent,
148148
type ComposerBannerStackItem,
149149
} from "./ComposerBannerStack";
150-
import { compressImageForStash, prepareImageForAttachment } from "../../lib/imageCompression";
150+
import {
151+
compressImageForStash,
152+
isHeicImageFile,
153+
prepareImageForAttachment,
154+
} from "../../lib/imageCompression";
155+
import { AttachmentImage } from "../media/AttachmentImage";
151156
import {
152157
fileAttachmentTooLargeMessage,
153158
formatAttachmentSize,
@@ -4797,12 +4802,22 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
47974802
alt=""
47984803
className="size-full object-cover"
47994804
fallback={
4800-
<PierreEntryIcon
4801-
pathValue={image.name}
4802-
kind="file"
4803-
theme={resolvedTheme}
4804-
className="m-auto size-3.5"
4805-
/>
4805+
isHeicImageFile({ name: image.name, type: image.mimeType }) ? (
4806+
<AttachmentImage
4807+
name={image.name}
4808+
mimeType={image.mimeType}
4809+
src={image.previewUrl}
4810+
alt=""
4811+
className="size-full object-cover"
4812+
/>
4813+
) : (
4814+
<PierreEntryIcon
4815+
pathValue={image.name}
4816+
kind="file"
4817+
theme={resolvedTheme}
4818+
className="m-auto size-3.5"
4819+
/>
4820+
)
48064821
}
48074822
/>
48084823
) : (
@@ -6554,9 +6569,19 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
65546569
alt={image.name}
65556570
className="h-full w-full object-cover"
65566571
fallback={
6557-
<span className="flex h-full items-center justify-center px-1 text-3xs text-secondary-label">
6558-
{image.name}
6559-
</span>
6572+
isHeicImageFile({ name: image.name, type: image.mimeType }) ? (
6573+
<AttachmentImage
6574+
name={image.name}
6575+
mimeType={image.mimeType}
6576+
src={image.previewUrl}
6577+
alt={image.name}
6578+
className="h-full w-full object-cover"
6579+
/>
6580+
) : (
6581+
<span className="flex h-full items-center justify-center px-1 text-3xs text-secondary-label">
6582+
{image.name}
6583+
</span>
6584+
)
65606585
}
65616586
/>
65626587
</button>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
237237
key={`${index}:${item.src}`}
238238
src={item.src}
239239
name={item.name}
240+
mimeType={item.mimeType}
240241
onError={() => setFailedImageSrc(item.src)}
241242
/>
242243
)}

‎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
@@ -23,6 +23,7 @@ export interface ExpandedImageItem {
2323
/** A loadable URL, or null when the dialog must mint one from `asset` first. */
2424
src: string | null;
2525
name: string;
26+
mimeType?: string;
2627
type?: "video";
2728
source?: SnapShotSource;
2829
autoPlay?: boolean;
@@ -178,7 +179,15 @@ export function buildExpandedImagePreview(
178179
}
179180
const previewableImages = images.flatMap((image) =>
180181
image.type === "image" && image.previewUrl
181-
? [{ id: image.id, src: image.previewUrl, name: image.name, source: image.source }]
182+
? [
183+
{
184+
id: image.id,
185+
src: image.previewUrl,
186+
name: image.name,
187+
mimeType: image.mimeType,
188+
source: image.source,
189+
},
190+
]
182191
: [],
183192
);
184193
if (previewableImages.length === 0) {
@@ -192,6 +201,7 @@ export function buildExpandedImagePreview(
192201
images: previewableImages.map((image) => ({
193202
src: image.src,
194203
name: image.name,
204+
mimeType: image.mimeType,
195205
...(image.source?.kind === "snap-shot" ? { source: image.source } : {}),
196206
})),
197207
index: selectedIndex,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ import type {
140140
import { Button } from "../ui/button";
141141
import type { QueuedComposerMessage } from "../../queuedMessageStore";
142142
import { useAssetUrlRefresh, useAssetUrls, useAssetUrlState } from "../../assets/assetUrls";
143+
import { AttachmentImage } from "../media/AttachmentImage";
143144
import { MediaVideoPlayer } from "../media/MediaVideoPlayer";
144145
import { getVirtualizedScrollFadeClassName } from "../ui/scroll-area";
145146
import {
@@ -2135,7 +2136,9 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
21352136
ctx.onImageExpand(preview);
21362137
}}
21372138
>
2138-
<img
2139+
<AttachmentImage
2140+
name={image.name}
2141+
mimeType={image.mimeType}
21392142
src={image.previewUrl}
21402143
alt={image.name}
21412144
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
@@ -8,6 +8,8 @@ import {
88
type Ref,
99
} from "react";
1010

11+
import { AttachmentImage } from "../media/AttachmentImage";
12+
1113
const MAX_ZOOM = 8;
1214

1315
export interface ZoomableImageHandle {
@@ -18,11 +20,13 @@ export interface ZoomableImageHandle {
1820
export function ZoomableImage({
1921
src,
2022
name,
23+
mimeType,
2124
onError,
2225
ref,
2326
}: {
2427
src: string;
2528
name: string;
29+
mimeType?: string | undefined;
2630
onError: () => void;
2731
ref?: Ref<ZoomableImageHandle>;
2832
}) {
@@ -222,7 +226,9 @@ export function ZoomableImage({
222226
setDragging(false);
223227
}}
224228
>
225-
<img
229+
<AttachmentImage
230+
name={name}
231+
mimeType={mimeType}
226232
src={src}
227233
alt={name}
228234
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)