From 70b693ef3c99a8e5e5509dfe049fc98587a14834 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 3 Jan 2023 18:34:27 +0000 Subject: [PATCH] Revert d2175b4 Unintentionally comitted to main --- src/@types/global.d.ts | 6 ------ src/video-grid/useFullscreen.tsx | 11 ++--------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index 12e88968..bd3cf39e 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -17,12 +17,6 @@ limitations under the License. import "matrix-js-sdk/src/@types/global"; declare global { - interface Document { - // Safari only supports this prefixed, so tell the type system about it - webkitExitFullscreen: () => void; - webkitFullscreenElement: HTMLElement | null; - } - interface Window { // TODO: https://gitlab.matrix.org/matrix-org/olm/-/issues/10 OLM_OPTIONS: Record; diff --git a/src/video-grid/useFullscreen.tsx b/src/video-grid/useFullscreen.tsx index 88968286..e0c2e608 100644 --- a/src/video-grid/useFullscreen.tsx +++ b/src/video-grid/useFullscreen.tsx @@ -54,23 +54,16 @@ export function useFullscreen(ref: React.RefObject): { ); const onFullscreenChanged = useCallback(() => { - if (!document.fullscreenElement && !document.webkitFullscreenElement) { + if (!document.fullscreenElement) { setFullscreenParticipant(null); } }, [setFullscreenParticipant]); useEventTarget(ref.current, "fullscreenchange", onFullscreenChanged); - useEventTarget(ref.current, "webkitfullscreenchange", onFullscreenChanged); useEffect(() => { if (disposed) { - if (document.exitFullscreen) { - document.exitFullscreen(); - } else if (document.webkitExitFullscreen) { - document.webkitExitFullscreen(); - } else { - logger.error("No available fullscreen API!"); - } + document.exitFullscreen(); setFullscreenParticipant(null); } }, [disposed]);