fix(app): leave fullscreen when the video player unmounts (#1937)

This commit is contained in:
Hampus authored and GitHub committed 2026-08-24 12:49:08 +02:00
1 parent 9991534c83
commit 0fe3f7523d
1 file changed
+13 -1
@@ -9,7 +9,7 @@ import {
import {Logger} from '@app/features/platform/utils/AppLogger'; import {Logger} from '@app/features/platform/utils/AppLogger';
import {getFullscreenElement} from '@app/features/platform/utils/FullscreenMediaUtils'; import {getFullscreenElement} from '@app/features/platform/utils/FullscreenMediaUtils';
import type {ExtendedHTMLElement, ExtendedHTMLVideoElement} from '@app/types/browser.d'; import type {ExtendedHTMLElement, ExtendedHTMLVideoElement} from '@app/types/browser.d';
import {useCallback, useEffect, useState} from 'react'; import {useCallback, useEffect, useRef, useState} from 'react';
const logger = new Logger('useMediaFullscreen'); const logger = new Logger('useMediaFullscreen');
@@ -76,6 +76,7 @@ export function useMediaFullscreen(options: UseMediaFullscreenOptions): UseMedia
const [isFullscreen, setIsFullscreen] = useState(false); const [isFullscreen, setIsFullscreen] = useState(false);
const [supportsFullscreen, setSupportsFullscreen] = useState(() => supportsContainerFullscreenAPI()); const [supportsFullscreen, setSupportsFullscreen] = useState(() => supportsContainerFullscreenAPI());
const [useIOSFullscreen, setUseIOSFullscreen] = useState(false); const [useIOSFullscreen, setUseIOSFullscreen] = useState(false);
const claimedFullscreenHostRef = useRef<Element | null>(null);
useEffect(() => { useEffect(() => {
const hasContainerSupport = supportsContainerFullscreenAPI(); const hasContainerSupport = supportsContainerFullscreenAPI();
const hasIOSSupport = supportsIOSVideoFullscreen(videoRef?.current ?? null); const hasIOSSupport = supportsIOSVideoFullscreen(videoRef?.current ?? null);
@@ -86,6 +87,7 @@ export function useMediaFullscreen(options: UseMediaFullscreenOptions): UseMedia
const handleFullscreenChange = () => { const handleFullscreenChange = () => {
const fullscreenElement = getFullscreenElement(); const fullscreenElement = getFullscreenElement();
const isNowFullscreen = fullscreenElement === containerRef.current; const isNowFullscreen = fullscreenElement === containerRef.current;
claimedFullscreenHostRef.current = isNowFullscreen ? fullscreenElement : null;
setIsFullscreen(isNowFullscreen); setIsFullscreen(isNowFullscreen);
onFullscreenChange?.(isNowFullscreen); onFullscreenChange?.(isNowFullscreen);
}; };
@@ -117,6 +119,16 @@ export function useMediaFullscreen(options: UseMediaFullscreenOptions): UseMedia
} }
}; };
}, [containerRef, videoRef, onFullscreenChange]); }, [containerRef, videoRef, onFullscreenChange]);
useEffect(() => {
return () => {
const claimedHost = claimedFullscreenHostRef.current;
claimedFullscreenHostRef.current = null;
if (claimedHost === null || getFullscreenElement() !== claimedHost) return;
exitFullscreenAPI().catch((error: unknown) => {
logger.error('Failed to release fullscreen on teardown:', error);
});
};
}, []);
const enterFullscreen = useCallback(async () => { const enterFullscreen = useCallback(async () => {
if (useIOSFullscreen && videoRef?.current) { if (useIOSFullscreen && videoRef?.current) {
try { try {