Skip to content

Commit 7b18a9b

Browse files
committed
fix(media): preserve playback during fullscreen transitions
1 parent 502131a commit 7b18a9b

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ function LoadedMediaVideo(props: {
3838

3939
useEffect(() => {
4040
active.current = focused && !props.paused && AppState.currentState === "active";
41-
if (!active.current) player.pause();
41+
if (!focused || props.paused) player.pause();
42+
// Native background handling distinguishes Android's fullscreen activity
43+
// from leaving the app; React Native reports both as background.
4244
const subscription = AppState.addEventListener("change", (state) => {
4345
active.current = focused && !props.paused && state === "active";
44-
if (!active.current) player.pause();
4546
});
4647
return () => subscription.remove();
4748
}, [focused, player, props.paused]);

‎apps/web/src/components/media/MediaVideoPlayer.tsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,19 @@ export function MediaVideoPlayer({
9393
const video = videoRef.current;
9494
if (!video) return;
9595
const pauseWhenHidden = () => {
96-
if (document.hidden) video.pause();
96+
// Native fullscreen can hide the inline page while this video is still visible.
97+
const fullscreen =
98+
document.fullscreenElement?.contains(video) ||
99+
("webkitDisplayingFullscreen" in video && video.webkitDisplayingFullscreen === true);
100+
if (document.hidden && !fullscreen) video.pause();
97101
};
98102
document.addEventListener("visibilitychange", pauseWhenHidden);
103+
document.addEventListener("fullscreenchange", pauseWhenHidden);
104+
video.addEventListener("webkitendfullscreen", pauseWhenHidden);
99105
return () => {
100106
document.removeEventListener("visibilitychange", pauseWhenHidden);
107+
document.removeEventListener("fullscreenchange", pauseWhenHidden);
108+
video.removeEventListener("webkitendfullscreen", pauseWhenHidden);
101109
video.pause();
102110
};
103111
}, [src, failed, loadAttempt]);

0 commit comments

Comments
 (0)