haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref(video): use videoTrack from props 

It doesn't seem like videoTrack needs to be set onto state
if it can be accessed directly from props. Removing the state
automatically removes the deprecated componentWillReceiveProps.
This commit is contained in:
Leonard Kim 2018-12-01 11:50:33 -08:00 committed by Saúl Ibarra Corretgé
parent cea12c9a8b
commit 822bc31d69
1 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
react/features/base/media/components/AbstractVideoTrack.js
View File

@ -47,24 +47,13 @@ export type Props = {
zoomEnabled?: boolean zoomEnabled?: boolean
}; };
/**
* The type of the React {@code Component} state of {@link AbstractVideoTrack}.
*/
type State = {
/**
* The Redux representation of the participant's video track.
*/
videoTrack: Object | null
};
/** /**
* Implements a React {@link Component} that renders video element for a * Implements a React {@link Component} that renders video element for a
* specific video track. * specific video track.
* *
* @abstract * @abstract
*/ */
export default class AbstractVideoTrack<P: Props> extends Component<P, State> { export default class AbstractVideoTrack<P: Props> extends Component<P> {
/** /**
* Initializes a new AbstractVideoTrack instance. * Initializes a new AbstractVideoTrack instance.
* *
@ -74,31 +63,10 @@ export default class AbstractVideoTrack<P: Props> extends Component<P, State> {
constructor(props: P) { constructor(props: P) {
super(props); super(props);
this.state = {
videoTrack: _falsy2null(props.videoTrack)
};
// Bind event handlers so they are only bound once for every instance. // Bind event handlers so they are only bound once for every instance.
this._onVideoPlaying = this._onVideoPlaying.bind(this); this._onVideoPlaying = this._onVideoPlaying.bind(this);
} }
/**
* Implements React's {@link Component#componentWillReceiveProps()}.
*
* @inheritdoc
* @param {Object} nextProps - The read-only props which this Component will
* receive.
* @returns {void}
*/
componentWillReceiveProps(nextProps: P) {
const oldValue = this.state.videoTrack;
const newValue = _falsy2null(nextProps.videoTrack);
if (oldValue !== newValue) {
this._setVideoTrack(newValue);
}
}
/** /**
* Implements React's {@link Component#render()}. * Implements React's {@link Component#render()}.
* *
@ -106,7 +74,7 @@ export default class AbstractVideoTrack<P: Props> extends Component<P, State> {
* @returns {ReactElement} * @returns {ReactElement}
*/ */
render() { render() {
const { videoTrack } = this.state; const videoTrack = _falsy2null(this.props.videoTrack);
let render; let render;
if (this.props.waitForVideoStarted && videoTrack) { if (this.props.waitForVideoStarted && videoTrack) {
@ -168,18 +136,6 @@ export default class AbstractVideoTrack<P: Props> extends Component<P, State> {
this.props.dispatch(trackVideoStarted(videoTrack.jitsiTrack)); this.props.dispatch(trackVideoStarted(videoTrack.jitsiTrack));
} }
} }
/**
* Sets a specific video track to be rendered by this instance.
*
* @param {Track} videoTrack - The video track to be rendered by this
* instance.
* @protected
* @returns {void}
*/
_setVideoTrack(videoTrack) {
this.setState({ videoTrack });
}
} }
/** /**