Fix a bug when Video.props.videos is undefined

Always mute my video
This commit is contained in:
Jerko Steiner 2018-12-12 18:29:46 +01:00
parent d8ec33a22f
commit 02986bf403
2 changed files with 10 additions and 5 deletions

View File

@ -74,6 +74,7 @@ export default class App extends React.PureComponent {
onClick={toggleActive} onClick={toggleActive}
stream={streams[constants.ME]} stream={streams[constants.ME]}
userId={constants.ME} userId={constants.ME}
muted
/> />
{_.map(peers, (_, userId) => ( {_.map(peers, (_, userId) => (
@ -83,6 +84,7 @@ export default class App extends React.PureComponent {
onClick={toggleActive} onClick={toggleActive}
stream={streams[userId]} stream={streams[userId]}
userId={userId} userId={userId}
videos={videos}
/> />
))} ))}
</div> </div>

View File

@ -15,7 +15,11 @@ export default class Video extends React.PureComponent {
onClick: PropTypes.func, onClick: PropTypes.func,
active: PropTypes.bool.isRequired, active: PropTypes.bool.isRequired,
stream: StreamPropType, stream: StreamPropType,
userId: PropTypes.string.isRequired userId: PropTypes.string.isRequired,
muted: PropTypes.bool.isRequired
}
static defaultProps = {
muted: false
} }
handleClick = e => { handleClick = e => {
const { onClick, userId } = this.props const { onClick, userId } = this.props
@ -41,12 +45,10 @@ export default class Video extends React.PureComponent {
} else if (video.src !== url) { } else if (video.src !== url) {
video.src = url video.src = url
} }
if (socket.id) { videos[socket.id] = video
videos[socket.id] = video
}
} }
render () { render () {
const { active } = this.props const { active, muted } = this.props
const className = classnames('video-container', { active }) const className = classnames('video-container', { active })
return ( return (
<div className={className}> <div className={className}>
@ -57,6 +59,7 @@ export default class Video extends React.PureComponent {
onLoadedMetadata={this.play} onLoadedMetadata={this.play}
playsInline playsInline
ref="video" ref="video"
muted={muted}
/> />
</div> </div>
) )