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

fix: Fixes showing left participants in the pane under certain conditions.

Browse Source 
Fixes #14491.
When a screensharing participant leaves and is unmuted or sharing the tab audio, there is a dominant speaker changed event which stores wrong values in filmstrip state. And because we skip reordering when there is no filmstrip scroll and no screensharers to avoid reordering on every dominant speaker event for small meetings, we fail to evaluate that the screensharere is actually gone and we still show it.
This will not happen if the one sharing is not dominant speaker (muted) or if there are more participants in the meeting (there is a scroll).
This commit is contained in:
damencho
2024-03-22 12:49:43 -05:00
committed by Дамян Минков
parent c0f9024874
commit ffbaee065d
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,16 +11,17 @@ import { isFilmstripScrollVisible } from './functions';
* Computes the reorderd list of the remote participants.
*
* @param {*} store - The redux store.
* @param {boolean} force - Does not short circuit, the execution, make execute all checks.
* @param {string} participantId - The endpoint id of the participant that joined the call.
* @returns {void}
* @private
*/
export function updateRemoteParticipants(store: IStore, participantId?: string) {
export function updateRemoteParticipants(store: IStore, force?: boolean, participantId?: string) {
const state = store.getState();
let reorderedParticipants = [];
const { sortedRemoteVirtualScreenshareParticipants } = state['features/base/participants'];
if (!isFilmstripScrollVisible(state) && !sortedRemoteVirtualScreenshareParticipants.size) {
if (!isFilmstripScrollVisible(state) && !sortedRemoteVirtualScreenshareParticipants.size && !force) {
if (participantId) {
const { remoteParticipants } = state['features/filmstrip'];

2
react/features/filmstrip/middleware.native.ts
View File

@@ -28,7 +28,7 @@ MiddlewareRegistry.register(store => next => action => {
store.dispatch(setTileViewDimensions());
break;
case PARTICIPANT_JOINED: {
updateRemoteParticipants(store, action.participant?.id);
updateRemoteParticipants(store, false, action.participant?.id);
break;
}
}

2
react/features/filmstrip/middleware.web.ts
View File

@@ -114,7 +114,7 @@ MiddlewareRegistry.register(store => next => action => {
break;
}
updateRemoteParticipants(store, action.participant?.id);
updateRemoteParticipants(store, false, action.participant?.id);
break;
}
case SETTINGS_UPDATED: {

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

@@ -12,10 +12,13 @@ StateListenerRegistry.register(
/**
* Listens for changes to the remote screenshare participants to recompute the reordered list of the remote endpoints.
* We force updateRemoteParticipants to make sure it executes and for the case where
* sortedRemoteVirtualScreenshareParticipants becomes 0. We do not want to short circuit it in case of no screen-sharers
* and no scroll and triggered for dominant speaker changed.
*/
StateListenerRegistry.register(
/* selector */ state => state['features/base/participants'].sortedRemoteVirtualScreenshareParticipants,
/* listener */ (sortedRemoteVirtualScreenshareParticipants, store) => updateRemoteParticipants(store));
/* listener */ (sortedRemoteVirtualScreenshareParticipants, store) => updateRemoteParticipants(store, true));
/**
* Listens for changes to the dominant speaker to recompute the reordered list of the remote endpoints.