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(mobile): isolate rich media preview state by identity

Chrisec97e4f8366c
diff --git a/apps/mobile/src/__tests__/messageNativeLifecycleContracts.test.ts b/apps/mobile/src/__tests__/messageNativeLifecycleContracts.test.ts
index 04a04accd5..d96c6b38ad 100644
--- a/apps/mobile/src/__tests__/messageNativeLifecycleContracts.test.ts
+++ b/apps/mobile/src/__tests__/messageNativeLifecycleContracts.test.ts
@@ -251,7 +251,16 @@ it('resets identity-bound row state before a recycled cell displays another item
expect(source).toContain('const [failedLocalUris, setFailedLocalUris] = usePreviewState<readonly string[]>([]);');
expect(source.match(/const \[intrinsicSize, setIntrinsicSize\] = usePreviewState</g)).toHaveLength(2);
expect(source.match(/usePreviewState=\{usePreviewState\}/g)).toHaveLength(2);
- expect(source).not.toContain('usePreviewState={useState}');
+ // Rich answers also live outside LegendList. Their ordinary state is safe
+ // only behind a message/source identity key; keep the original list contract
+ // for every other preview. Regression: PR #6373 used unkeyed React state.
+ const richMediaStart = source.indexOf('function RichAnswerMedia(');
+ expect(richMediaStart).toBeGreaterThan(-1);
+ expect(source.slice(0, richMediaStart)).not.toContain('usePreviewState={useState}');
+ const richMediaSource = source.slice(richMediaStart);
+ expect(richMediaSource).toContain('const previewKey = JSON.stringify([origin?.deviceId, origin?.sessionId, body.richStateKey ?? body.markdownImageCacheKey, node.id, url]);');
+ expect(richMediaSource).toContain('<MediaPreview key={previewKey}');
+ expect(richMediaSource).toContain('usePreviewState={useState}');
const groupSource = readFileSync(
resolve(process.cwd(), 'src/session/BotGroupMessageAttachments.tsx'), 'utf8',
);
diff --git a/apps/mobile/src/session/MessageRenderer.tsx b/apps/mobile/src/session/MessageRenderer.tsx
index 2e75644a94..b639e8ff66 100644
--- a/apps/mobile/src/session/MessageRenderer.tsx
+++ b/apps/mobile/src/session/MessageRenderer.tsx
@@ -9874,12 +9874,16 @@ function RichAnswerMedia({ node, body }: { node: RichNode; body: Parameters<type
if (!url) return <MarkdownBodyBase {...body} text={richMarkdown(node) ?? ''} streaming={false} />;
const label = richString(node, 'alt', node.kind);
const media: NormalizedToolMedia = { kind: node.kind, url, title: label, previewable: isDirectPreviewableMediaUrl(url) };
+ // Rich answers also render outside LegendList (cloud companions). Keep ordinary
+ // state there, but remount the preview when a recycled row or streamed media
+ // patch changes its identity, so resolved thumbnails/errors cannot cross images.
+ const previewKey = JSON.stringify([origin?.deviceId, origin?.sessionId, body.richStateKey ?? body.markdownImageCacheKey, node.id, url]);
const imageWidth = Math.min(body.layout.imagePreviewWidth, width);
const layout = { ...body.layout, imagePreviewWidth: imageWidth,
imagePreviewHeight: imageWidth * body.layout.imagePreviewHeight / body.layout.imagePreviewWidth,
mediaPreviewWidth: Math.min(body.layout.mediaPreviewWidth, width) };
return <View style={{ minWidth: 0 }} onLayout={event => setWidth(event.nativeEvent.layout.width)}>
- {width > 0 ? <MediaPreview layout={layout} media={media} label={label} onResolveRemoteMedia={resolver}
+ {width > 0 ? <MediaPreview key={previewKey} layout={layout} media={media} label={label} onResolveRemoteMedia={resolver}
usePreviewState={useState}
onOpen={body.onOpenPayload ? () => body.onOpenPayload!(buildMediaPayload(media, label)) : undefined} /> : null}
</View>;