Respect hide media buttons setting on button control bar, ref #309
This commit is contained in:
@@ -57,6 +57,8 @@ var config =
|
||||
// If true, will show media control buttons in separate
|
||||
// control bar, not in the ME container.
|
||||
buttonControlBar : false,
|
||||
// Timeout for autohiding topbar and button control bar
|
||||
hideTimeout : 3000,
|
||||
lastN : 4,
|
||||
mobileLastN : 1,
|
||||
// Highest number of speakers user can select
|
||||
|
||||
@@ -60,6 +60,7 @@ const ButtonControlBar = (props) =>
|
||||
const {
|
||||
roomClient,
|
||||
toolbarsVisible,
|
||||
hiddenControls,
|
||||
me,
|
||||
micProducer,
|
||||
webcamProducer,
|
||||
@@ -133,7 +134,11 @@ const ButtonControlBar = (props) =>
|
||||
return (
|
||||
<div
|
||||
className={
|
||||
classnames(classes.root, toolbarsVisible ? classes.show : classes.hide)
|
||||
classnames(
|
||||
classes.root,
|
||||
hiddenControls ?
|
||||
(toolbarsVisible ? classes.show : classes.hide) :
|
||||
classes.show)
|
||||
}
|
||||
>
|
||||
<Tooltip title={micTip} placement={smallScreen ? 'top' : 'right'}>
|
||||
@@ -224,6 +229,7 @@ ButtonControlBar.propTypes =
|
||||
{
|
||||
roomClient : PropTypes.any.isRequired,
|
||||
toolbarsVisible : PropTypes.bool.isRequired,
|
||||
hiddenControls : PropTypes.bool.isRequired,
|
||||
me : appPropTypes.Me.isRequired,
|
||||
micProducer : appPropTypes.Producer,
|
||||
webcamProducer : appPropTypes.Producer,
|
||||
@@ -235,6 +241,7 @@ ButtonControlBar.propTypes =
|
||||
const mapStateToProps = (state) =>
|
||||
({
|
||||
toolbarsVisible : state.room.toolbarsVisible,
|
||||
hiddenControls : state.settings.hiddenControls,
|
||||
...meProducersSelector(state),
|
||||
me : state.me
|
||||
});
|
||||
@@ -248,6 +255,7 @@ export default withRoomContext(connect(
|
||||
{
|
||||
return (
|
||||
prev.room.toolbarsVisible === next.room.toolbarsVisible &&
|
||||
prev.settings.hiddenControls === next.settings.hiddenControls &&
|
||||
prev.producers === next.producers &&
|
||||
prev.me === next.me
|
||||
);
|
||||
|
||||
@@ -27,7 +27,7 @@ import WakeLock from 'react-wakelock-react16';
|
||||
import ExtraVideo from './Controls/ExtraVideo';
|
||||
import ButtonControlBar from './Controls/ButtonControlBar';
|
||||
|
||||
const TIMEOUT = 5 * 1000;
|
||||
const TIMEOUT = window.config.hideTimeout || 5000;
|
||||
|
||||
const styles = (theme) =>
|
||||
({
|
||||
|
||||
Reference in New Issue
Block a user