@devries-cameron20 / t3code Mirror · read-only / commits / ac5dd1ff47
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 11:00 UTC

fix(mobile): inline audio keeps playing when its row scrolls out of view (#37340)

Co-authored-by: cmcgrabby-hue <267390149+cmcgrabby-hue@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>

cmcgrabby-hue committed Nov 15, 2026 at 13:56 UTC ac5dd1ff47d3d9d3807b9641d1b4b1cdf761c04f
4 files changed +128 -11
apps/mobile/src/features/threads/ThreadFeed.tsx
+30 -5
@@ -2,7 +2,11 @@ import { Button } from "../../components/ui/Button";
2 import * as Dialog from "../../components/ui/Dialog";
3 import { useOpenPullRequest } from "../../native/useOpenPullRequest";
4 import { useWorkspaceSettledContentWidth } from "../layout/workspace-content-width";
5 -import { ThreadMarkdownVideo, ThreadMediaVisibleContext } from "./ThreadMarkdownVideo";
5 +import {
6 + ThreadMarkdownVideo,
7 + ThreadMediaRetainContext,
8 + ThreadMediaVisibleContext,
9 +} from "./ThreadMarkdownVideo";
10 import { useMarkdownImageSource } from "../../native/useMarkdownImageSource";
11 import {
12 enrichedContextLinkCustomization,
@@ -98,7 +102,7 @@ import { imageMimeType } from "@t3tools/shared/image";
102 import { videoMimeType } from "@t3tools/shared/video";
103 import { SymbolView, type AppSymbolName } from "../../components/ui/AppSymbol";
104 import { textDirection } from "@t3tools/shared/textDirection";
101 -import { useFocusEffect, useNavigation } from "@react-navigation/native";
105 +import { useFocusEffect, useIsFocused, useNavigation } from "@react-navigation/native";
106 import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
107 import { useDeviceType } from "../../native/native-layout-metrics";
108 import { isDuoDevice } from "../../lib/device-type";
@@ -114,8 +118,10 @@ import {
118 useSyncExternalStore,
119 useId,
120 type ComponentPropsWithRef,
121 + type Dispatch,
122 type ReactNode,
123 type RefObject,
124 + type SetStateAction,
125 } from "react";
126 import {
127 Image,
@@ -1119,12 +1125,26 @@ function ThreadFeedScrollView(props: ComponentPropsWithRef<typeof Animated.Scrol
1125 );
1126 }
1127
1122 -function ThreadMediaVisibility(props: { readonly children: ReactNode }) {
1128 +function ThreadMediaVisibility(props: {
1129 + readonly rowId: string;
1130 + readonly setRetainedRowId: Dispatch<SetStateAction<string | null>>;
1131 + readonly children: ReactNode;
1132 +}) {
1133 + const { rowId, setRetainedRowId } = props;
1134 const [visible, setVisible] = useState(false);
1135 useViewabilityAmount<ThreadFeedEntry>(
1136 useCallback((token) => setVisible(token.sizeVisible > 0), []),
1137 );
1127 - return <ThreadMediaVisibleContext value={visible}>{props.children}</ThreadMediaVisibleContext>;
1138 + const retain = useCallback(
1139 + (retained: boolean) =>
1140 + setRetainedRowId((current) => (retained ? rowId : current === rowId ? null : current)),
1141 + [rowId, setRetainedRowId],
1142 + );
1143 + return (
1144 + <ThreadMediaRetainContext value={retain}>
1145 + <ThreadMediaVisibleContext value={visible}>{props.children}</ThreadMediaVisibleContext>
1146 + </ThreadMediaRetainContext>
1147 + );
1148 }
1149
1150 /** The reply a link sits in; a file it cites may be where the agent worked before writing it. */
@@ -2806,6 +2826,10 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
2826 const openPullRequest = useOpenPullRequest();
2827 const navigation = useNavigation();
2828 const openLinkedThread = useOpenLinkedThread();
2829 + // Recycling a row disposes its native audio player, so a started clip's row stays rendered.
2830 + const [retainedMediaRowId, setRetainedMediaRowId] = useState<string | null>(null);
2831 + const focused = useIsFocused();
2832 + if (!focused && retainedMediaRowId !== null) setRetainedMediaRowId(null);
2833 const onOpenTurnDiff = useCallback(
2834 (checkpoint: ThreadCheckpointSummary) => {
2835 setReviewSelectedSectionId(
@@ -3798,7 +3822,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3822 threadId={props.threadId}
3823 workspaceRoot={props.workspaceRoot}
3824 >
3801 - <ThreadMediaVisibility>
3825 + <ThreadMediaVisibility rowId={info.item.id} setRetainedRowId={setRetainedMediaRowId}>
3826 {info.item.type === "message" &&
3827 info.item.message.projectedItem?.item.type === "user_message" &&
3828 info.item.message.projectedItem.item.freshContext ? (
@@ -3937,6 +3961,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3961 }}
3962 getFixedItemSize={getFixedItemSize}
3963 drawDistance={500}
3964 + {...(retainedMediaRowId ? { alwaysRender: { keys: [retainedMediaRowId] } } : {})}
3965 keyboardShouldPersistTaps="always"
3966 keyboardDismissMode="none"
3967 // Android scrolls a tapped selectable message into view when it takes focus, which reads
apps/mobile/src/features/threads/ThreadInlineFilePreview.tsx
+39 -6
@@ -10,7 +10,7 @@ import { AppText as Text } from "../../components/ui/AppText";
10 import { SymbolView } from "../../components/ui/AppSymbol";
11 import { useFullscreenVideoOpen, useMediaAudioSessionHold } from "../../lib/videoAudioSession";
12 import { useRefreshAssetUrl } from "../../state/assets";
13 -import { ThreadMediaVisibleContext } from "./ThreadMarkdownVideo";
13 +import { ThreadMediaRetainContext, ThreadMediaVisibleContext } from "./ThreadMarkdownVideo";
14 import {
15 acquireAudioSession,
16 activateAudioSession,
@@ -59,7 +59,13 @@ function timestamp(seconds: number) {
59 return `${Math.floor(value / 60)}:${String(value % 60).padStart(2, "0")}`;
60 }
61
62 -function InlineAudio(props: PreviewProps & { readonly resolveUri: () => Promise<string | null> }) {
62 +function InlineAudio(
63 + props: PreviewProps & {
64 + readonly resolveUri: () => Promise<string | null>;
65 + readonly onPlaybackActivityChange?: (active: boolean) => void;
66 + },
67 +) {
68 + const { onPlaybackActivityChange } = props;
69 // An empty source keeps native buffering off until the user explicitly plays.
70 const player = usePlaybackAudioPlayer(null);
71 const status = useAudioPlayerStatus(player);
@@ -90,8 +96,16 @@ function InlineAudio(props: PreviewProps & { readonly resolveUri: () => Promise<
96 // oxlint-disable-next-line react/set-state-in-effect -- Native completion and fullscreen takeover invalidate the pending playback request.
97 requestPlayback(false);
98 }
99 + if (status.didJustFinish || status.error) onPlaybackActivityChange?.(false);
100 if (fullscreenVideoOpen) pauseAudioPlayer(player);
94 - }, [fullscreenVideoOpen, status.didJustFinish, status.error, player, requestPlayback]);
101 + }, [
102 + fullscreenVideoOpen,
103 + status.didJustFinish,
104 + status.error,
105 + player,
106 + requestPlayback,
107 + onPlaybackActivityChange,
108 + ]);
109 // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to AppState to pause audio in the background and releases the audio session on cleanup
110 useEffect(() => {
111 active.current = true;
@@ -131,6 +145,7 @@ function InlineAudio(props: PreviewProps & { readonly resolveUri: () => Promise<
145 );
146 if (!isAudioSessionOwner(token)) return;
147 props.onPlaybackStart?.();
148 + onPlaybackActivityChange?.(true);
149 audioToken.current = token;
150 requestPlayback(true);
151 const generation = ++requestGeneration.current;
@@ -149,6 +164,7 @@ function InlineAudio(props: PreviewProps & { readonly resolveUri: () => Promise<
164 if (!isCurrentRequest() || AppState.currentState !== "active") return;
165 if (!uri) {
166 requestPlayback(false);
167 + onPlaybackActivityChange?.(false);
168 setError(true);
169 return;
170 }
@@ -163,6 +179,7 @@ function InlineAudio(props: PreviewProps & { readonly resolveUri: () => Promise<
179 .catch(() => {
180 if (isCurrentRequest()) {
181 requestPlayback(false);
182 + onPlaybackActivityChange?.(false);
183 setError(true);
184 }
185 })
@@ -221,7 +238,9 @@ function InlineAudio(props: PreviewProps & { readonly resolveUri: () => Promise<
238 );
239 }
240
224 -function VisibleFilePreview(props: PreviewProps) {
241 +function VisibleFilePreview(
242 + props: PreviewProps & { readonly onPlaybackActivityChange?: (active: boolean) => void },
243 +) {
244 // Each mounted preview owns its source; feed streaming must not restart a fetch or player.
245 const [source] = useState(props.source);
246 const refresh = useRefreshAssetUrl(
@@ -235,13 +254,27 @@ function VisibleFilePreview(props: PreviewProps) {
254 export function ThreadInlineFilePreview(props: PreviewProps) {
255 const visible = useContext(ThreadMediaVisibleContext);
256 const focused = useIsFocused();
257 + const retainRow = useContext(ThreadMediaRetainContext);
258 + // Unmounting disposes the native player, so a started player stays mounted off-screen
259 + // (and its feed row out of recycling) until it finishes or fails. Leaving the screen
260 + // disposes it, so the latch resets too; the feed drops its row pin on blur itself.
261 + const [playbackActive, setPlaybackActive] = useState(false);
262 + if (!focused && playbackActive) setPlaybackActive(false);
263 + const onPlaybackActivityChange = (active: boolean) => {
264 + setPlaybackActive(active);
265 + retainRow(active);
266 + };
267 return (
268 <View
269 className="my-1 overflow-hidden rounded-xl border border-border bg-card"
270 style={{ width: 280, maxWidth: "100%" }}
271 >
243 - {visible && focused ? (
244 - <VisibleFilePreview key={filePreviewKey(props.source)} {...props} />
272 + {focused && (visible || playbackActive) ? (
273 + <VisibleFilePreview
274 + key={filePreviewKey(props.source)}
275 + {...props}
276 + onPlaybackActivityChange={onPlaybackActivityChange}
277 + />
278 ) : (
279 <>
280 <FileCardHeader {...props} />
apps/mobile/src/features/threads/ThreadMarkdownVideo.tsx
+2
@@ -9,6 +9,8 @@ import {
9 } from "../../lib/videoPreviewSource";
10
11 export const ThreadMediaVisibleContext = createContext(false);
12 +/** Asks the feed to keep this row out of list recycling while its media holds playback state. */
13 +export const ThreadMediaRetainContext = createContext<(retained: boolean) => void>(() => {});
14
15 export function ThreadMarkdownVideo(props: {
16 readonly source: MediaVideoPreviewSource;
apps/mobile/src/lib/filePreview.test.ts
+57
@@ -12,6 +12,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test"
12
13 import { inlineFilePreviewKind, isPdfFile } from "./filePreview";
14 import { ThreadInlineFilePreview } from "../features/threads/ThreadInlineFilePreview";
15 +import {
16 + ThreadMediaRetainContext,
17 + ThreadMediaVisibleContext,
18 +} from "../features/threads/ThreadMarkdownVideo";
19 import { AudioFilePreview } from "../features/files/AudioFilePreview";
20 import { MediaVideoPlayer } from "../components/MediaVideoPlayer";
21 import { EnvironmentId, MessageId, ThreadId } from "@t3tools/contracts";
@@ -1301,6 +1305,59 @@ describe("ThreadInlineFilePreview playback", () => {
1305 expect(audio.player.play).toHaveBeenCalledTimes(isLoaded ? 3 : 2);
1306 },
1307 );
1308 +
1309 + it("keeps a started inline audio player mounted when its row scrolls out of view", async () => {
1310 + (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
1311 + audio.status = { ...audio.status, isLoaded: true };
1312 + const container = document.createElement("div");
1313 + root = createRoot(container);
1314 + const retainRow = vi.fn();
1315 + const render = (visible: boolean) =>
1316 + root!.render(
1317 + createElement(
1318 + ThreadMediaRetainContext,
1319 + { value: retainRow },
1320 + createElement(
1321 + ThreadMediaVisibleContext,
1322 + { value: visible },
1323 + createElement(ThreadInlineFilePreview, {
1324 + source: { kind: "document", name: "sound.mp3", uri: "https://example.com/sound.mp3" },
1325 + onOpen() {},
1326 + }),
1327 + ),
1328 + ),
1329 + );
1330 + await act(async () => render(true));
1331 + const playButton = () =>
1332 + container.querySelector<HTMLButtonElement>('button[aria-label="Play audio"]');
1333 + const pauseButton = () =>
1334 + container.querySelector<HTMLButtonElement>('button[aria-label="Pause audio"]');
1335 + expect(playButton()).not.toBeNull();
1336 + // An idle preview still unmounts off-screen, so off-screen rows stay cheap.
1337 + await act(async () => render(false));
1338 + expect(playButton()).toBeNull();
1339 + await act(async () => render(true));
1340 + await act(async () => playButton()!.click());
1341 + expect(audio.player.play).toHaveBeenCalledOnce();
1342 + expect(pauseButton()).not.toBeNull();
1343 + // The feed list recycles rows beyond its draw distance, so the row itself is pinned too.
1344 + expect(retainRow).toHaveBeenLastCalledWith(true);
1345 + audio.player.release.mockClear();
1346 + audio.player.pause.mockClear();
1347 + // Scrolling the playing chip out of view (or a new reply pushing it out)
1348 + // must not unmount it: unmounting disposes the native player mid-playback.
1349 + await act(async () => render(false));
1350 + expect(pauseButton()).not.toBeNull();
1351 + expect(audio.player.release).not.toHaveBeenCalled();
1352 + expect(audio.player.pause).not.toHaveBeenCalled();
1353 + // Once playback finishes, the off-screen preview can unmount again.
1354 + audio.status = { ...audio.status, didJustFinish: true, currentTime: 10 };
1355 + await act(async () => render(false));
1356 + expect(pauseButton()).toBeNull();
1357 + expect(playButton()).toBeNull();
1358 + expect(audio.player.release).toHaveBeenCalledOnce();
1359 + expect(retainRow).toHaveBeenLastCalledWith(false);
1360 + });
1361 });
1362
1363 describe("PDF preview detection", () => {