Fix number of boxes being counted in updateDimensions

master
Torjus 2018-07-18 16:26:46 +02:00
parent f49f02d016
commit a5457ecac1
1 changed files with 15 additions and 18 deletions

View File

@ -22,9 +22,9 @@ class Peers extends React.Component
updateDimensions = () =>
{
const n = this.props.videoStreams ? this.props.videoStreams : 0;
const n = this.props.boxes;
if (n == 0)
if (n === 0)
{
return;
}
@ -124,24 +124,21 @@ Peers.propTypes =
{
advancedMode : PropTypes.bool,
peers : PropTypes.arrayOf(appPropTypes.Peer).isRequired,
videoStreams : PropTypes.any,
boxes : PropTypes.number,
activeSpeakerName : PropTypes.string,
toolAreaOpen : PropTypes.bool
};
const mapStateToProps = (state) =>
{
const peersArray = Object.values(state.peers);
const videoStreamsArray = Object.values(state.consumers);
const videoStreams =
videoStreamsArray.filter((consumer) =>
{
return (consumer.source === 'webcam' || consumer.source === 'screen');
}).length;
const peers = Object.values(state.peers);
const boxes = peers.length + Object.values(state.consumers)
.filter((consumer) => consumer.source === 'screen').length;
return {
peers : peersArray,
videoStreams : videoStreams,
peers,
boxes,
activeSpeakerName : state.room.activeSpeakerName,
toolAreaOpen : state.toolarea.toolAreaOpen
};