Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Respect hide media buttons setting on button control bar, ref #309

auto_join_3.3
Håvar Aambø Fosstveit 2020-05-07 15:15:44 +02:00
parent 4c6d9291bf
commit 02b6c617c5
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/public/config/config.example.js
View File

@ -57,6 +57,8 @@ var config =
// If true, will show media control buttons in separate // If true, will show media control buttons in separate
// control bar, not in the ME container. // control bar, not in the ME container.
buttonControlBar : false, buttonControlBar : false,
// Timeout for autohiding topbar and button control bar
hideTimeout : 3000,
lastN : 4, lastN : 4,
mobileLastN : 1, mobileLastN : 1,
// Highest number of speakers user can select // Highest number of speakers user can select

10
app/src/components/Controls/ButtonControlBar.js
View File

@ -60,6 +60,7 @@ const ButtonControlBar = (props) =>
const { const {
roomClient, roomClient,
toolbarsVisible, toolbarsVisible,
hiddenControls,
me, me,
micProducer, micProducer,
webcamProducer, webcamProducer,
@ -133,7 +134,11 @@ const ButtonControlBar = (props) =>
return ( return (
<div <div
className={ 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'}> <Tooltip title={micTip} placement={smallScreen ? 'top' : 'right'}>
@ -224,6 +229,7 @@ ButtonControlBar.propTypes =
{ {
roomClient : PropTypes.any.isRequired, roomClient : PropTypes.any.isRequired,
toolbarsVisible : PropTypes.bool.isRequired, toolbarsVisible : PropTypes.bool.isRequired,
hiddenControls : PropTypes.bool.isRequired,
me : appPropTypes.Me.isRequired, me : appPropTypes.Me.isRequired,
micProducer : appPropTypes.Producer, micProducer : appPropTypes.Producer,
webcamProducer : appPropTypes.Producer, webcamProducer : appPropTypes.Producer,
@ -235,6 +241,7 @@ ButtonControlBar.propTypes =
const mapStateToProps = (state) => const mapStateToProps = (state) =>
({ ({
toolbarsVisible : state.room.toolbarsVisible, toolbarsVisible : state.room.toolbarsVisible,
hiddenControls : state.settings.hiddenControls,
...meProducersSelector(state), ...meProducersSelector(state),
me : state.me me : state.me
}); });
@ -248,6 +255,7 @@ export default withRoomContext(connect(
{ {
return ( return (
prev.room.toolbarsVisible === next.room.toolbarsVisible && prev.room.toolbarsVisible === next.room.toolbarsVisible &&
prev.settings.hiddenControls === next.settings.hiddenControls &&
prev.producers === next.producers && prev.producers === next.producers &&
prev.me === next.me prev.me === next.me
); );

2
app/src/components/Room.js
View File

@ -27,7 +27,7 @@ import WakeLock from 'react-wakelock-react16';
import ExtraVideo from './Controls/ExtraVideo'; import ExtraVideo from './Controls/ExtraVideo';
import ButtonControlBar from './Controls/ButtonControlBar'; import ButtonControlBar from './Controls/ButtonControlBar';
const TIMEOUT = 5 * 1000; const TIMEOUT = window.config.hideTimeout || 5000;
const styles = (theme) => const styles = (theme) =>
({ ({