Skip to content

Commit 5a7a7cf

Browse files
authored
fix(mobile): preserve markdown image dimensions (#7940)
1 parent 4e00471 commit 5a7a7cf

3 files changed

Lines changed: 203 additions & 46 deletions

File tree

‎apps/mobile/src/features/threads/ThreadFeed.tsx‎

Lines changed: 104 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {
4040
type ColorValue,
4141
useWindowDimensions,
4242
View,
43+
type ViewStyle,
4344
} from "react-native";
4445
import { TouchableOpacity } from "react-native-gesture-handler";
4546
import ImageViewing from "react-native-image-viewing";
@@ -105,6 +106,7 @@ import {
105106
import { useMarkdownCodeHighlight } from "./markdownCodeHighlightState";
106107
import { useAssetUrl, useAssetUrlState } from "../../state/assets";
107108
import { resolveWorkspaceRelativeFilePath } from "../files/filePath";
109+
import { MARKDOWN_IMAGE_MAX_WIDTH, resolveMarkdownImageDisplaySize } from "./markdownImageSize";
108110

109111
const WIDE_MARKDOWN_BLOCK_OPTIONS = {
110112
includeOrderedLists: Platform.OS === "android",
@@ -196,31 +198,50 @@ function MessageAttachmentImage(props: {
196198
);
197199
}
198200

199-
/** Markdown image whose src is a workspace file — loads through a signed asset URL. */
200-
function ThreadMarkdownImage(props: {
201-
readonly environmentId: EnvironmentId;
202-
readonly threadId: ThreadId;
203-
readonly path: string;
201+
function ThreadMarkdownImageView(props: {
202+
readonly uri: string | null;
203+
readonly sourceKey: string;
204+
readonly unavailable: boolean;
204205
readonly alt: string | null;
205206
readonly onPressImage: (uri: string) => void;
206207
}) {
207208
const codeBackground = useThemeColor("--color-md-code-bg");
209+
const [availableWidth, setAvailableWidth] = useState(0);
210+
const [sourceSize, setSourceSize] = useState<{ width: number; height: number } | null>(null);
208211
const [failedUri, setFailedUri] = useState<string | null>(null);
209-
const assetUrl = useAssetUrlState(props.environmentId, {
210-
_tag: "workspace-file",
211-
threadId: props.threadId,
212-
path: props.path,
213-
});
214-
const uri = assetUrl._tag === "Success" ? assetUrl.url : null;
215-
const failed = assetUrl._tag === "Failure" || (uri !== null && failedUri === uri);
212+
const activeUriRef = useRef(props.uri);
213+
activeUriRef.current = props.uri;
214+
215+
useEffect(() => {
216+
setSourceSize(null);
217+
}, [props.sourceKey]);
218+
219+
useEffect(() => {
220+
setFailedUri(null);
221+
}, [props.uri]);
222+
223+
const displaySize =
224+
sourceSize === null
225+
? null
226+
: resolveMarkdownImageDisplaySize({
227+
sourceWidth: sourceSize.width,
228+
sourceHeight: sourceSize.height,
229+
availableWidth,
230+
});
231+
const failed = props.unavailable || (props.uri !== null && failedUri === props.uri);
232+
const placeholderWidth: ViewStyle["width"] =
233+
availableWidth > 0 ? Math.min(availableWidth, MARKDOWN_IMAGE_MAX_WIDTH) : "100%";
234+
const frameStyle: ViewStyle = displaySize ?? { width: placeholderWidth, aspectRatio: 16 / 9 };
216235

217236
return (
218-
<View style={{ gap: 6 }}>
219-
{uri === null || failed ? (
237+
<View
238+
onLayout={(event) => setAvailableWidth(event.nativeEvent.layout.width)}
239+
style={{ alignSelf: "stretch", gap: 6 }}
240+
>
241+
{props.uri === null || failed ? (
220242
<View
221243
style={{
222-
width: "100%",
223-
aspectRatio: 16 / 9,
244+
...frameStyle,
224245
borderRadius: 10,
225246
backgroundColor: codeBackground,
226247
alignItems: "center",
@@ -238,20 +259,37 @@ function ThreadMarkdownImage(props: {
238259
accessibilityRole="imagebutton"
239260
accessibilityLabel={props.alt ?? "Markdown image"}
240261
activeOpacity={0.7}
241-
onPress={() => props.onPressImage(uri)}
262+
onPress={() => props.onPressImage(props.uri!)}
263+
style={{ alignSelf: "flex-start" }}
242264
>
243-
<Image
244-
source={{ uri }}
245-
resizeMode="contain"
246-
accessible={false}
247-
onError={() => setFailedUri(uri)}
265+
<View
248266
style={{
249-
width: "100%",
250-
aspectRatio: 16 / 9,
267+
...frameStyle,
251268
borderRadius: 10,
252269
backgroundColor: codeBackground,
270+
alignItems: "center",
271+
justifyContent: "center",
272+
overflow: "hidden",
253273
}}
254-
/>
274+
>
275+
<Image
276+
source={{ uri: props.uri }}
277+
resizeMode="contain"
278+
accessible={false}
279+
onLoad={(event) => {
280+
if (activeUriRef.current !== props.uri) return;
281+
const { width, height } = event.nativeEvent.source;
282+
setSourceSize({ width, height });
283+
}}
284+
onError={() => setFailedUri(props.uri)}
285+
style={{
286+
width: "100%",
287+
height: "100%",
288+
opacity: displaySize === null ? 0 : 1,
289+
}}
290+
/>
291+
{displaySize === null ? <ActivityIndicator style={StyleSheet.absoluteFill} /> : null}
292+
</View>
255293
</TouchableOpacity>
256294
)}
257295
{props.alt ? (
@@ -263,28 +301,40 @@ function ThreadMarkdownImage(props: {
263301
);
264302
}
265303

304+
/** Markdown image whose src is a workspace file — loads through a signed asset URL. */
305+
function ThreadMarkdownImage(props: {
306+
readonly environmentId: EnvironmentId;
307+
readonly threadId: ThreadId;
308+
readonly path: string;
309+
readonly alt: string | null;
310+
readonly onPressImage: (uri: string) => void;
311+
}) {
312+
const assetUrl = useAssetUrlState(props.environmentId, {
313+
_tag: "workspace-file",
314+
threadId: props.threadId,
315+
path: props.path,
316+
});
317+
318+
return (
319+
<ThreadMarkdownImageView
320+
uri={assetUrl._tag === "Success" ? assetUrl.url : null}
321+
sourceKey={props.path}
322+
unavailable={assetUrl._tag === "Failure"}
323+
alt={props.alt}
324+
onPressImage={props.onPressImage}
325+
/>
326+
);
327+
}
328+
266329
function ThreadMarkdownImageUnavailable(props: { readonly alt: string | null }) {
267-
const codeBackground = useThemeColor("--color-md-code-bg");
268330
return (
269-
<View style={{ gap: 6 }}>
270-
<View
271-
style={{
272-
width: "100%",
273-
aspectRatio: 16 / 9,
274-
borderRadius: 10,
275-
backgroundColor: codeBackground,
276-
alignItems: "center",
277-
justifyContent: "center",
278-
}}
279-
>
280-
<Text className="text-xs text-foreground-muted">Image unavailable</Text>
281-
</View>
282-
{props.alt ? (
283-
<Text selectable className="text-xs text-foreground-muted">
284-
{props.alt}
285-
</Text>
286-
) : null}
287-
</View>
331+
<ThreadMarkdownImageView
332+
uri={null}
333+
sourceKey="unavailable"
334+
unavailable
335+
alt={props.alt}
336+
onPressImage={() => undefined}
337+
/>
288338
);
289339
}
290340

@@ -1530,7 +1580,15 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
15301580
(image) => {
15311581
const imageSource = classifyMarkdownImageSource(image.href, props.workspaceRoot ?? null);
15321582
if (imageSource._tag === "Direct") {
1533-
return null;
1583+
return (
1584+
<ThreadMarkdownImageView
1585+
uri={imageSource.uri}
1586+
sourceKey={imageSource.uri}
1587+
unavailable={false}
1588+
alt={image.alt}
1589+
onPressImage={(uri) => setExpandedImage({ uri })}
1590+
/>
1591+
);
15341592
}
15351593
if (imageSource._tag === "Blocked") {
15361594
return <ThreadMarkdownImageUnavailable alt={image.alt} />;
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import { describe, expect, it } from "vite-plus/test";
2+
3+
import {
4+
MARKDOWN_IMAGE_MAX_HEIGHT,
5+
MARKDOWN_IMAGE_MAX_WIDTH,
6+
resolveMarkdownImageDisplaySize,
7+
} from "./markdownImageSize";
8+
9+
describe("resolveMarkdownImageDisplaySize", () => {
10+
it("keeps small images at their intrinsic size", () => {
11+
expect(
12+
resolveMarkdownImageDisplaySize({
13+
sourceWidth: 96,
14+
sourceHeight: 96,
15+
availableWidth: 332,
16+
}),
17+
).toEqual({ width: 96, height: 96 });
18+
});
19+
20+
it("fits wide images to the available chat width", () => {
21+
expect(
22+
resolveMarkdownImageDisplaySize({
23+
sourceWidth: 960,
24+
sourceHeight: 540,
25+
availableWidth: 332,
26+
}),
27+
).toEqual({ width: 332, height: 186.75 });
28+
});
29+
30+
it("caps wide images at 480 points on larger screens", () => {
31+
expect(
32+
resolveMarkdownImageDisplaySize({
33+
sourceWidth: 960,
34+
sourceHeight: 540,
35+
availableWidth: 900,
36+
}),
37+
).toEqual({ width: MARKDOWN_IMAGE_MAX_WIDTH, height: 270 });
38+
});
39+
40+
it("caps tall images by height without changing their aspect ratio", () => {
41+
expect(
42+
resolveMarkdownImageDisplaySize({
43+
sourceWidth: 400,
44+
sourceHeight: 800,
45+
availableWidth: 332,
46+
}),
47+
).toEqual({ width: 240, height: MARKDOWN_IMAGE_MAX_HEIGHT });
48+
});
49+
50+
it("rejects dimensions that cannot produce a stable layout", () => {
51+
expect(
52+
resolveMarkdownImageDisplaySize({ sourceWidth: 0, sourceHeight: 100, availableWidth: 332 }),
53+
).toBeNull();
54+
expect(
55+
resolveMarkdownImageDisplaySize({
56+
sourceWidth: 100,
57+
sourceHeight: Number.NaN,
58+
availableWidth: 332,
59+
}),
60+
).toBeNull();
61+
});
62+
});
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
export const MARKDOWN_IMAGE_MAX_WIDTH = 480;
2+
export const MARKDOWN_IMAGE_MAX_HEIGHT = 480;
3+
4+
export interface MarkdownImageDisplaySize {
5+
readonly width: number;
6+
readonly height: number;
7+
}
8+
9+
/** Keeps small images intrinsic while fitting larger images inside the chat viewport. */
10+
export function resolveMarkdownImageDisplaySize(input: {
11+
readonly sourceWidth: number;
12+
readonly sourceHeight: number;
13+
readonly availableWidth: number;
14+
}): MarkdownImageDisplaySize | null {
15+
if (
16+
!Number.isFinite(input.sourceWidth) ||
17+
!Number.isFinite(input.sourceHeight) ||
18+
!Number.isFinite(input.availableWidth) ||
19+
input.sourceWidth <= 0 ||
20+
input.sourceHeight <= 0 ||
21+
input.availableWidth <= 0
22+
) {
23+
return null;
24+
}
25+
26+
const scale = Math.min(
27+
1,
28+
input.availableWidth / input.sourceWidth,
29+
MARKDOWN_IMAGE_MAX_WIDTH / input.sourceWidth,
30+
MARKDOWN_IMAGE_MAX_HEIGHT / input.sourceHeight,
31+
);
32+
33+
return {
34+
width: input.sourceWidth * scale,
35+
height: input.sourceHeight * scale,
36+
};
37+
}

0 commit comments

Comments
 (0)