From 02986bf403509f7b4f5849186bb7f340fd4674c2 Mon Sep 17 00:00:00 2001 From: Jerko Steiner Date: Wed, 12 Dec 2018 18:29:46 +0100 Subject: [PATCH] Fix a bug when Video.props.videos is undefined Always mute my video --- src/client/components/App.js | 2 ++ src/client/components/Video.js | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/client/components/App.js b/src/client/components/App.js index e742d41..44ebea0 100644 --- a/src/client/components/App.js +++ b/src/client/components/App.js @@ -74,6 +74,7 @@ export default class App extends React.PureComponent { onClick={toggleActive} stream={streams[constants.ME]} userId={constants.ME} + muted /> {_.map(peers, (_, userId) => ( @@ -83,6 +84,7 @@ export default class App extends React.PureComponent { onClick={toggleActive} stream={streams[userId]} userId={userId} + videos={videos} /> ))} diff --git a/src/client/components/Video.js b/src/client/components/Video.js index 6905e48..eb09c7b 100644 --- a/src/client/components/Video.js +++ b/src/client/components/Video.js @@ -15,7 +15,11 @@ export default class Video extends React.PureComponent { onClick: PropTypes.func, active: PropTypes.bool.isRequired, stream: StreamPropType, - userId: PropTypes.string.isRequired + userId: PropTypes.string.isRequired, + muted: PropTypes.bool.isRequired + } + static defaultProps = { + muted: false } handleClick = e => { const { onClick, userId } = this.props @@ -41,12 +45,10 @@ export default class Video extends React.PureComponent { } else if (video.src !== url) { video.src = url } - if (socket.id) { - videos[socket.id] = video - } + videos[socket.id] = video } render () { - const { active } = this.props + const { active, muted } = this.props const className = classnames('video-container', { active }) return (
@@ -57,6 +59,7 @@ export default class Video extends React.PureComponent { onLoadedMetadata={this.play} playsInline ref="video" + muted={muted} />
)