fix: Show audio/video options on lobby screen

This commit is contained in:
Vlad Piersec 2020-06-23 13:16:50 +03:00 committed by Saúl Ibarra Corretgé
parent 87b14c3711
commit 3b1ad9faff
1 changed files with 9 additions and 2 deletions

View File

@ -12,7 +12,7 @@ import { Chat } from '../../../chat';
import { Filmstrip } from '../../../filmstrip'; import { Filmstrip } from '../../../filmstrip';
import { CalleeInfoContainer } from '../../../invite'; import { CalleeInfoContainer } from '../../../invite';
import { LargeVideo } from '../../../large-video'; import { LargeVideo } from '../../../large-video';
import { KnockingParticipantList } from '../../../lobby'; import { KnockingParticipantList, LobbyScreen } from '../../../lobby';
import { Prejoin, isPrejoinPageVisible } from '../../../prejoin'; import { Prejoin, isPrejoinPageVisible } from '../../../prejoin';
import { import {
Toolbox, Toolbox,
@ -73,6 +73,11 @@ type Props = AbstractProps & {
*/ */
_iAmRecorder: boolean, _iAmRecorder: boolean,
/**
* Returns true if the 'lobby screen' is visible.
*/
_isLobbyScreenVisible: boolean,
/** /**
* The CSS class to apply to the root of {@link Conference} to modify the * The CSS class to apply to the root of {@link Conference} to modify the
* application layout. * application layout.
@ -183,6 +188,7 @@ class Conference extends AbstractConference<Props, *> {
} = interfaceConfig; } = interfaceConfig;
const { const {
_iAmRecorder, _iAmRecorder,
_isLobbyScreenVisible,
_layoutClassName, _layoutClassName,
_showPrejoin _showPrejoin
} = this.props; } = this.props;
@ -204,7 +210,7 @@ class Conference extends AbstractConference<Props, *> {
{ hideLabels || <Labels /> } { hideLabels || <Labels /> }
</div> </div>
{ filmstripOnly || _showPrejoin || <Toolbox /> } { filmstripOnly || _showPrejoin || _isLobbyScreenVisible || <Toolbox /> }
{ filmstripOnly || <Chat /> } { filmstripOnly || <Chat /> }
{ this.renderNotificationsContainer() } { this.renderNotificationsContainer() }
@ -276,6 +282,7 @@ function _mapStateToProps(state) {
return { return {
...abstractMapStateToProps(state), ...abstractMapStateToProps(state),
_iAmRecorder: state['features/base/config'].iAmRecorder, _iAmRecorder: state['features/base/config'].iAmRecorder,
_isLobbyScreenVisible: state['features/base/dialog']?.component === LobbyScreen,
_layoutClassName: LAYOUT_CLASSNAMES[getCurrentLayout(state)], _layoutClassName: LAYOUT_CLASSNAMES[getCurrentLayout(state)],
_roomName: getConferenceNameForTitle(state), _roomName: getConferenceNameForTitle(state),
_showPrejoin: isPrejoinPageVisible(state) _showPrejoin: isPrejoinPageVisible(state)