Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(voice): release call modals when fullscreen ends (#3149)

Hampuscf9752db4f4e
diff --git a/fluxer_app/src/features/ui/state/Modal.ts b/fluxer_app/src/features/ui/state/Modal.ts
index a449c3984..2c6980b5c 100644
--- a/fluxer_app/src/features/ui/state/Modal.ts
+++ b/fluxer_app/src/features/ui/state/Modal.ts
@@ -134,6 +134,13 @@ class ModalState {
};
}
+ releasePortalHost(host: HTMLElement): void {
+ if (!this.modals.some((modal) => modal.portalHost === host)) return;
+ this.modals = this.modals.map((modal) =>
+ modal.portalHost === host ? {...modal, portalHost: null, ownerDocument: this.resolveOwnerDocument(null)} : modal,
+ );
+ }
+
pop(key?: string | number, ownerDocument?: Document): void {
let removed: ModalEntry | undefined;
let wasTopmost = false;
diff --git a/fluxer_app/src/features/voice/components/VoiceCallView.tsx b/fluxer_app/src/features/voice/components/VoiceCallView.tsx
index 640ad383e..413df7a0d 100644
--- a/fluxer_app/src/features/voice/components/VoiceCallView.tsx
+++ b/fluxer_app/src/features/voice/components/VoiceCallView.tsx
@@ -20,7 +20,7 @@ import {BottomSheet} from '@app/features/ui/bottom_sheet/BottomSheet';
import * as ToastCommands from '@app/features/ui/commands/ToastCommands';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
import {usePopout} from '@app/features/ui/hooks/usePopout';
-import {PortalHostContext, setActivePortalHost} from '@app/features/ui/overlay/PortalHostContext';
+import {PortalHostContext} from '@app/features/ui/overlay/PortalHostContext';
import {Popout as PopoverPopout} from '@app/features/ui/popover/PopoverPopout';
import ContextMenu, {isContextMenuNodeTarget} from '@app/features/ui/state/ContextMenu';
import KeyboardMode from '@app/features/ui/state/KeyboardMode';
@@ -40,7 +40,10 @@ import {StreamFocusHeaderInfo} from '@app/features/voice/components/StreamFocusH
import {getStreamKey} from '@app/features/voice/components/StreamKeys';
import {useStreamSpectators} from '@app/features/voice/components/useStreamSpectators';
import {useStreamTrackInfo} from '@app/features/voice/components/useStreamTrackInfo';
-import {useVoiceCallAppFullscreen} from '@app/features/voice/components/useVoiceCallAppFullscreen';
+import {
+ useVoiceCallAppFullscreen,
+ useVoiceCallFullscreenPortalHost,
+} from '@app/features/voice/components/useVoiceCallAppFullscreen';
import {useVoiceCallTracksAndLayout} from '@app/features/voice/components/useVoiceCallTracksAndLayout';
import {useVoiceEngineConnectionState} from '@app/features/voice/components/useVoiceEngineConnectionState';
import {VoiceCallCornerControls} from '@app/features/voice/components/VoiceCallCornerControls';
@@ -422,14 +425,7 @@ const VoiceCallViewInner = observer(
}, [enterVoiceCallAppFullscreen, fullscreenRequestNonce]);
const inheritedPortalHost = useContext(PortalHostContext);
const effectivePortalHost = isVoiceCallAppFullscreen || inPopout ? portalHost : null;
- useEffect(() => {
- if (!isVoiceCallAppFullscreen) return;
- if (!effectivePortalHost) return;
- setActivePortalHost(effectivePortalHost);
- return () => {
- setActivePortalHost(null);
- };
- }, [isVoiceCallAppFullscreen, effectivePortalHost]);
+ useVoiceCallFullscreenPortalHost(isVoiceCallAppFullscreen, effectivePortalHost);
const FavoriteIcon = useMemo(() => {
const Icon = forwardRef<SVGSVGElement, React.ComponentProps<typeof StarIcon>>((props, ref) => (
<StarIcon
diff --git a/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts b/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts
index 62e977ab2..8f29fdd2f 100644
--- a/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts
+++ b/fluxer_app/src/features/voice/components/useVoiceCallAppFullscreen.ts
@@ -7,6 +7,8 @@ import {
supportsWebkitRequestFullscreen,
} from '@app/features/platform/types/Browser';
import {Logger} from '@app/features/platform/utils/AppLogger';
+import {setActivePortalHost} from '@app/features/ui/overlay/PortalHostContext';
+import Modal from '@app/features/ui/state/Modal';
import {VOICE_CALL_FULLSCREEN_ENABLED} from '@app/features/voice/components/VoiceCallFullscreenFeatureFlag';
import VoiceCallFullscreen from '@app/features/voice/state/VoiceCallFullscreen';
import type {ExtendedHTMLElement} from '@app/types/browser.d';
@@ -192,6 +194,18 @@ export function useVoiceCallAppFullscreen(options: UseVoiceCallAppFullscreenOpti
};
}
+export function useVoiceCallFullscreenPortalHost(active: boolean, host: HTMLElement | null): void {
+ useEffect(() => {
+ if (!active) return;
+ if (!host) return;
+ setActivePortalHost(host);
+ return () => {
+ setActivePortalHost(null);
+ Modal.releasePortalHost(host);
+ };
+ }, [active, host]);
+}
+
interface UseVoiceCallFullscreenViewStateOptions {
active: boolean;
scopeKey: string;