haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(participant-pane) Do not show virtual SS as a separate participant.

This commit is contained in:
Jaya Allamsetty 2022-05-02 16:39:43 -04:00
parent b872ea855e
commit 346aadc23d
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
react/features/e2ee/middleware.js
View File

@ -94,10 +94,14 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
}
case PARTICIPANT_JOINED: {
const result = next(action);
const { e2eeEnabled, e2eeSupported, local } = action.participant;
const { e2eeEnabled, e2eeSupported, isVirtualScreenshareParticipant, local } = action.participant;
const { everyoneEnabledE2EE } = getState()['features/e2ee'];
const participantCount = getParticipantCount(getState);
if (isVirtualScreenshareParticipant) {
return result;
}
// the initial values
if (participantCount === 1) {
batch(() => {
@ -134,7 +138,11 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
const participant = getParticipantById(previosState, action.participant?.id) || {};
const result = next(action);
const newState = getState();
const { e2eeEnabled = false, e2eeSupported = false } = participant;
const { e2eeEnabled = false, e2eeSupported = false, isVirtualScreenshareParticipant } = participant;
if (isVirtualScreenshareParticipant) {
return result;
}
const { everyoneEnabledE2EE, everyoneSupportE2EE } = newState['features/e2ee'];

11
react/features/participants-pane/components/web/MeetingParticipants.js
View File

@ -11,6 +11,7 @@ import participantsPaneTheme from '../../../base/components/themes/participantsP
import { isToolbarButtonEnabled } from '../../../base/config/functions.web';
import { MEDIA_TYPE } from '../../../base/media';
import {
getParticipantById,
getParticipantCountWithFake
} from '../../../base/participants';
import { connect } from '../../../base/redux';
@ -150,7 +151,15 @@ function MeetingParticipants({
* @returns {Props}
*/
function _mapStateToProps(state): Object {
const sortedParticipantIds = getSortedParticipantIds(state);
let sortedParticipantIds = getSortedParticipantIds(state);
// Filter out the virtual screenshare participants since we do not want them to be displayed as separate
// participants in the participants pane.
sortedParticipantIds = sortedParticipantIds.filter(id => {
const participant = getParticipantById(state, id);
return !participant.isVirtualScreenshareParticipant;
});
// This is very important as getRemoteParticipants is not changing its reference object
// and we will not re-render on change, but if count changes we will do