Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(chat): 为桌面和手机消息图片增加加载占位与转圈

Dash73b0ccb46485
diff --git a/apps/desktop/src/renderer/__tests__/chatImageView.test.ts b/apps/desktop/src/renderer/__tests__/chatImageView.test.ts
index acf9479c6f..80abb0d28a 100644
--- a/apps/desktop/src/renderer/__tests__/chatImageView.test.ts
+++ b/apps/desktop/src/renderer/__tests__/chatImageView.test.ts
@@ -39,13 +39,32 @@ afterEach(() => {
describe('ChatImageView', () => {
describe.each(['user-attached', 'tool-output'] as const)('%s diagnostics', (variant) => {
+ it('keeps a loading frame until decode and resets it for a different source', () => {
+ const props = { filename: 'a.png', variant };
+ const { rerender } = render(React.createElement(ChatImageView, {
+ ...props, src: 'cindy-remote-media://m/device/a',
+ }));
+ expect(screen.getByRole('status').getAttribute('aria-label')).toBe('chat.imageMissing.loading');
+ expect(screen.getByAltText('a.png').style.display).toBe('none');
+ fireEvent.load(screen.getByAltText('a.png'));
+ expect(screen.queryByRole('status')).toBeNull();
+ expect(screen.getByRole('button', { name: 'a.png' }).style.display).toBe('');
+ rerender(React.createElement(ChatImageView, {
+ ...props, src: 'cindy-remote-media://m/device/b',
+ }));
+ expect(screen.getByRole('status')).toBeTruthy();
+ expect(screen.getByAltText('a.png').style.display).toBe('none');
+ fireEvent.load(screen.getByAltText('a.png'));
+ expect(screen.queryByRole('status')).toBeNull();
+ });
+
it.each(['xdt-image://images/a.png', 'cindy-media://blobs/a.png'])(
'confirms missing bytes via preload for %s',
async (src) => {
const read = vi.fn().mockRejectedValue(new Error('[NOT_FOUND] Image file not found'));
vi.stubGlobal('electronAPI', { readCachedImageAsBase64: read });
render(React.createElement(ChatImageView, { src, filename: 'a.png', variant }));
- fireEvent.error(screen.getByRole('button', { name: 'a.png' }));
+ fireEvent.error(screen.getByAltText('a.png'));
await waitFor(() => expect(screen.getByTestId('image-failure').dataset.status).toBe('missing'));
expect(read).toHaveBeenCalledExactlyOnceWith({ url: src });
},
@@ -59,11 +78,11 @@ describe('ChatImageView', () => {
render(React.createElement(ChatImageView, {
src: 'cindy-media://blobs/a.png', filename: 'a.png', variant,
}));
- fireEvent.error(screen.getByRole('button', { name: 'a.png' }));
+ fireEvent.error(screen.getByAltText('a.png'));
expect(screen.getByTestId('image-failure').dataset.status).toBe('unavailable');
fireEvent(window, new Event(event));
- expect(screen.getByRole('button', { name: 'a.png' })).toBeTruthy();
- fireEvent.error(screen.getByRole('button', { name: 'a.png' }));
+ expect(screen.getByAltText('a.png')).toBeTruthy();
+ fireEvent.error(screen.getByAltText('a.png'));
await act(async () => { reject(new Error('[NOT_FOUND] Stale result')); });
expect(read).toHaveBeenCalledTimes(2);
expect(screen.getByTestId('image-failure').dataset.status).toBe('unavailable');
@@ -76,11 +95,11 @@ describe('ChatImageView', () => {
vi.stubGlobal('electronAPI', { readCachedImageAsBase64: read });
const props = { filename: 'a.png', variant: 'tool-output' as const };
const { rerender } = render(React.createElement(ChatImageView, { ...props, src: 'xdt-image://images/a.png' }));
- fireEvent.error(screen.getByRole('button', { name: 'a.png' }));
+ fireEvent.error(screen.getByAltText('a.png'));
const remote = 'cindy-remote-media://m/device/a';
rerender(React.createElement(ChatImageView, { ...props, src: remote }));
await act(async () => { reject(new Error('[NOT_FOUND] Stale local result')); });
- expect(screen.getByRole('button', { name: 'a.png' }).getAttribute('src')).toBe(remote);
+ expect(screen.getByAltText('a.png').getAttribute('src')).toBe(remote);
expect(read).toHaveBeenCalledTimes(1);
});
@@ -92,12 +111,13 @@ describe('ChatImageView', () => {
src: 'cindy-remote-media://m/device/a', filename: 'a.png', variant: 'tool-output',
}));
for (const delay of [2000, 4000, 8000]) {
- fireEvent.error(screen.getByRole('button', { name: 'a.png' }));
+ fireEvent.error(screen.getByAltText('a.png'));
expect(screen.getByTestId('image-failure').dataset.status).toBe('unavailable');
act(() => vi.advanceTimersByTime(delay));
- expect(screen.getByRole('button', { name: 'a.png' })).toBeTruthy();
+ expect(screen.getByAltText('a.png')).toBeTruthy();
+ expect(screen.getByRole('status')).toBeTruthy();
}
- fireEvent.error(screen.getByRole('button', { name: 'a.png' }));
+ fireEvent.error(screen.getByAltText('a.png'));
act(() => vi.advanceTimersByTime(60000));
expect(screen.getByTestId('image-failure').dataset.status).toBe('unavailable');
expect(read).not.toHaveBeenCalled();
@@ -113,7 +133,7 @@ describe('ChatImageView', () => {
}),
);
- fireEvent.error(screen.getByRole('button', { name: 'shot.png' }));
+ fireEvent.error(screen.getByAltText('shot.png'));
expect(screen.queryByRole('button', { name: 'shot.png' })).toBeNull();
expect(screen.getByText('shot.png')).toBeTruthy();
@@ -126,7 +146,7 @@ describe('ChatImageView', () => {
}),
);
- const image = screen.getByRole('button', { name: 'shot.png' });
+ const image = screen.getByAltText('shot.png');
expect(image.getAttribute('src')).toBe('cindy-remote-media://m/device/shot');
});
@@ -147,6 +167,7 @@ describe('ChatImageView', () => {
modelFile: { provider: 'cindy', url: 'cindy-media://blobs/' + 'a'.repeat(64) + '.glb', format },
}),
);
+ fireEvent.load(screen.getByAltText('preview.png'));
fireEvent.click(screen.getByRole('button', { name: 'preview.png' }));
expect(screen.queryByTestId('model-lightbox') !== null).toBe(opensModel);
});
@@ -166,6 +187,7 @@ describe('ChatImageView', () => {
},
}),
);
+ fireEvent.load(screen.getByAltText('preview.png'));
fireEvent.click(screen.getByRole('button', { name: 'preview.png' }));
expect(screen.queryByTestId('model-lightbox')).not.toBeNull();
});
@@ -173,6 +195,7 @@ describe('ChatImageView', () => {
render(React.createElement(ChatImageView, {
src: 'xdt-image://control/keyboard.png', filename: 'keyboard.png', variant: 'tool-output',
}));
+ fireEvent.load(screen.getByAltText('keyboard.png'));
const trigger = screen.getByRole('button', { name: 'keyboard.png' });
trigger.focus();
fireEvent.keyDown(trigger, { key });
diff --git a/apps/desktop/src/renderer/__tests__/chatMediaLightboxFocus.test.ts b/apps/desktop/src/renderer/__tests__/chatMediaLightboxFocus.test.ts
index ae9b567ff2..d598e4b799 100644
--- a/apps/desktop/src/renderer/__tests__/chatMediaLightboxFocus.test.ts
+++ b/apps/desktop/src/renderer/__tests__/chatMediaLightboxFocus.test.ts
@@ -30,6 +30,7 @@ describe('ChatImageView 键盘交互(真实 ImageLightbox / ModelLightbox)', ()
variant: 'tool-output',
}),
);
+ fireEvent.load(screen.getByAltText('focus.png'));
const trigger = screen.getByRole('button', { name: 'focus.png' });
trigger.focus();
@@ -70,6 +71,7 @@ describe('ChatImageView 键盘交互(真实 ImageLightbox / ModelLightbox)', ()
},
}),
);
+ fireEvent.load(screen.getByAltText('model-preview.png'));
const trigger = screen.getByRole('button', { name: 'model-preview.png' });
trigger.focus();
diff --git a/apps/desktop/src/renderer/components/chat/ChatImageView.tsx b/apps/desktop/src/renderer/components/chat/ChatImageView.tsx
index 08b0bc75a0..0785e34b79 100644
--- a/apps/desktop/src/renderer/components/chat/ChatImageView.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatImageView.tsx
@@ -41,6 +41,7 @@ import { ImageLightbox } from './ImageLightbox';
import { useImageClipboard } from './useImageClipboard';
import { ModelLightbox } from './ModelLightbox';
import { ImageMissingPlaceholder } from './ImageMissingPlaceholder';
+import { ChatLoadingImage } from './ChatLoadingImage';
import { useRemoteMediaUrl } from '@/hooks/useRemoteMediaUrl';
import { useRemoteMediaErrorRetry } from '@/hooks/useRemoteMediaErrorRetry';
import { isRemoteMediaUrl } from '../../../shared/remoteMediaUrl';
@@ -190,7 +191,7 @@ export function ChatImageView({
return (
<>
- <img
+ <ChatLoadingImage
ref={previewTriggerRef}
src={displaySrc}
alt={filename}
diff --git a/apps/desktop/src/renderer/components/chat/ChatLoadingImage.tsx b/apps/desktop/src/renderer/components/chat/ChatLoadingImage.tsx
new file mode 100644
index 0000000000..aa2b1428fb
--- /dev/null
+++ b/apps/desktop/src/renderer/components/chat/ChatLoadingImage.tsx
@@ -0,0 +1,41 @@
+import { useState, type ComponentProps } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Spinner } from '@/components/ui/spinner';
+import { cn } from '@/lib/utils';
+
+/** Keep a visible frame until the browser has received and decoded the image. */
+export function ChatLoadingImage(props: ComponentProps<'img'>) {
+ // A changed URL starts a fresh load, including late remote-origin resolution.
+ return <ImageLoad key={props.src} {...props} />;
+}
+
+function ImageLoad({ onLoad, style, className, ...props }: ComponentProps<'img'>) {
+ const { t } = useTranslation();
+ const [loaded, setLoaded] = useState(false);
+ return (
+ <>
+ {!loaded && (
+ <span
+ role="status"
+ aria-label={t('chat.imageMissing.loading')}
+ className="inline-flex min-h-[180px] w-[280px] max-w-full self-start items-center justify-center rounded-xl bg-[var(--surface-chip)] text-[var(--text-tertiary)]"
+ >
+ <Spinner size={16} aria-hidden="true" />
+ </span>
+ )}
+ <img
+ {...props}
+ className={cn(
+ className,
+ loaded &&
+ 'motion-safe:animate-in motion-safe:fade-in [animation-duration:var(--motion-base)] [animation-timing-function:var(--motion-ease-out)]',
+ )}
+ style={loaded ? style : { ...style, display: 'none' }}
+ onLoad={(event) => {
+ setLoaded(true);
+ onLoad?.(event);
+ }}
+ />
+ </>
+ );
+}
diff --git a/apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx b/apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx
index 8840e0954f..b1542b55ae 100644
--- a/apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx
+++ b/apps/desktop/src/renderer/components/chat/MarkdownRenderer.tsx
@@ -13,6 +13,7 @@
import { Tip } from '@/components/ui/tooltip';
import { useImageLoadFailure } from './useImageLoadFailure';
+import { ChatLoadingImage } from './ChatLoadingImage';
import { FileTypeIcon } from '@/components/ui/file-type-icon';
import { CHAT_CODE_CLASS, CHAT_CODE_SURFACE_CLASS, CHAT_ICON_BUTTON_CLASS } from './chatChrome';
import { createElement, memo, useCallback, useEffect, useRef, useState, useMemo, isValidElement, type HTMLAttributes, type ReactNode } from 'react';
@@ -900,7 +901,7 @@ function LightboxImage({
setMenuPos({ x: e.clientX, y: e.clientY });
}}
>
- <img
+ <ChatLoadingImage
src={src}
alt={alt ?? ''}
style={{ maxWidth: 'min(100%, 50vw, 480px)', maxHeight: 'min(40vh, 420px)', height: 'auto' }}
diff --git a/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx
index 004e602239..a195e5842a 100644
--- a/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx
@@ -84,6 +84,7 @@ afterEach(async () => {
const label = (key: string) => i18n.t(key);
async function copyFromMenu(image: HTMLElement) {
+ fireEvent.load(image);
fireEvent.contextMenu(image, { clientX: 30, clientY: 40 });
fireEvent.click(await screen.findByRole('menuitem', { name: label('chat.media.copyImage') }));
}
@@ -266,6 +267,11 @@ describe('shared production image interactions', () => {
const img = screen.getByAltText('preview');
const remoteSrc = img.getAttribute('src')!;
expect(parseRemoteMediaUrl(remoteSrc)?.origUrl).toBe(managed);
+ expect(screen.getByRole('status').getAttribute('aria-label')).toBe(label('chat.imageMissing.loading'));
+ expect(img.style.display).toBe('none');
+ fireEvent.load(img);
+ expect(screen.queryByRole('status')).toBeNull();
+ expect(img.style.display).toBe('');
await copyFromMenu(img);
await waitFor(() => expect(nativeCopy).toHaveBeenCalled());
expect(readBytes).toHaveBeenCalledWith({ url: remoteSrc });
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/BotGroupChatView.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/BotGroupChatView.test.tsx
index 792dd83a8a..ac37c20b07 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/BotGroupChatView.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/BotGroupChatView.test.tsx
@@ -622,6 +622,7 @@ describe('BotGroupChatView', () => {
await user.click(await screen.findByRole('button', { name: 'bots.groupChat.server.reply' }));
const panel = screen.getByRole('complementary');
await user.type(within(panel).getByRole('textbox'), 'Unsent thread reply');
+ if (kind === 'image') fireEvent.load(screen.getByAltText('photo.png'));
await user.click(screen.getByRole('button', { name: kind === 'image' ? 'photo.png' : 'note.md' }));
const preview = kind === 'image' ? document.activeElement! : document.querySelector('[data-text-lightbox-overlay]')!;
if (kind !== 'image') {
diff --git a/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx b/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx
index be7c3d63f0..d717c462de 100644
--- a/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx
+++ b/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx
@@ -6,11 +6,11 @@ import type { ResolveRemoteMediaFn } from '@/session/remoteMedia';
// Keep the real group attachment, AttachmentStrip, MediaPreview and LegendList hooks.
// Only native surfaces and unrelated viewers are replaced for Node rendering.
-const imageEvents = vi.hoisted(() => new Map<string, { onLoad: (event: unknown) => void; onError: () => void }>());
+const imageEvents = vi.hoisted(() => new Map<string, { onLoad: (event: unknown) => void; onError: () => void; onDisplay: () => void; transition: number }>());
vi.mock('expo-web-browser', () => ({ openBrowserAsync: vi.fn(async () => ({})) }));
vi.mock('react-native', async () => {
const React = await import('react');
- const view = ({ children, testID, accessibilityLabel, onPress }: any) => React.createElement('div', { 'data-testid': testID, 'aria-label': accessibilityLabel, onClick: onPress }, children);
+ const view = ({ children, testID, accessibilityLabel, onPress, style }: any) => React.createElement('div', { 'data-testid': testID, 'aria-label': accessibilityLabel, onClick: onPress, style: Object.assign({}, ...[style].flat(Infinity).filter(Boolean)) }, children);
class Value { constructor(public value: number) {} interpolate() { return 0; } setValue() {} stopAnimation() {} }
return {
View: view, Text: view, Pressable: view, ScrollView: view, Modal: () => null,
@@ -25,7 +25,7 @@ vi.mock('react-native', async () => {
};
});
vi.mock('lucide-react-native', () => ({
- Database: () => null, FileArchive: () => null, FileAudio: () => null, FileChartColumn: () => null,
+ Image: () => null, ImageOff: () => null, Database: () => null, FileArchive: () => null, FileAudio: () => null, FileChartColumn: () => null,
FileCode: () => null, FileImage: () => null, FileSpreadsheet: () => null, FileText: () => null, FileVideo: () => null,
ArrowLeftRight: () => null, ArrowUp: () => null, Bot: () => null, Check: () => null, ChevronDown: () => null, ChevronRight: () => null, ChevronUp: () => null, Circle: () => null, CircleAlert: () => null, CircleCheck: () => null, CircleDashed: () => null, CircleStop: () => null, Copy: () => null, Ellipsis: () => null, ExternalLink: () => null, File: () => null, Ghost: () => null, Layers: () => null, ListTodo: () => null, LoaderCircle: () => null, PencilLine: () => null, RefreshCw: () => null, Send: () => null, Share: () => null, Sparkles: () => null, Split: () => null, Timer: () => null, Trash2: () => null, TriangleAlert: () => null, Undo2: () => null, X: () => null,
}));
@@ -33,8 +33,8 @@ vi.mock('react-native-svg', () => ({ default: () => null, Circle: () => null }))
vi.mock('react-native-uitextview', () => ({ UITextView: () => null }));
vi.mock('expo-image', async () => {
const { createElement } = await import('react');
- return { Image: ({ source, onLoad, onError, style }: any) => {
- imageEvents.set(source.uri, { onLoad, onError });
+ return { Image: ({ source, onLoad, onError, onDisplay, transition, style }: any) => {
+ imageEvents.set(source.uri, { onLoad, onError, onDisplay, transition });
const frame = Object.assign({}, ...[style].flat().filter(Boolean));
return createElement('img', { src: source.uri, 'data-width': frame.width, 'data-height': frame.height });
} };
@@ -109,6 +109,12 @@ describe('group image attachments outside LegendList (#5278)', () => {
it('renders the real image preview without a list provider and opens its gallery', async () => {
const container = await renderAttachment('new-message');
expect(container.querySelector('img')?.getAttribute('src')).toBe(thumbnailUrl);
+ expect(container.querySelector('[data-testid="message.mediaThumbLoading"]')).not.toBeNull();
+ act(() => imageEvents.get(thumbnailUrl)!.onLoad({ source: { width: 280, height: 180 } }));
+ expect(container.querySelector('[data-testid="message.mediaThumbLoading"]')).not.toBeNull();
+ expect(imageEvents.get(thumbnailUrl)!.transition).toBe(0);
+ act(() => imageEvents.get(thumbnailUrl)!.onDisplay());
+ expect(container.querySelector('[data-testid="message.mediaThumbLoading"]')).toBeNull();
expect(resolveMedia).toHaveBeenCalledWith(
expect.objectContaining({ url: imageUrl, thumbnail: true }), expect.anything(),
);
@@ -129,8 +135,8 @@ describe('group image attachments outside LegendList (#5278)', () => {
})));
expect(host.querySelector('img')?.getAttribute('src')).toBe(uri);
act(() => imageEvents.get(uri)!.onLoad({ source: { width: 100, height: 50 } }));
- expect(host.querySelector('img')?.getAttribute('data-width')).toBe('100');
- expect(host.querySelector('img')?.getAttribute('data-height')).toBe('50');
+ expect(host.querySelector('img')?.parentElement?.style.width).toBe('100px');
+ expect(host.querySelector('img')?.parentElement?.style.height).toBe('50px');
await act(async () => imageEvents.get(uri)!.onError());
expect(host.querySelector('img')?.getAttribute('src')).toBe(thumbnailUrl);
});
diff --git a/apps/mobile/src/__tests__/messageImageHandoff.test.tsx b/apps/mobile/src/__tests__/messageImageHandoff.test.tsx
index ef4b39f55e..31fb499fba 100644
--- a/apps/mobile/src/__tests__/messageImageHandoff.test.tsx
+++ b/apps/mobile/src/__tests__/messageImageHandoff.test.tsx
@@ -34,6 +34,8 @@ function fixture() {
};
const Image = Object.assign(ExpoImage, { getSize: vi.fn() });
const bindings = { React, View, Text: View, ExpoImage, Image,
+ MessageLoadingImage: ExpoImage,
+ MessageImagePlaceholder: ({ style }: any) => <View style={style} testID="message.mediaThumbLoading" />,
useTranslation: () => ({ t: (key: string) => key }),
useThemedStyles: () => ({}), makeStyles: () => ({}),
useRecyclingState: React.useState, useState: React.useState, useLayoutEffect: React.useLayoutEffect,
diff --git a/apps/mobile/src/__tests__/messageMediaThumbnailWiring.test.ts b/apps/mobile/src/__tests__/messageMediaThumbnailWiring.test.ts
index f4157da29d..2d02828d57 100644
--- a/apps/mobile/src/__tests__/messageMediaThumbnailWiring.test.ts
+++ b/apps/mobile/src/__tests__/messageMediaThumbnailWiring.test.ts
@@ -36,7 +36,7 @@ describe('mobile message media thumbnail wiring', () => {
);
expect(mediaPreview).toContain('shouldAutoResolveMediaThumbnail');
expect(mediaPreview).toContain('mediaThumbnailPhase');
- expect(mediaPreview).toContain('message.mediaThumbLoading');
+ expect(mediaPreview).toContain('<MessageImagePlaceholder');
expect(mediaPreview).toContain('message.mediaThumbFallback');
// 查看器插队 + 缩略图可取消
expect(mediaPreview).toContain('signal, forceRefresh');
@@ -79,8 +79,8 @@ describe('mobile message media thumbnail wiring', () => {
rendererSource.indexOf('function MediaPreview'),
);
// iOS ph:// 必须沿用相册托盘的 Expo 解码器,并从加载结果量尺寸。
- expect(rendererSource).toContain("import { Image as ExpoImage } from 'expo-image'");
- expect(pendingImage).toContain('<ExpoImage');
+ expect(readTextLf(resolve(process.cwd(), 'src/session/MessageLoadingImage.tsx'), 'utf8')).toContain("Image as ExpoImage");
+ expect(pendingImage).toContain('<MessageLoadingImage');
expect(pendingImage).toContain('contentFit="contain"');
expect(pendingImage).toContain('source: { width, height }');
expect(pendingImage).toContain('attachmentImageDisplaySize');
diff --git a/apps/mobile/src/session/MessageLoadingImage.tsx b/apps/mobile/src/session/MessageLoadingImage.tsx
new file mode 100644
index 0000000000..ba7e1ffcf3
--- /dev/null
+++ b/apps/mobile/src/session/MessageLoadingImage.tsx
@@ -0,0 +1,105 @@
+import { useState } from "react";
+import {
+ ActivityIndicator,
+ StyleSheet,
+ View,
+ type StyleProp,
+ type ViewStyle,
+} from "react-native";
+import { Image as ExpoImage, type ImageProps } from "expo-image";
+import { ImageOff, LoaderCircle } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { useReduceMotionEnabled } from "@/hooks/useReduceMotion";
+import {
+ iconSize,
+ motionDuration,
+ radius,
+ useTheme,
+ useThemedStyles,
+ type ThemeColors,
+} from "@/theme";
+
+/** Shared by remote resolution and byte decoding, so neither stage appears blank. */
+export function MessageImagePlaceholder({
+ style,
+}: {
+ style?: StyleProp<ViewStyle>;
+}) {
+ const styles = useThemedStyles(makeStyles);
+ const { colors } = useTheme();
+ const { t } = useTranslation();
+ const animate = useReduceMotionEnabled() === false;
+ return (
+ <View
+ style={[styles.placeholder, style]}
+ accessible
+ accessibilityLabel={t("message.lightbox.loading")}
+ accessibilityRole="progressbar"
+ testID="message.mediaThumbLoading"
+ >
+ {animate ? (
+ <ActivityIndicator size="small" color={colors.textTertiary} />
+ ) : (
+ <LoaderCircle size={iconSize.md} color={colors.textTertiary} />
+ )}
+ </View>
+ );
+}
+
+export function MessageLoadingImage(props: ImageProps) {
+ return <ImageLoad key={props.recyclingKey} {...props} />;
+}
+
+function ImageLoad({ style, onDisplay, onError, ...props }: ImageProps) {
+ const [status, setStatus] = useState<"loading" | "displayed" | "error">(
+ "loading",
+ );
+ const styles = useThemedStyles(makeStyles);
+ const { colors } = useTheme();
+ const { t } = useTranslation();
+ const animate = useReduceMotionEnabled() === false;
+ return (
+ <View style={[styles.frame, style]}>
+ {status === "loading" && (
+ <MessageImagePlaceholder style={StyleSheet.absoluteFill} />
+ )}
+ {status === "error" ? (
+ <View
+ style={[styles.placeholder, StyleSheet.absoluteFill]}
+ accessible
+ accessibilityLabel={t("message.lightbox.loadFailed")}
+ >
+ <ImageOff size={iconSize.xxl} color={colors.textTertiary} />
+ </View>
+ ) : (
+ <ExpoImage
+ {...props}
+ style={StyleSheet.absoluteFill}
+ transition={animate ? motionDuration.base : 0}
+ onDisplay={() => {
+ setStatus("displayed");
+ onDisplay?.();
+ }}
+ onError={(event) => {
+ setStatus("error");
+ onError?.(event);
+ }}
+ />
+ )}
+ </View>
+ );
+}
+
+const makeStyles = (colors: ThemeColors) =>
+ StyleSheet.create({
+ frame: {
+ borderRadius: radius.container,
+ overflow: "hidden",
+ },
+ placeholder: {
+ backgroundColor: colors.surfaceChip,
+ borderRadius: radius.container,
+ alignItems: "center",
+ justifyContent: "center",
+ },
+ });
diff --git a/apps/mobile/src/session/MessageRenderer.tsx b/apps/mobile/src/session/MessageRenderer.tsx
index c49b5d07f4..947f467555 100644
--- a/apps/mobile/src/session/MessageRenderer.tsx
+++ b/apps/mobile/src/session/MessageRenderer.tsx
@@ -25,7 +25,7 @@ import { mobileDebugEnabled, mobileDebugLog } from '@/debug/mobileDebugLog';
import { errorText, resolvedUrlKind } from '@/debug/fileDiagnostics';
import { createContext, Fragment, memo, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState, type ComponentProps, type Dispatch, type ReactNode, type SetStateAction } from 'react';
import { useTranslation } from 'react-i18next';
-import { Image as ExpoImage } from 'expo-image';
+import { MessageLoadingImage, MessageImagePlaceholder } from './MessageLoadingImage';
import {
ArrowLeftRight,
Bot,
@@ -6505,7 +6505,7 @@ function renderInline(
testID="message.markdownInlineImage"
>
<View style={size}>
- <ExpoImage
+ <MessageLoadingImage
accessibilityLabel={inline.alt || i18n.t('message.renderer.imageFallbackTitle')}
contentFit="cover"
recyclingKey={inline.url}
@@ -6765,7 +6765,7 @@ function PendingAttachmentImage({ layout, uri, sourceUri = uri, onError, onSize,
);
return (
<View style={styles.attachmentImageWrap}>
- <ExpoImage
+ <MessageLoadingImage
source={{ uri }}
recyclingKey={uri}
contentFit="contain"
@@ -6940,7 +6940,7 @@ function MediaPreview({
<Text style={styles.mediaHint} numberOfLines={2}>{fallbackDetail}</Text>
</View>
) : thumbUri ? (
- <ExpoImage
+ <MessageLoadingImage
// 尺寸未知时先 contain 进最大框,解码后收敛到真实比例。
contentFit="contain"
recyclingKey={thumbUri}
@@ -6950,7 +6950,7 @@ function MediaPreview({
style={[styles.attachmentImage, displaySize]}
/>
) : (
- <View style={[styles.attachmentImagePending, displaySize]} testID="message.mediaThumbLoading" />
+ <MessageImagePlaceholder style={displaySize} />
)}
</MessageContentOpenButton>
);
@@ -6972,7 +6972,7 @@ function MediaPreview({
testID="message.mediaPreviewButton"
>
{uri ? (
- <ExpoImage
+ <MessageLoadingImage
contentFit="cover"
recyclingKey={uri}
source={{ uri }}
@@ -6980,7 +6980,7 @@ function MediaPreview({
style={[styles.imagePreview, frameSize]}
/>
) : phase.kind === 'resolving' ? (
- <View style={[styles.imagePreview, frameSize]} testID="message.mediaThumbLoading" />
+ <MessageImagePlaceholder style={[styles.imagePreview, frameSize]} />
) : (
<View
style={[styles.imagePreview, styles.imagePreviewFallback, frameSize]}