Browse Source

fix: Show audio/video options on lobby screen

master
Vlad Piersec 5 years ago
parent
commit
3b1ad9faff
1 changed files with 9 additions and 2 deletions
  1. 9
    2
      react/features/conference/components/web/Conference.js

+ 9
- 2
react/features/conference/components/web/Conference.js View File

12
 import { Filmstrip } from '../../../filmstrip';
12
 import { Filmstrip } from '../../../filmstrip';
13
 import { CalleeInfoContainer } from '../../../invite';
13
 import { CalleeInfoContainer } from '../../../invite';
14
 import { LargeVideo } from '../../../large-video';
14
 import { LargeVideo } from '../../../large-video';
15
-import { KnockingParticipantList } from '../../../lobby';
15
+import { KnockingParticipantList, LobbyScreen } from '../../../lobby';
16
 import { Prejoin, isPrejoinPageVisible } from '../../../prejoin';
16
 import { Prejoin, isPrejoinPageVisible } from '../../../prejoin';
17
 import {
17
 import {
18
     Toolbox,
18
     Toolbox,
73
      */
73
      */
74
     _iAmRecorder: boolean,
74
     _iAmRecorder: boolean,
75
 
75
 
76
+    /**
77
+     * Returns true if the 'lobby screen' is visible.
78
+     */
79
+    _isLobbyScreenVisible: boolean,
80
+
76
     /**
81
     /**
77
      * The CSS class to apply to the root of {@link Conference} to modify the
82
      * The CSS class to apply to the root of {@link Conference} to modify the
78
      * application layout.
83
      * application layout.
183
         } = interfaceConfig;
188
         } = interfaceConfig;
184
         const {
189
         const {
185
             _iAmRecorder,
190
             _iAmRecorder,
191
+            _isLobbyScreenVisible,
186
             _layoutClassName,
192
             _layoutClassName,
187
             _showPrejoin
193
             _showPrejoin
188
         } = this.props;
194
         } = this.props;
204
                     { hideLabels || <Labels /> }
210
                     { hideLabels || <Labels /> }
205
                 </div>
211
                 </div>
206
 
212
 
207
-                { filmstripOnly || _showPrejoin || <Toolbox /> }
213
+                { filmstripOnly || _showPrejoin || _isLobbyScreenVisible || <Toolbox /> }
208
                 { filmstripOnly || <Chat /> }
214
                 { filmstripOnly || <Chat /> }
209
 
215
 
210
                 { this.renderNotificationsContainer() }
216
                 { this.renderNotificationsContainer() }
276
     return {
282
     return {
277
         ...abstractMapStateToProps(state),
283
         ...abstractMapStateToProps(state),
278
         _iAmRecorder: state['features/base/config'].iAmRecorder,
284
         _iAmRecorder: state['features/base/config'].iAmRecorder,
285
+        _isLobbyScreenVisible: state['features/base/dialog']?.component === LobbyScreen,
279
         _layoutClassName: LAYOUT_CLASSNAMES[getCurrentLayout(state)],
286
         _layoutClassName: LAYOUT_CLASSNAMES[getCurrentLayout(state)],
280
         _roomName: getConferenceNameForTitle(state),
287
         _roomName: getConferenceNameForTitle(state),
281
         _showPrejoin: isPrejoinPageVisible(state)
288
         _showPrejoin: isPrejoinPageVisible(state)

Loading…
Cancel
Save