Make spotlight reactivity more fine-grained

element-hq · Jun 7, 2024 · 3e519e9 · 3e519e9
1 parent a727cf9
commit 3e519e9
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
@@ -453,15 +453,17 @@ export class CallViewModel extends ViewModel {
     }),
   );
 
-  private readonly spotlight: Observable<MediaViewModel[]> = combineLatest(
-    [this.screenShares, this.spotlightSpeaker],
-    (screenShares, spotlightSpeaker): MediaViewModel[] =>
-      screenShares.length > 0
-        ? screenShares.map((m) => m.vm)
-        : spotlightSpeaker === null
-          ? []
-          : [spotlightSpeaker.vm],
-  );
+  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 === null ? [] : [speaker.vm])),
+            ),
+      ),
+      shareReplay(1),
+    );
 
   // TODO: Make this react to changes in window dimensions and screen
   // orientation