Handle screen-sharing feed ending
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
parent
3406b46db5
commit
af7daee3e7
2 changed files with 13 additions and 1 deletions
|
@ -26,6 +26,7 @@ interface CallFeedState {
|
||||||
videoMuted: boolean;
|
videoMuted: boolean;
|
||||||
audioMuted: boolean;
|
audioMuted: boolean;
|
||||||
localVolume: number;
|
localVolume: number;
|
||||||
|
disposed: boolean;
|
||||||
stream: MediaStream;
|
stream: MediaStream;
|
||||||
purpose: SDPStreamMetadataPurpose;
|
purpose: SDPStreamMetadataPurpose;
|
||||||
}
|
}
|
||||||
|
@ -37,6 +38,7 @@ function getCallFeedState(callFeed: CallFeed): CallFeedState {
|
||||||
videoMuted: callFeed ? callFeed.isVideoMuted() : true,
|
videoMuted: callFeed ? callFeed.isVideoMuted() : true,
|
||||||
audioMuted: callFeed ? callFeed.isAudioMuted() : true,
|
audioMuted: callFeed ? callFeed.isAudioMuted() : true,
|
||||||
localVolume: callFeed ? callFeed.getLocalVolume() : 0,
|
localVolume: callFeed ? callFeed.getLocalVolume() : 0,
|
||||||
|
disposed: callFeed ? callFeed.idDisposed() : undefined,
|
||||||
stream: callFeed ? callFeed.stream : undefined,
|
stream: callFeed ? callFeed.stream : undefined,
|
||||||
purpose: callFeed ? callFeed.purpose : undefined,
|
purpose: callFeed ? callFeed.purpose : undefined,
|
||||||
};
|
};
|
||||||
|
@ -69,6 +71,7 @@ export function useCallFeed(callFeed: CallFeed): CallFeedState {
|
||||||
callFeed.on(CallFeedEvent.MuteStateChanged, onMuteStateChanged);
|
callFeed.on(CallFeedEvent.MuteStateChanged, onMuteStateChanged);
|
||||||
callFeed.on(CallFeedEvent.LocalVolumeChanged, onLocalVolumeChanged);
|
callFeed.on(CallFeedEvent.LocalVolumeChanged, onLocalVolumeChanged);
|
||||||
callFeed.on(CallFeedEvent.NewStream, onUpdateCallFeed);
|
callFeed.on(CallFeedEvent.NewStream, onUpdateCallFeed);
|
||||||
|
callFeed.on(CallFeedEvent.Disposed, onUpdateCallFeed);
|
||||||
}
|
}
|
||||||
|
|
||||||
onUpdateCallFeed();
|
onUpdateCallFeed();
|
||||||
|
|
|
@ -15,10 +15,11 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { useCallback, useState } from "react";
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
import { Participant } from "../room/InCallView";
|
import { Participant } from "../room/InCallView";
|
||||||
import { useEventTarget } from "../useEvents";
|
import { useEventTarget } from "../useEvents";
|
||||||
|
import { useCallFeed } from "./useCallFeed";
|
||||||
|
|
||||||
export function useFullscreen(ref: React.RefObject<HTMLElement>): {
|
export function useFullscreen(ref: React.RefObject<HTMLElement>): {
|
||||||
toggleFullscreen: (participant: Participant) => void;
|
toggleFullscreen: (participant: Participant) => void;
|
||||||
|
@ -26,6 +27,7 @@ export function useFullscreen(ref: React.RefObject<HTMLElement>): {
|
||||||
} {
|
} {
|
||||||
const [fullscreenParticipant, setFullscreenParticipant] =
|
const [fullscreenParticipant, setFullscreenParticipant] =
|
||||||
useState<Participant | null>(null);
|
useState<Participant | null>(null);
|
||||||
|
const { disposed } = useCallFeed(fullscreenParticipant?.callFeed);
|
||||||
|
|
||||||
const toggleFullscreen = useCallback(
|
const toggleFullscreen = useCallback(
|
||||||
(participant: Participant) => {
|
(participant: Participant) => {
|
||||||
|
@ -52,5 +54,12 @@ export function useFullscreen(ref: React.RefObject<HTMLElement>): {
|
||||||
|
|
||||||
useEventTarget(ref.current, "fullscreenchange", onFullscreenChanged);
|
useEventTarget(ref.current, "fullscreenchange", onFullscreenChanged);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (disposed) {
|
||||||
|
document.exitFullscreen();
|
||||||
|
setFullscreenParticipant(null);
|
||||||
|
}
|
||||||
|
}, [disposed]);
|
||||||
|
|
||||||
return { toggleFullscreen, fullscreenParticipant };
|
return { toggleFullscreen, fullscreenParticipant };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue