Start refactoring some business logic into view models
As Element Call grows in complexity, it has become a pain point that our business logic remains so tightly coupled to the UI code. In particular, this has made testing difficult, and the complex semantics of React hooks are not a great match for arbitrary business logic. Here, I show the beginnings of what it would look like for us to adopt the MVVM pattern. I've created a CallViewModel and TileViewModel that expose their state to the UI as rxjs Observables, as well as a couple of helper functions for consuming view models in React code. This should contain no user-visible changes, but we need to watch out for regressions particularly around focus switching and promotion of speakers, because this was the logic I chose to refactor first.
This commit is contained in:
@@ -22,19 +22,18 @@ import { FieldRow } from "../input/Input";
|
||||
import { Modal } from "../Modal";
|
||||
import styles from "./VideoTileSettingsModal.module.css";
|
||||
import { VolumeIcon } from "../button/VolumeIcon";
|
||||
import { ItemData, TileContent } from "./VideoTile";
|
||||
|
||||
interface LocalVolumeProps {
|
||||
participant: RemoteParticipant;
|
||||
content: TileContent;
|
||||
media: "user media" | "screen share";
|
||||
}
|
||||
|
||||
const LocalVolume: FC<LocalVolumeProps> = ({
|
||||
participant,
|
||||
content,
|
||||
media,
|
||||
}: LocalVolumeProps) => {
|
||||
const source =
|
||||
content === TileContent.UserMedia
|
||||
media === "user media"
|
||||
? Track.Source.Microphone
|
||||
: Track.Source.ScreenShareAudio;
|
||||
|
||||
@@ -67,13 +66,15 @@ const LocalVolume: FC<LocalVolumeProps> = ({
|
||||
};
|
||||
|
||||
interface Props {
|
||||
data: ItemData;
|
||||
participant: RemoteParticipant;
|
||||
media: "user media" | "screen share";
|
||||
open: boolean;
|
||||
onDismiss: () => void;
|
||||
}
|
||||
|
||||
export const VideoTileSettingsModal: FC<Props> = ({
|
||||
data,
|
||||
participant,
|
||||
media,
|
||||
open,
|
||||
onDismiss,
|
||||
}) => {
|
||||
@@ -87,10 +88,7 @@ export const VideoTileSettingsModal: FC<Props> = ({
|
||||
onDismiss={onDismiss}
|
||||
>
|
||||
<div className={styles.content}>
|
||||
<LocalVolume
|
||||
participant={data.sfuParticipant as RemoteParticipant}
|
||||
content={data.content}
|
||||
/>
|
||||
<LocalVolume participant={participant} media={media} />
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user