ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2025-12-30 11:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(filmstrip) Fixes an issue where remote tiles can disappear when SS is started"

Browse Source 
This reverts commit 077602c427.
This commit is contained in:
Jaya Allamsetty
2025-11-03 13:15:15 -05:00
committed by Jaya Allamsetty
parent 2fd653d928
commit 1138b7779b
4 changed files with 16 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
react/features/filmstrip/functions.any.ts
View File

@@ -73,32 +73,33 @@ export function updateRemoteParticipants(store: IStore, force?: boolean, partici
for (const screenshare of screenShareParticipants) {
const ownerId = getVirtualScreenshareParticipantOwnerId(screenshare);
remoteParticipants.delete(ownerId);
remoteParticipants.delete(screenshare);
speakers.delete(ownerId);
}
// Calculate the number of slots available for active speakers and then sort them alphabetically to ensure
// consistent order.
const numberOfActiveSpeakerSlots
= visibleRemoteParticipants.size - screenShareParticipants.length - sharedVideos.length;
const activeSpeakersDisplayed = _takeFirstN(speakers, numberOfActiveSpeakerSlots)
.sort((a: string, b: string) => {
return (getParticipantById(state, a)?.name ?? defaultRemoteDisplayName)
.localeCompare(getParticipantById(state, b)?.name ?? defaultRemoteDisplayName);
});
for (const sharedVideo of sharedVideos) {
remoteParticipants.delete(sharedVideo);
}
for (const speaker of speakers.keys()) {
remoteParticipants.delete(speaker);
}
// Calculate the number of slots available for active speakers and then sort them alphabetically to ensure
// consistent order.
const numberOfActiveSpeakerSlots
= visibleRemoteParticipants.size - (screenShareParticipants.length * 2) - sharedVideos.length;
const activeSpeakersDisplayed = _takeFirstN(speakers, numberOfActiveSpeakerSlots)
.sort((a: string, b: string) => {
return (getParticipantById(state, a)?.name ?? defaultRemoteDisplayName)
.localeCompare(getParticipantById(state, b)?.name ?? defaultRemoteDisplayName);
});
const participantsWithScreenShare = screenShareParticipants.reduce<string[]>((acc, screenshare) => {
const ownerId = getVirtualScreenshareParticipantOwnerId(screenshare);
acc.push(ownerId);
acc.push(screenshare);
remoteParticipants.delete(ownerId);
remoteParticipants.delete(screenshare);
return acc;
}, []);

11
react/features/filmstrip/subscriber.any.ts
View File

@@ -1,4 +1,3 @@
import { getParticipantById } from '../base/participants/functions';
import StateListenerRegistry from '../base/redux/StateListenerRegistry';
import { isFilmstripScrollVisible, updateRemoteParticipants } from './functions';
@@ -26,15 +25,7 @@ StateListenerRegistry.register(
*/
StateListenerRegistry.register(
/* selector */ state => state['features/base/participants'].dominantSpeaker,
/* listener */ (dominantSpeaker, store) => {
const { visibleRemoteParticipants } = store.getState()['features/filmstrip'];
const dominant = getParticipantById(store.getState(), dominantSpeaker);
// Only update the remote participants if the dominant speaker is not currently visible.
if (!dominant?.local && !visibleRemoteParticipants.has(dominantSpeaker)) {
updateRemoteParticipants(store);
}
});
/* listener */ (dominantSpeaker, store) => updateRemoteParticipants(store));
/**
* Listens for changes in the filmstrip scroll visibility.