Only switch to spotlight for remote screen shares

element-hq · Jun 7, 2024 · a8dbdce · a8dbdce
1 parent 78a9e85
commit a8dbdce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
@@ -377,9 +377,9 @@ export class CallViewModel extends ViewModel {
       shareReplay(1),
     );
 
-  private readonly hasScreenShares: Observable<boolean> =
+  private readonly hasRemoteScreenShares: Observable<boolean> =
     this.screenShares.pipe(
-      map((ms) => ms.length > 0),
+      map((ms) => ms.find((m) => !m.vm.local) !== undefined),
       distinctUntilChanged(),
     );
 
@@ -477,7 +477,7 @@ export class CallViewModel extends ViewModel {
     this.gridModeUserSelection,
     // If the user hasn't selected spotlight and somebody starts screen sharing,
     // automatically switch to spotlight mode and reset when screen sharing ends
-    this.hasScreenShares.pipe(
+    this.hasRemoteScreenShares.pipe(
       withLatestFrom(this.gridModeUserSelection.pipe(startWith(null))),
       concatMap(([hasScreenShares, userSelection]) =>
         userSelection === "spotlight"