rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multiple issues with device settings

Browse Source 
To track media devices, we were previously relying on a combination of LiveKit's useMediaDeviceSelect hook, and an object called UserChoices. Device settings should be accessible from outside a call, but the latter hook should only be used with a room or set of preview tracks, so it couldn't be raised to the app's top level. I also felt that the UserChoices code was hard to follow due to lack of clear ownership of the object.

To bring clarity to media device handling and allow device settings to be shown outside a call, I refactored these things into a single MediaDevicesContext which is instantiated at the top level of the app. Then, I had to manually sync LiveKit's device state with whatever is present in the context. This refactoring ended up fixing a couple other bugs with device handling along the way.
This commit is contained in:
Robin Townsend
2023-08-02 15:29:37 -04:00
parent 04919794fd
commit 99ce5064f5
11 changed files with 550 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/room/LobbyView.tsx
View File

@@ -14,7 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { useRef, useEffect, useState, useCallback, ChangeEvent } from "react";
import {
useRef,
useEffect,
useState,
useCallback,
ChangeEvent,
FC,
} from "react";
import { Trans, useTranslation } from "react-i18next";
import styles from "./LobbyView.module.css";
@@ -25,20 +32,26 @@ import { UserMenuContainer } from "../UserMenuContainer";
import { Body, Link } from "../typography/Typography";
import { useLocationNavigation } from "../useLocationNavigation";
import { MatrixInfo, VideoPreview } from "./VideoPreview";
import { E2EEConfig, UserChoices } from "../livekit/useLiveKit";
import { E2EEConfig } from "../livekit/useLiveKit";
import { InputField } from "../input/Input";
import { useEnableE2EE } from "../settings/useSetting";
import { MuteStates } from "./MuteStates";
interface Props {
matrixInfo: MatrixInfo;
onEnter: (userChoices: UserChoices, e2eeConfig?: E2EEConfig) => void;
muteStates: MuteStates;
onEnter: (e2eeConfig?: E2EEConfig) => void;
isEmbedded: boolean;
hideHeader: boolean;
initWithMutedAudio: boolean;
}
export function LobbyView(props: Props) {
export const LobbyView: FC<Props> = ({
matrixInfo,
muteStates,
onEnter,
isEmbedded,
hideHeader,
}) => {
const { t } = useTranslation();
useLocationNavigation();
@@ -51,9 +64,6 @@ export function LobbyView(props: Props) {
}
}, [joinCallButtonRef]);
const [userChoices, setUserChoices] = useState<UserChoices | undefined>(
undefined
);
const [e2eeSharedKey, setE2EESharedKey] = useState<string | undefined>(
undefined
);
@@ -68,10 +78,10 @@ export function LobbyView(props: Props) {
return (
<div className={styles.room}>
{!props.hideHeader && (
{!hideHeader && (
<Header>
<LeftNav>
<RoomHeaderInfo roomName={props.matrixInfo.roomName} />
<RoomHeaderInfo roomName={matrixInfo.roomName} />
</LeftNav>
<RightNav>
<UserMenuContainer />
@@ -80,11 +90,7 @@ export function LobbyView(props: Props) {
)}
<div className={styles.joinRoom}>
<div className={styles.joinRoomContent}>
<VideoPreview
matrixInfo={props.matrixInfo}
initWithMutedAudio={props.initWithMutedAudio}
onUserChoicesChanged={setUserChoices}
/>
<VideoPreview matrixInfo={matrixInfo} muteStates={muteStates} />
{enableE2EE && (
<InputField
className={styles.passwordField}
@@ -100,8 +106,7 @@ export function LobbyView(props: Props) {
className={styles.copyButton}
size="lg"
onPress={() =>
props.onEnter(
userChoices!,
onEnter(
e2eeSharedKey ? { sharedKey: e2eeSharedKey } : undefined
)
}
@@ -112,9 +117,7 @@ export function LobbyView(props: Props) {
<Body>Or</Body>
<CopyButton
variant="secondaryCopy"
value={getRoomUrl(
props.matrixInfo.roomAlias ?? props.matrixInfo.roomId
)}
value={getRoomUrl(matrixInfo.roomAlias ?? matrixInfo.roomId)}
className={styles.copyButton}
copiedMessage={t("Call link copied")}
data-testid="lobby_inviteLink"
@@ -123,7 +126,7 @@ export function LobbyView(props: Props) {
</CopyButton>
</Trans>
</div>
{!props.isEmbedded && (
{!isEmbedded && (
<Body className={styles.joinRoomFooter}>
<Link color="primary" to="/">
{t("Take me Home")}
@@ -133,4 +136,4 @@ export function LobbyView(props: Props) {
</div>
</div>
);
}
};