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

Merge branch 'feat-static-layout' into develop

master
Håvar Aambø Fosstveit 2019-11-26 12:50:32 +01:00
parent a36022674d b163fd0a72
commit 3f321da30e
5 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/components/Containers/Peer.js
View File

@ -45,7 +45,14 @@ const styles = (theme) =>
},
'&.active-speaker' :
{
transition : 'filter .2s',
filter : 'grayscale(0)',
borderColor : 'var(--active-speaker-border-color)'
},
'&:not(.active-speaker)' :
{
transition : 'filter 2s',
filter : 'grayscale(0.75)'
}
},
fab :
@ -512,17 +519,17 @@ Peer.propTypes =
theme : PropTypes.object.isRequired
};
const makeMapStateToProps = (initialState, props) =>
const makeMapStateToProps = (initialState, { id }) =>
{
const getPeerConsumers = makePeerConsumerSelector();
const mapStateToProps = (state) =>
{
return {
peer : state.peers[props.id],
...getPeerConsumers(state, props),
peer : state.peers[id],
...getPeerConsumers(state, id),
windowConsumer : state.room.windowConsumer,
activeSpeaker : props.id === state.room.activeSpeakerId
activeSpeaker : id === state.room.activeSpeakerId
};
};

6
app/src/components/Containers/SpeakerPeer.js
View File

@ -190,13 +190,13 @@ SpeakerPeer.propTypes =
classes : PropTypes.object.isRequired
};
const mapStateToProps = (state, props) =>
const mapStateToProps = (state, { id }) =>
{
const getPeerConsumers = makePeerConsumerSelector();
return {
peer : state.peers[props.id],
...getPeerConsumers(state, props)
peer : state.peers[id],
...getPeerConsumers(state, id)
};
};

10
app/src/components/MeetingViews/Democratic.js
View File

@ -91,11 +91,11 @@ class Democratic extends React.PureComponent
break;
}
}
if (Math.ceil(this.state.peerWidth) !== Math.ceil(0.9 * x))
if (Math.ceil(this.state.peerWidth) !== Math.ceil(0.94 * x))
{
this.setState({
peerWidth : 0.95 * x,
peerHeight : 0.95 * y
peerWidth : 0.94 * x,
peerHeight : 0.94 * y
});
}
};
@ -160,9 +160,9 @@ class Democratic extends React.PureComponent
{
return (
<Peer
key={peer.id}
key={peer}
advancedMode={advancedMode}
id={peer.id}
id={peer}
spacing={6}
style={style}
/>

2
app/src/components/MeetingViews/Filmstrip.js
View File

@ -319,7 +319,7 @@ const mapStateToProps = (state) =>
myId : state.me.id,
spotlights : state.room.spotlights,
spotlightsLength : spotlightsLengthSelector(state),
boxes : videoBoxesSelector(state),
boxes : videoBoxesSelector(state)
};
};

12
app/src/components/Selectors.js
View File

@ -5,8 +5,8 @@ const consumersSelect = (state) => state.consumers;
const spotlightsSelector = (state) => state.room.spotlights;
const peersSelector = (state) => state.peers;
const lobbyPeersSelector = (state) => state.lobbyPeers;
const getPeerConsumers = (state, props) =>
(state.peers[props.id] ? state.peers[props.id].consumers : null);
const getPeerConsumers = (state, id) =>
(state.peers[id] ? state.peers[id].consumers : null);
const getAllConsumers = (state) => state.consumers;
const peersKeySelector = createSelector(
peersSelector,
@ -70,12 +70,12 @@ export const spotlightsLengthSelector = createSelector(
export const spotlightPeersSelector = createSelector(
spotlightsSelector,
peersSelector,
peersKeySelector,
(spotlights, peers) =>
spotlights.reduce((result, peerId) =>
peers.reduce((result, peerId) =>
{
if (peers[peerId])
result.push(peers[peerId]);
if (spotlights.includes(peerId))
result.push(peerId);
return result;
}, [])