Clean up VideoCallContent

src/app/voice.ts

@@ -102,9 +102,6 @@ const resetVideoCallLayout = () => {
 
 export const participantPubkeyMap = writable<Map<string, Pubkey>>(new Map())
 
-/** Bumps when remote video is subscribed/unsubscribed so layout/video UI can react. */
-export const videoCallLayoutRevision = writable(0)
-
 /** Spotlight tile id — must match VideoCallContent `tileKey` (identity + source, not trackSid). */
 export const videoPrimaryTileKey = writable<string | undefined>(undefined)
 
@@ -112,7 +109,9 @@ export const toggleVideoPrimaryTile = (key: string) => {
   videoPrimaryTileKey.update(k => (k === key ? undefined : key))
 }
 
-const bumpVideoCallLayoutRevision = () => videoCallLayoutRevision.update(n => n + 1)
+const triggerVideoTileCount = () => {
+  currentVoiceSession.update(s => (s ? {...s} : s))
+}
 
 const addParticipant = (identity: string) => {
   participantPubkeyMap.update(m => {
@@ -239,7 +238,6 @@ const setUpMicrophone = async (
 }
 
 const onRoomDisconnected = (reason?: DisconnectReason) => {
-  videoCallLayoutRevision.set(0)
   videoPrimaryTileKey.set(undefined)
   currentVoiceSession.set(undefined)
   resetVideoCallLayout()
@@ -262,14 +260,14 @@ const onTrackSubscribed = (track: Track) => {
     document.body.appendChild(element)
     element.play().catch(() => {})
   } else if (track.kind === Track.Kind.Video) {
-    bumpVideoCallLayoutRevision()
+    triggerVideoTileCount()
   }
 }
 
 const onTrackUnsubscribed = (track: Track) => {
   track.detach().forEach(el => el.remove())
   if (track.kind === Track.Kind.Video) {
-    bumpVideoCallLayoutRevision()
+    triggerVideoTileCount()
   }
 }
 
@@ -300,7 +298,6 @@ const onLocalTrackUnpublished = (
   if (!session || participant.identity !== session.room.localParticipant.identity) return
   if (!session.screenShareOn) return
   currentVoiceSession.set({...session, screenShareOn: false})
-  bumpVideoCallLayoutRevision()
 }
 
 let joinAbortController: AbortController | undefined
@@ -407,7 +404,6 @@ export const leaveVoiceRoom = async () => {
   }
 
   voiceState.set(VoiceState.Disconnected)
-  videoCallLayoutRevision.set(0)
   videoPrimaryTileKey.set(undefined)
   currentVoiceSession.set(undefined)
   resetVideoCallLayout()
@@ -465,13 +461,10 @@ const countLiveVisualFeeds = (session: VoiceSession): number => {
   return n
 }
 
-export const videoTileCount = derived(
-  [currentVoiceSession, voiceState, videoCallLayoutRevision],
-  ([$session, $state, _rev]) => {
-    if ($state !== VoiceState.Connected || !$session) return 0
-    return countLiveVisualFeeds($session)
-  },
-)
+export const videoTileCount = derived([currentVoiceSession, voiceState], ([$session, $state]) => {
+  if ($state !== VoiceState.Connected || !$session) return 0
+  return countLiveVisualFeeds($session)
+})
 
 export const toggleCamera = async () => {
   const session = get(currentVoiceSession)
@@ -481,14 +474,12 @@ export const toggleCamera = async () => {
   if (!cameraOn) {
     session.room.localParticipant.setCameraEnabled(false)
     currentVoiceSession.set({...session, cameraOn})
-    bumpVideoCallLayoutRevision()
     return
   }
 
   try {
     await session.room.localParticipant.setCameraEnabled(true)
     currentVoiceSession.set({...session, cameraOn})
-    bumpVideoCallLayoutRevision()
   } catch (e) {
     pushToast({theme: "error", message: "Could not access camera"})
   }
@@ -502,14 +493,12 @@ export const toggleScreenShare = async () => {
   if (!screenShareOn) {
     session.room.localParticipant.setScreenShareEnabled(false)
     currentVoiceSession.set({...session, screenShareOn})
-    bumpVideoCallLayoutRevision()
     return
   }
 
   try {
     await session.room.localParticipant.setScreenShareEnabled(true)
     currentVoiceSession.set({...session, screenShareOn})
-    bumpVideoCallLayoutRevision()
   } catch (e) {
     pushToast({theme: "error", message: "Could not start screen sharing"})
   }