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

Use if statement instead of ternary for readability in spotlight and pip logic

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2024-12-02 14:35:33 +00:00
parent 33f398ddcf
commit 7fdcbb3292
1 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/state/CallViewModel.ts
View File

@@ -632,49 +632,59 @@ export class CallViewModel extends ViewModel {
private readonly spotlight: Observable<MediaViewModel[]> =
this.screenShares.pipe(
switchMap((screenShares) =>
screenShares.length > 0
? of(screenShares.map((m) => m.vm))
: this.spotlightSpeaker.pipe(
map((speaker) => (speaker ? [speaker] : [])),
),
),
switchMap((screenShares) => {
if (screenShares.length > 0) {
return of(screenShares.map((m) => m.vm));
}
return this.spotlightSpeaker.pipe(
map((speaker) => (speaker ? [speaker] : [])),
);
}),
this.scope.state(),
);
private readonly pip: Observable<UserMediaViewModel | null> =
this.screenShares.pipe(
switchMap((screenShares) =>
screenShares.length > 0
? this.spotlightSpeaker
: this.spotlightSpeaker.pipe(
switchMap((speaker) =>
speaker
? speaker.local
? of(null)
: this.mediaItems.pipe(
switchMap((mediaItems) => {
const localUserMedia = mediaItems.find(
(m) => m.vm instanceof LocalUserMediaViewModel,
) as UserMedia | undefined;
return (
(
localUserMedia?.vm as LocalUserMediaViewModel
).alwaysShow.pipe(
map(
(alwaysShow) =>
(alwaysShow
? localUserMedia?.vm
: undefined) ?? null,
),
) ?? of(null)
);
}),
)
: of(null),
),
),
),
switchMap((screenShares) => {
if (screenShares.length > 0) {
return this.spotlightSpeaker;
}
return this.spotlightSpeaker.pipe(
switchMap((speaker) => {
if (!speaker || speaker.local) {
return of(null);
}
return this.mediaItems.pipe(
switchMap((mediaItems) => {
const localUserMedia = mediaItems.find(
(m) => m.vm instanceof LocalUserMediaViewModel,
) as UserMedia | undefined;
const localUserMediaViewModel = localUserMedia?.vm as
| LocalUserMediaViewModel
| undefined;
if (!localUserMediaViewModel) {
return of(null);
}
return localUserMediaViewModel.alwaysShow.pipe(
map((alwaysShow) => {
if (alwaysShow) {
return localUserMediaViewModel;
}
return null;
}),
);
}),
);
}),
);
}),
this.scope.state(),
);