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.
pull/10477/head
Saúl Ibarra Corretgé 4 years ago committed by Дамян Минков
parent 43647f1302
commit 58ef2974c9
  1. 7
      react/features/lobby/components/web/LobbySection.js
  2. 3
      react/features/security/components/security-dialog/native/SecurityDialog.js

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

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

Loading…
Cancel
Save