Merge branch 'main' into hide-invite
This commit is contained in:
commit
684defdc19
3 changed files with 26 additions and 18 deletions
|
|
@ -59,6 +59,7 @@ import { AudioContainer } from "../video-grid/AudioContainer";
|
|||
import { useAudioOutputDevice } from "../video-grid/useAudioOutputDevice";
|
||||
import { widget, ElementWidgetActions } from "../widget";
|
||||
import { useJoinRule } from "./useJoinRule";
|
||||
import { useUrlParams } from "../UrlParams";
|
||||
|
||||
const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
|
||||
// There is currently a bug in Safari our our code with cloning and sending MediaStreams
|
||||
|
|
@ -145,6 +146,8 @@ export function InCallView({
|
|||
|
||||
useAudioOutputDevice(audioRef, audioOutput);
|
||||
|
||||
const { hideScreensharing } = useUrlParams();
|
||||
|
||||
useEffect(() => {
|
||||
widget?.api.transport.send(
|
||||
layout === "freedom"
|
||||
|
|
@ -333,12 +336,15 @@ export function InCallView({
|
|||
<div className={styles.footer}>
|
||||
<MicButton muted={microphoneMuted} onPress={toggleMicrophoneMuted} />
|
||||
<VideoButton muted={localVideoMuted} onPress={toggleLocalVideoMuted} />
|
||||
{canScreenshare && !isSafari && !reducedControls && (
|
||||
<ScreenshareButton
|
||||
enabled={isScreensharing}
|
||||
onPress={toggleScreensharing}
|
||||
/>
|
||||
)}
|
||||
{canScreenshare &&
|
||||
!hideScreensharing &&
|
||||
!isSafari &&
|
||||
!reducedControls && (
|
||||
<ScreenshareButton
|
||||
enabled={isScreensharing}
|
||||
onPress={toggleScreensharing}
|
||||
/>
|
||||
)}
|
||||
{!reducedControls && (
|
||||
<OverflowMenu
|
||||
inCall
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue