TypeScript
perf(mobile): skip canceled SVG parsing (#25314)
Alex Southwell09eb65344f6a
diff --git a/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsx b/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsxindex 7c0b08c2c5c..46da789a3fc 100644--- a/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsx+++ b/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsx@@ -161,3 +161,45 @@ it("fetches a failed SVG again on the next mount but keeps a parsed one", asyncregistry.dispose();}});++it("does not parse an obsolete SVG response after its last reader unmounts", async () => {+ (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;+ const registry = AtomRegistry.make({+ scheduleTask: (task) => {+ queueMicrotask(task);+ return () => {};+ },+ });+ const root = createRoot(document.createElement("div"));+ const fetchSvg = vi.mocked(fetch);+ const parseSvg = vi.mocked(parse);+ fetchSvg.mockReset();+ parseSvg.mockClear();+ const body = Promise.withResolvers<string>();+ fetchSvg.mockResolvedValue({ ok: true, status: 200, text: () => body.promise } as never);+ try {+ await act(async () =>+ root.render(+ <RegistryContext.Provider value={registry}>+ <ThreadMarkdownImageView+ uri="https://example.test/obsolete.svg"+ sourceKey="attachment:obsolete"+ unavailable={false}+ alt={null}+ format="svg"+ onPressPreview={() => {}}+ />+ </RegistryContext.Provider>,+ ),+ );+ expect(fetchSvg).toHaveBeenCalledOnce();+ const signal = fetchSvg.mock.calls[0]![1]!.signal!;+ await act(async () => root.render(null));+ expect(signal.aborted).toBe(true);+ await act(async () => body.resolve("<svg />"));+ expect(parseSvg).not.toHaveBeenCalled();+ } finally {+ await act(async () => root.unmount());+ registry.dispose();+ }+});diff --git a/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx b/apps/mobile/src/features/threads/ThreadMarkdownImage.tsxindex d510bc536e2..81d569fafb4 100644--- a/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx+++ b/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx@@ -74,7 +74,9 @@ const svgDocumentAtom = Atom.family((uri: string) =>if (cached !== null) return Effect.succeed(cached);return Effect.tryPromise({try: async (signal): Promise<SvgDocument> => {- const ast = parse(await readSvgXml(uri, signal));+ const xml = await readSvgXml(uri, signal);+ signal.throwIfAborted();+ const ast = parse(xml);if (!ast) throw new Error("SVG has no root element");return { ast, size: resolveSvgImageSize(ast.props) };},