Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-03-10 05:57:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and streamline safety checking instead of using multiple separate checks

Browse Source 
Signed-off-by: Jake Janicke <jaketripplj@gmail.com>
This commit is contained in:
Jake Janicke
2026-03-04 17:09:07 -06:00
parent 65045c264b
commit e99e8628d6
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/tile/SpotlightTile.tsx
View File

@@ -266,34 +266,33 @@ export const SpotlightTile: FC<Props> = ({
const canGoBack = visibleIndex > 0;
const canGoToNext = visibleIndex !== -1 && visibleIndex < media.length - 1;
const currentMedia = media[visibleIndex];
// isScreenShare only needs to check "audioEnabled$" but I wanted to be more specific
// just in case more models are added in the future, since screen shares always have video
const isScreenShare =
currentMedia != null &&
// only "audioEnabled$" needs to checked but I wanted to be more specific just in
// case more models are added in the future, since screen shares always have video
const currentScreenShare =
currentMedia &&
"audioEnabled$" in currentMedia &&
"videoEnabled$" in currentMedia;
"videoEnabled$" in currentMedia
? (currentMedia as RemoteScreenShareViewModel)
: null;
const isScreenShare = currentScreenShare != null;
const hasAudio$ = useBehavior(
isScreenShare && (currentMedia as RemoteScreenShareViewModel).audioEnabled$
? currentMedia.audioEnabled$
: constant(false),
currentScreenShare?.audioEnabled$ ?? constant(false),
);
const isLocalScreenShare =
isScreenShare && (currentMedia as RemoteScreenShareViewModel)?.local;
const isLocalScreenShare = currentScreenShare?.local ?? false;
const screenShareLocallyMuted = useBehavior(
isScreenShare &&
(currentMedia as RemoteScreenShareViewModel).playbackMuted$ != null
? (currentMedia as RemoteScreenShareViewModel).playbackMuted$
: constant(false),
currentScreenShare?.playbackMuted$ ?? constant(false),
);
const ScreenShareVolumeIcon = screenShareLocallyMuted
? VolumeOffIcon
: VolumeOnIcon;
const screenShareVolume = useBehavior(
isScreenShare &&
(currentMedia as RemoteScreenShareViewModel).playbackVolume$ != null
? (currentMedia as RemoteScreenShareViewModel).playbackVolume$
: constant(0),
currentScreenShare?.playbackVolume$ ?? constant(0),
);
const isFullscreen = useCallback((): boolean => {