|
@@ -7,8 +7,12 @@ import { connect } from 'react-redux';
|
7
|
7
|
import { Container } from '../../../base/react';
|
8
|
8
|
import { ChatButton } from '../../../chat';
|
9
|
9
|
|
|
10
|
+import { isToolboxVisible } from '../../functions';
|
|
11
|
+
|
10
|
12
|
import AudioMuteButton from '../AudioMuteButton';
|
11
|
13
|
import HangupButton from '../HangupButton';
|
|
14
|
+import VideoMuteButton from '../VideoMuteButton';
|
|
15
|
+
|
12
|
16
|
import OverflowMenuButton from './OverflowMenuButton';
|
13
|
17
|
import styles, {
|
14
|
18
|
chatButtonOverride,
|
|
@@ -16,7 +20,6 @@ import styles, {
|
16
|
20
|
toolbarButtonStyles,
|
17
|
21
|
toolbarToggledButtonStyles
|
18
|
22
|
} from './styles';
|
19
|
|
-import VideoMuteButton from '../VideoMuteButton';
|
20
|
23
|
|
21
|
24
|
/**
|
22
|
25
|
* The number of buttons other than {@link HangupButton} to render in
|
|
@@ -262,10 +265,8 @@ class Toolbox extends Component<Props, State> {
|
262
|
265
|
* }}
|
263
|
266
|
*/
|
264
|
267
|
function _mapStateToProps(state: Object): Object {
|
265
|
|
- const { alwaysVisible, enabled, visible } = state['features/toolbox'];
|
266
|
|
-
|
267
|
268
|
return {
|
268
|
|
- _visible: enabled && (alwaysVisible || visible)
|
|
269
|
+ _visible: isToolboxVisible(state)
|
269
|
270
|
};
|
270
|
271
|
}
|
271
|
272
|
|