feat(app): show loading and error states for assistant images

Render an activity indicator while image dimensions resolve and an
"Image unavailable" fallback if loading fails, replacing the previous
behavior where the surface stayed blank. Reserves a fixed minimum
height in both states so message layout doesn't shift.
This commit is contained in:
Mohamed Boudra
2026-04-29 19:47:01 +07:00
parent 98f2736233
commit 47223b375f
3 changed files with 71 additions and 10 deletions

View File

@@ -81,8 +81,10 @@ import { getMarkdownListMarker } from "@/utils/markdown-list";
import { openExternalUrl } from "@/utils/open-external-url"; import { openExternalUrl } from "@/utils/open-external-url";
import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks"; import { splitMarkdownBlocks } from "@/utils/split-markdown-blocks";
import { import {
getAssistantImageLoadStateFromMetadata,
getAssistantImageMetadata, getAssistantImageMetadata,
setAssistantImageMetadata, setAssistantImageMetadata,
type AssistantImageLoadState,
} from "@/utils/assistant-image-metadata"; } from "@/utils/assistant-image-metadata";
import { setAssistantMarkdownBlockHeight } from "@/utils/assistant-message-height-estimate"; import { setAssistantMarkdownBlockHeight } from "@/utils/assistant-message-height-estimate";
import { resolveAssistantImageSource } from "@/utils/assistant-image-source"; import { resolveAssistantImageSource } from "@/utils/assistant-image-source";
@@ -318,7 +320,7 @@ const userMessageStylesheet = StyleSheet.create((theme) => ({
flexDirection: "row", flexDirection: "row",
justifyContent: "flex-end", justifyContent: "flex-end",
paddingHorizontal: theme.spacing[2], paddingHorizontal: theme.spacing[2],
userSelect: isWeb ? "text" : "auto", ...(isWeb ? { userSelect: "text" as const } : {}),
}, },
content: { content: {
alignItems: "flex-end", alignItems: "flex-end",
@@ -493,7 +495,7 @@ export const assistantMessageStylesheet = StyleSheet.create((theme) => ({
container: { container: {
paddingHorizontal: theme.spacing[2], paddingHorizontal: theme.spacing[2],
paddingVertical: theme.spacing[3], paddingVertical: theme.spacing[3],
userSelect: isWeb ? "text" : "auto", ...(isWeb ? { userSelect: "text" as const } : {}),
}, },
containerCompactTop: { containerCompactTop: {
paddingTop: 0, paddingTop: 0,
@@ -567,17 +569,17 @@ const AssistantMarkdownResolvedImage = memo(function AssistantMarkdownResolvedIm
() => getAssistantImageMetadata({ source, workspaceRoot, serverId }), () => getAssistantImageMetadata({ source, workspaceRoot, serverId }),
[serverId, source, workspaceRoot], [serverId, source, workspaceRoot],
); );
const [aspectRatio, setAspectRatio] = useState<number | null>( const [loadState, setLoadState] = useState<AssistantImageLoadState>(() =>
cachedMetadata?.aspectRatio ?? null, getAssistantImageLoadStateFromMetadata(cachedMetadata),
); );
useEffect(() => { useEffect(() => {
if (cachedMetadata) { if (cachedMetadata) {
setAspectRatio(cachedMetadata.aspectRatio); setLoadState(getAssistantImageLoadStateFromMetadata(cachedMetadata));
return; return;
} }
setAspectRatio(null); setLoadState({ status: "loading" });
let cancelled = false; let cancelled = false;
Image.getSize( Image.getSize(
@@ -591,14 +593,17 @@ const AssistantMarkdownResolvedImage = memo(function AssistantMarkdownResolvedIm
{ source, workspaceRoot, serverId }, { source, workspaceRoot, serverId },
{ width, height }, { width, height },
); );
setAspectRatio(metadata?.aspectRatio ?? width / height); setLoadState({
status: "ready",
aspectRatio: metadata?.aspectRatio ?? width / height,
});
} }
}, },
() => { () => {
if (cancelled) { if (cancelled) {
return; return;
} }
setAspectRatio(null); setLoadState({ status: "error" });
}, },
); );
@@ -607,19 +612,41 @@ const AssistantMarkdownResolvedImage = memo(function AssistantMarkdownResolvedIm
}; };
}, [cachedMetadata, serverId, source, uri, workspaceRoot]); }, [cachedMetadata, serverId, source, uri, workspaceRoot]);
const handleImageError = useCallback(() => {
setLoadState({ status: "error" });
}, []);
const surfaceStyle = useMemo<StyleProp<ViewStyle>>( const surfaceStyle = useMemo<StyleProp<ViewStyle>>(
() => [ () => [
assistantMessageStylesheet.imageSurface, assistantMessageStylesheet.imageSurface,
aspectRatio ? { aspectRatio } : { minHeight: ASSISTANT_IMAGE_MIN_HEIGHT }, loadState.status === "ready"
? { aspectRatio: loadState.aspectRatio }
: { height: ASSISTANT_IMAGE_MIN_HEIGHT },
], ],
[aspectRatio], [loadState],
); );
const frameStyle = useMemo<StyleProp<ViewStyle>>( const frameStyle = useMemo<StyleProp<ViewStyle>>(
() => [assistantMessageStylesheet.imageFrame, containerStyle], () => [assistantMessageStylesheet.imageFrame, containerStyle],
[containerStyle], [containerStyle],
); );
const stateSurfaceStyle = useMemo<StyleProp<ViewStyle>>(
() => [surfaceStyle, assistantMessageStylesheet.imageState],
[surfaceStyle],
);
const imageSource = useMemo(() => ({ uri }), [uri]); const imageSource = useMemo(() => ({ uri }), [uri]);
if (loadState.status !== "ready") {
return (
<View style={frameStyle}>
<View style={stateSurfaceStyle}>
{loadState.status === "loading" ? <ActivityIndicator size="small" /> : null}
{loadState.status === "error" ? (
<Text style={assistantMessageStylesheet.imageErrorText}>Image unavailable</Text>
) : null}
</View>
</View>
);
}
return ( return (
<View style={frameStyle}> <View style={frameStyle}>
<View style={surfaceStyle}> <View style={surfaceStyle}>
@@ -628,6 +655,7 @@ const AssistantMarkdownResolvedImage = memo(function AssistantMarkdownResolvedIm
style={assistantMessageStylesheet.image} style={assistantMessageStylesheet.image}
resizeMode="contain" resizeMode="contain"
accessibilityLabel={alt} accessibilityLabel={alt}
onError={handleImageError}
/> />
</View> </View>
</View> </View>
@@ -728,6 +756,7 @@ function AssistantMarkdownImage({
() => [ () => [
assistantMessageStylesheet.imageFrame, assistantMessageStylesheet.imageFrame,
containerStyle, containerStyle,
{ height: ASSISTANT_IMAGE_MIN_HEIGHT },
assistantMessageStylesheet.imageState, assistantMessageStylesheet.imageState,
], ],
[containerStyle], [containerStyle],

View File

@@ -3,6 +3,7 @@ import {
clearAssistantImageMetadataCache, clearAssistantImageMetadataCache,
estimateAssistantMessageHeightFromCache, estimateAssistantMessageHeightFromCache,
extractAssistantImageSources, extractAssistantImageSources,
getAssistantImageLoadStateFromMetadata,
getAssistantImageMetadata, getAssistantImageMetadata,
setAssistantImageMetadata, setAssistantImageMetadata,
} from "./assistant-image-metadata"; } from "./assistant-image-metadata";
@@ -41,6 +42,23 @@ describe("assistant image metadata", () => {
}); });
}); });
it("maps missing metadata to the image loading state", () => {
expect(getAssistantImageLoadStateFromMetadata(null)).toEqual({ status: "loading" });
});
it("maps cached metadata to the image ready state", () => {
expect(
getAssistantImageLoadStateFromMetadata({
width: 900,
height: 1600,
aspectRatio: 9 / 16,
}),
).toEqual({
status: "ready",
aspectRatio: 9 / 16,
});
});
it("estimates assistant message height from cached image metadata", () => { it("estimates assistant message height from cached image metadata", () => {
setAssistantImageMetadata( setAssistantImageMetadata(
{ {

View File

@@ -8,6 +8,11 @@ export interface AssistantImageMetadata {
aspectRatio: number; aspectRatio: number;
} }
export type AssistantImageLoadState =
| { status: "loading" }
| { status: "ready"; aspectRatio: number }
| { status: "error" };
const assistantImageMetadataCache = new Map<string, AssistantImageMetadata>(); const assistantImageMetadataCache = new Map<string, AssistantImageMetadata>();
const assistantImageParseCache = new Map<string, { sources: string[]; hasNonImageText: boolean }>(); const assistantImageParseCache = new Map<string, { sources: string[]; hasNonImageText: boolean }>();
const ASSISTANT_IMAGE_METADATA_CACHE_LIMIT = 500; const ASSISTANT_IMAGE_METADATA_CACHE_LIMIT = 500;
@@ -126,6 +131,15 @@ export function getAssistantImageMetadata(input: {
return null; return null;
} }
export function getAssistantImageLoadStateFromMetadata(
metadata: AssistantImageMetadata | null,
): AssistantImageLoadState {
if (!metadata) {
return { status: "loading" };
}
return { status: "ready", aspectRatio: metadata.aspectRatio };
}
export function setAssistantImageMetadata( export function setAssistantImageMetadata(
input: { input: {
source: string; source: string;