Changed from using state.peers as array.

master
Håvar Aambø Fosstveit 2018-06-16 22:09:03 +02:00
parent 0696316bf1
commit ac922092ea
1 changed files with 6 additions and 10 deletions

View File

@ -86,16 +86,16 @@ class Peers extends React.Component
return ( return (
<div data-component='Peers' ref='peers'> <div data-component='Peers' ref='peers'>
{ {
peers.map((peer) => Object.keys(peers).map(function(key)
{ {
return ( return (
<Appear key={peer.name} duration={1000}> <Appear key={peers[key].name} duration={1000}>
<div <div
className={classnames('peer-container', { className={classnames('peer-container', {
'active-speaker' : peer.name === activeSpeakerName 'active-speaker' : peers[key].name === activeSpeakerName
})} style={style} })} style={style}
> >
<Peer name={peer.name} /> <Peer name={peers[key].name} />
</div> </div>
</Appear> </Appear>
); );
@ -108,7 +108,7 @@ class Peers extends React.Component
Peers.propTypes = Peers.propTypes =
{ {
peers : PropTypes.arrayOf(appPropTypes.Peer).isRequired, peers : PropTypes.object.isRequired,
activeSpeakerName : PropTypes.string, activeSpeakerName : PropTypes.string,
peerHeight : PropTypes.number, peerHeight : PropTypes.number,
peerWidth : PropTypes.number, peerWidth : PropTypes.number,
@ -127,12 +127,8 @@ const mapDispatchToProps = (dispatch) =>
const mapStateToProps = (state) => const mapStateToProps = (state) =>
{ {
// TODO: This is not OK since it's creating a new array every time, so triggering a
// component rendering.
const peersArray = Object.values(state.peers);
return { return {
peers : peersArray, peers : state.peers,
activeSpeakerName : state.room.activeSpeakerName, activeSpeakerName : state.room.activeSpeakerName,
peerHeight : state.room.peerHeight, peerHeight : state.room.peerHeight,
peerWidth : state.room.peerWidth peerWidth : state.room.peerWidth