Skip to content

Commit bfc7177

Browse files
fix(mobile): pause videos outside visible thread and PR content (pingdotgg#24268)
1 parent 9eac774 commit bfc7177

8 files changed

Lines changed: 417 additions & 33 deletions

File tree

‎apps/mobile/src/components/MediaVideoPlayer.tsx‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
import { useIsFocused } from "@react-navigation/native";
21
import { useEvent } from "expo";
32
import { useVideoPlayer, VideoView } from "expo-video";
43
import { useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
5-
import { AppState, Pressable, View } from "react-native";
4+
import { Pressable, View } from "react-native";
65

76
import { AppActivityIndicator } from "./ui/AppActivityIndicator";
87
import { AppText } from "./ui/AppText";
98
import { SymbolView } from "./ui/AppSymbol";
109
import { VideoThumbnailImage } from "./VideoThumbnailImage";
1110
import { useMediaActions } from "../state/mediaActions";
1211
import { type MediaActionsSource } from "../lib/mediaActionsSource";
13-
import { useFullscreenVideoOpen, useMediaAudioSessionHold } from "../lib/videoAudioSession";
12+
import { useMediaVideoPlayback } from "../lib/useMediaVideoPlayback";
1413
import { MediaActionsMenu } from "./MediaActionsMenu";
1514
import { createAudioPlaybackSession } from "../lib/audioSession";
1615

@@ -19,13 +18,9 @@ function LoadedMediaVideo(props: {
1918
readonly resolvePlaybackUri?: () => Promise<string | null>;
2019
readonly playRequested: boolean;
2120
readonly paused: boolean;
21+
readonly visible: boolean;
2222
readonly onPlaybackStart?: () => void;
2323
}) {
24-
const focused = useIsFocused();
25-
const fullscreenVideoOpen = useFullscreenVideoOpen();
26-
const paused = props.paused || fullscreenVideoOpen;
27-
const active = useRef(focused && AppState.currentState === "active");
28-
const fullscreen = useRef(false);
2924
const [attempt, setAttempt] = useState(0);
3025
// Expo's Android player also reports completed playback as idle.
3126
const [loadState, setLoadState] = useState<"pending" | "complete" | "error">("pending");
@@ -34,6 +29,8 @@ function LoadedMediaVideo(props: {
3429
player.bufferOptions = { preferredForwardBufferDuration: 5 };
3530
});
3631
const playback = useMemo(() => createAudioPlaybackSession(player, true), [player]);
32+
const { active, fullscreen, createPlayRequest, onFullscreenEnter, onFullscreenExit } =
33+
useMediaVideoPlayback(player, props, playback);
3734
const previousPlaybackRequested = useRef(false);
3835
const onPlaybackStart = useEffectEvent(() => props.onPlaybackStart?.());
3936
useEffect(() => {
@@ -64,31 +61,19 @@ function LoadedMediaVideo(props: {
6461
playback.pause();
6562
previousPlaybackRequested.current = false;
6663
};
67-
}, [player, playback]);
64+
}, [active, fullscreen, player, playback]);
6865
const { status } = useEvent(player, "statusChange", { status: player.status });
69-
const { isPlaying } = useEvent(player, "playingChange", { isPlaying: player.playing });
70-
useMediaAudioSessionHold(isPlaying);
7166
const loadSource = useEffectEvent(async (signal: AbortSignal) => {
67+
const playIfUninterrupted = createPlayRequest();
7268
const uri = props.resolvePlaybackUri ? await props.resolvePlaybackUri() : props.uri;
7369
if (signal.aborted) return;
7470
if (uri === null) throw new Error("Video unavailable");
7571
playback.pause();
7672
previousPlaybackRequested.current = false;
7773
await player.replaceAsync({ uri, contentType: "progressive" });
78-
if (!signal.aborted && props.playRequested && active.current) await playback.play();
74+
if (!signal.aborted && props.playRequested) await playIfUninterrupted();
7975
});
8076

81-
useEffect(() => {
82-
active.current = focused && !paused && AppState.currentState === "active";
83-
if (!focused || paused || (!active.current && !fullscreen.current)) playback.pause();
84-
// RN reports both leaving the app and Android fullscreen as background; native handling distinguishes them.
85-
const subscription = AppState.addEventListener("change", (state) => {
86-
active.current = focused && !paused && state === "active";
87-
if (state === "inactive" || (state === "background" && !fullscreen.current)) playback.pause();
88-
});
89-
return () => subscription.remove();
90-
}, [focused, playback, paused]);
91-
9277
useEffect(() => {
9378
const controller = new AbortController();
9479
// oxlint-disable-next-line react/set-state-in-effect -- Starting a native media load publishes pending before its async result.
@@ -115,12 +100,8 @@ function LoadedMediaVideo(props: {
115100
nativeControls
116101
contentFit="contain"
117102
fullscreenOptions={{ enable: true }}
118-
onFullscreenEnter={() => {
119-
fullscreen.current = true;
120-
}}
121-
onFullscreenExit={() => {
122-
fullscreen.current = false;
123-
}}
103+
onFullscreenEnter={onFullscreenEnter}
104+
onFullscreenExit={onFullscreenExit}
124105
allowsPictureInPicture={false}
125106
/>
126107
{loadState === "error" || (loadState === "complete" && status === "error") ? (
@@ -150,6 +131,7 @@ interface MediaVideoPlayerProps {
150131
readonly name: string;
151132
readonly thumbnailKey: string;
152133
readonly thumbnailVisible?: boolean;
134+
readonly visible?: boolean;
153135
readonly unavailable?: boolean;
154136
readonly expanded?: boolean;
155137
readonly autoPlay?: boolean;
@@ -176,6 +158,7 @@ function MediaVideoPlayerContent(props: MediaVideoPlayerProps) {
176158
resolvePlaybackUri={props.resolvePlaybackUri}
177159
playRequested={!props.expanded || props.autoPlay === true}
178160
paused={(props.paused ?? false) || mediaActions.sharing}
161+
visible={props.visible ?? true}
179162
onPlaybackStart={props.onPlaybackStart}
180163
/>
181164
) : (

‎apps/mobile/src/features/pull-requests/PullRequestMedia.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import {
2222
type FilePreviewItem,
2323
} from "../../components/FilePreviewModal";
2424

25+
export const PullRequestMediaVisibleContext = createContext(true);
26+
2527
export const PullRequestMediaContext = createContext<{
2628
readonly environmentId: EnvironmentId;
2729
readonly cwd: string;
@@ -54,6 +56,7 @@ export function PullRequestMedia(props: {
5456
readonly compact?: boolean;
5557
}) {
5658
const media = usePullRequestMediaUrl(props.url);
59+
const visible = useContext(PullRequestMediaVisibleContext);
5760
const context = useContext(PullRequestMediaContext);
5861
const withGallery = useFilePreviewGallery();
5962
const [image, setImage] = useState<FilePreviewSource | null>(null);
@@ -86,7 +89,7 @@ export function PullRequestMedia(props: {
8689
<VideoAttachmentTile
8790
name={name}
8891
sourceIdentifier={props.url}
89-
thumbnailSource={media.uri}
92+
thumbnailSource={visible ? media.uri : null}
9093
style={{ width: 176, height: 112, borderRadius: 16 }}
9194
onPress={() =>
9295
setVideo({
@@ -105,6 +108,8 @@ export function PullRequestMedia(props: {
105108
unavailable={media.unavailable}
106109
name={name}
107110
thumbnailKey={props.url}
111+
thumbnailVisible={visible}
112+
visible={visible}
108113
resolvePlaybackUri={media.resolvePlaybackUri}
109114
/>
110115
)}

‎apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ import {
111111
} from "./PullRequestPresentation";
112112
import { usePullRequestFilesSection } from "./PullRequestFiles";
113113
import { PullRequestDescription } from "./PullRequestDescription";
114+
import { PullRequestMediaVisibleContext } from "./PullRequestMedia";
114115
import { PullRequestMarkdownRepository } from "./PullRequestMarkdown";
115116
import {
116117
PullRequestStatusMenu,
@@ -795,7 +796,9 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
795796
listAnimationsReady && !item.key.endsWith(":body") ? PR_ROW_EXIT : undefined
796797
}
797798
>
798-
{item.content}
799+
<PullRequestMediaVisibleContext value={section === tab}>
800+
{item.content}
801+
</PullRequestMediaVisibleContext>
799802
</Animated.View>
800803
)}
801804
recycleItems={false}

‎apps/mobile/src/features/threads/ThreadMarkdownVideo.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function ThreadMarkdownVideo(props: {
3939
name={source.name}
4040
thumbnailKey={thumbnailKey}
4141
thumbnailVisible={visible}
42-
paused={!visible}
42+
visible={visible}
4343
onPlaybackStart={props.onPlaybackStart}
4444
unavailable={"resource" in source && asset._tag === "Failure"}
4545
actionsSource={source.actionsSource}

0 commit comments

Comments
 (0)