Skip to content

Commit dfcf256

Browse files
committed
fix(web): render stored HEIC attachments
1 parent 18c5a1d commit dfcf256

8 files changed

Lines changed: 215 additions & 5 deletions

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ import {
118118
type ComposerBannerStackItem,
119119
} from "./ComposerBannerStack";
120120
import { compressImageForStash, prepareImageForAttachment } from "../../lib/imageCompression";
121+
import { AttachmentImage } from "../media/AttachmentImage";
121122
import {
122123
fileAttachmentTooLargeMessage,
123124
formatAttachmentSize,
@@ -3932,7 +3933,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
39323933
}}
39333934
>
39343935
{image.previewUrl ? (
3935-
<img src={image.previewUrl} alt="" className="size-full object-cover" />
3936+
<AttachmentImage
3937+
name={image.name}
3938+
mimeType={image.mimeType}
3939+
src={image.previewUrl}
3940+
alt=""
3941+
className="size-full object-cover"
3942+
/>
39363943
) : (
39373944
<PierreEntryIcon
39383945
pathValue={image.name}
@@ -5400,7 +5407,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
54005407
onExpandImage(preview);
54015408
}}
54025409
>
5403-
<img
5410+
<AttachmentImage
5411+
name={image.name}
5412+
mimeType={image.mimeType}
54045413
src={image.previewUrl}
54055414
alt={image.name}
54065415
className="h-full w-full object-cover"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
218218
key={`${index}:${item.src}`}
219219
src={item.src}
220220
name={item.name}
221+
mimeType={item.mimeType}
221222
onError={() => setFailedImageSrc(item.src)}
222223
/>
223224
)}

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

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

4444
describe("buildExpandedImagePreview", () => {
45+
it("keeps MIME type for stored images without a filename extension", () => {
46+
const preview = buildExpandedImagePreview(
47+
[
48+
{
49+
type: "image",
50+
id: "heic-1",
51+
name: "photo",
52+
mimeType: "image/heic",
53+
sizeBytes: 3,
54+
previewUrl: "blob:heic",
55+
},
56+
],
57+
"heic-1",
58+
);
59+
expect(preview?.images[0]).toMatchObject({
60+
name: "photo",
61+
mimeType: "image/heic",
62+
src: "blob:heic",
63+
});
64+
});
65+
4566
it("keeps window capture details with the expanded image", () => {
4667
const source = {
4768
kind: "snap-shot" as const,

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export interface ExpandedImageItem {
2424
/** A loadable URL, or null when the dialog must mint one from `asset` first. */
2525
src: string | null;
2626
name: string;
27+
mimeType?: string;
2728
type?: "video";
2829
source?: SnapShotSource;
2930
autoPlay?: boolean;
@@ -144,7 +145,15 @@ export function buildExpandedImagePreview(
144145
}
145146
const previewableImages = images.flatMap((image) =>
146147
image.type === "image" && image.previewUrl
147-
? [{ id: image.id, src: image.previewUrl, name: image.name, source: image.source }]
148+
? [
149+
{
150+
id: image.id,
151+
src: image.previewUrl,
152+
name: image.name,
153+
mimeType: image.mimeType,
154+
source: image.source,
155+
},
156+
]
148157
: [],
149158
);
150159
if (previewableImages.length === 0) {
@@ -158,6 +167,7 @@ export function buildExpandedImagePreview(
158167
images: previewableImages.map((image) => ({
159168
src: image.src,
160169
name: image.name,
170+
mimeType: image.mimeType,
161171
...(image.source?.kind === "snap-shot" ? { source: image.source } : {}),
162172
})),
163173
index: selectedIndex,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ import {
112112
} from "lucide-react";
113113
import { Button } from "../ui/button";
114114
import { useAssetUrlRefresh, useAssetUrls, useAssetUrlState } from "../../assets/assetUrls";
115+
import { AttachmentImage } from "../media/AttachmentImage";
115116
import { MediaVideoPlayer } from "../media/MediaVideoPlayer";
116117
import { getVirtualizedScrollFadeClassName } from "../ui/scroll-area";
117118
import {
@@ -1457,7 +1458,9 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
14571458
ctx.onImageExpand(preview);
14581459
}}
14591460
>
1460-
<img
1461+
<AttachmentImage
1462+
name={image.name}
1463+
mimeType={image.mimeType}
14611464
src={image.previewUrl}
14621465
alt={image.name}
14631466
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
}) {
@@ -216,7 +220,9 @@ export function ZoomableImage({
216220
setDragging(false);
217221
}}
218222
>
219-
<img
223+
<AttachmentImage
224+
name={name}
225+
mimeType={mimeType}
220226
src={src}
221227
alt={name}
222228
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)