Ver código fonte

fix(self-view) Add Show self view button in overflow menu (#11568)

master
Robert Pintilii 3 anos atrás
pai
commit
607021a890
Nenhuma conta vinculada ao e-mail do autor do commit

+ 16
- 5
react/features/toolbox/components/native/OverflowMenu.js Ver arquivo

@@ -28,6 +28,7 @@ import OpenCarmodeButton from './OpenCarmodeButton';
28 28
 import RaiseHandButton from './RaiseHandButton';
29 29
 import ScreenSharingButton from './ScreenSharingButton';
30 30
 import ToggleCameraButton from './ToggleCameraButton';
31
+import ToggleSelfViewButton from './ToggleSelfViewButton';
31 32
 
32 33
 /**
33 34
  * The type of the React {@code Component} props of {@link OverflowMenu}.
@@ -49,6 +50,11 @@ type Props = {
49 50
      */
50 51
     _recordingEnabled: boolean,
51 52
 
53
+    /**
54
+     * Whether or not the self view is hidden.
55
+     */
56
+    _selfViewHidden: boolean,
57
+
52 58
     /**
53 59
      * The width of the screen.
54 60
      */
@@ -113,8 +119,9 @@ class OverflowMenu extends PureComponent<Props, State> {
113 119
     render() {
114 120
         const {
115 121
             _bottomSheetStyles,
116
-            _width,
117
-            _reactionsEnabled
122
+            _reactionsEnabled,
123
+            _selfViewHidden,
124
+            _width
118 125
         } = this.props;
119 126
         const toolbarButtons = getMovableButtons(_width);
120 127
 
@@ -144,7 +151,8 @@ class OverflowMenu extends PureComponent<Props, State> {
144 151
                     ? this._renderReactionMenu
145 152
                     : null }>
146 153
                 <ParticipantsPaneButton { ...topButtonProps } />
147
-                <OpenCarmodeButton { ...topButtonProps } />
154
+                {_selfViewHidden && <ToggleSelfViewButton { ...buttonProps } />}
155
+                <OpenCarmodeButton { ...buttonProps } />
148 156
                 <AudioOnlyButton { ...buttonProps } />
149 157
                 {!_reactionsEnabled && !toolbarButtons.has('raisehand') && <RaiseHandButton { ...buttonProps } />}
150 158
                 <Divider style = { styles.divider } />
@@ -206,11 +214,14 @@ class OverflowMenu extends PureComponent<Props, State> {
206 214
  * @returns {Props}
207 215
  */
208 216
 function _mapStateToProps(state) {
217
+    const { disableSelfView } = state['features/base/settings'];
218
+
209 219
     return {
210 220
         _bottomSheetStyles: ColorSchemeRegistry.get(state, 'BottomSheet'),
211 221
         _isOpen: isDialogOpen(state, OverflowMenu_),
212
-        _width: state['features/base/responsive-ui'].clientWidth,
213
-        _reactionsEnabled: isReactionsEnabled(state)
222
+        _reactionsEnabled: isReactionsEnabled(state),
223
+        _selfViewHidden: Boolean(disableSelfView),
224
+        _width: state['features/base/responsive-ui'].clientWidth
214 225
     };
215 226
 }
216 227
 

Carregando…
Cancelar
Salvar