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

fix(breakout-rooms) disable lobby in breakout rooms 

The main room lobby gets diverted to the rooms, things can get confusing. We
might need to revisit this in the future.
This commit is contained in:
Saúl Ibarra Corretgé 2021-11-30 14:41:23 +01:00 committed by Дамян Минков
parent 43647f1302
commit 58ef2974c9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
react/features/lobby/components/web/LobbySection.js
View File

@ -6,6 +6,7 @@ import { translate } from '../../../base/i18n';
import { isLocalParticipantModerator } from '../../../base/participants'; import { isLocalParticipantModerator } from '../../../base/participants';
import { Switch } from '../../../base/react'; import { Switch } from '../../../base/react';
import { connect } from '../../../base/redux'; import { connect } from '../../../base/redux';
import { isInBreakoutRoom } from '../../../breakout-rooms/functions';
import { toggleLobbyMode } from '../../actions'; import { toggleLobbyMode } from '../../actions';
type Props = { type Props = {
@ -139,8 +140,10 @@ function mapStateToProps(state: Object): $Shape<Props> {
return { return {
_lobbyEnabled: state['features/lobby'].lobbyEnabled, _lobbyEnabled: state['features/lobby'].lobbyEnabled,
_visible: conference && conference.isLobbySupported() && isLocalParticipantModerator(state)
&& !hideLobbyButton // $FlowExpectedError
_visible: conference?.isLobbySupported() && isLocalParticipantModerator(state)
&& !hideLobbyButton && !isInBreakoutRoom(state)
}; };
} }

3
react/features/security/components/security-dialog/native/SecurityDialog.js
View File

@ -20,6 +20,7 @@ import { getFeatureFlag, MEETING_PASSWORD_ENABLED } from '../../../../base/flags
import { translate } from '../../../../base/i18n'; import { translate } from '../../../../base/i18n';
import { isLocalParticipantModerator } from '../../../../base/participants'; import { isLocalParticipantModerator } from '../../../../base/participants';
import { StyleType } from '../../../../base/styles'; import { StyleType } from '../../../../base/styles';
import { isInBreakoutRoom } from '../../../../breakout-rooms/functions';
import { toggleLobbyMode } from '../../../../lobby/actions.any'; import { toggleLobbyMode } from '../../../../lobby/actions.any';
import LobbyModeSwitch import LobbyModeSwitch
from '../../../../lobby/components/native/LobbyModeSwitch'; from '../../../../lobby/components/native/LobbyModeSwitch';
@ -430,7 +431,7 @@ function _mapStateToProps(state: Object): Object {
_isModerator: isLocalParticipantModerator(state), _isModerator: isLocalParticipantModerator(state),
_lobbyEnabled: lobbyEnabled, _lobbyEnabled: lobbyEnabled,
_lobbyModeSwitchVisible: _lobbyModeSwitchVisible:
lobbySupported && isLocalParticipantModerator(state) && !hideLobbyButton, lobbySupported && isLocalParticipantModerator(state) && !hideLobbyButton && !isInBreakoutRoom(state),
_locked: locked, _locked: locked,
_lockedConference: Boolean(conference && locked), _lockedConference: Boolean(conference && locked),
_password: password, _password: password,