[RN] No VideoQualityLabel in Picture-in-Picture

This commit is contained in:
Lyubo Marinov 2018-08-31 15:12:09 -05:00 committed by Любомир Маринов
parent aba0912abf
commit 024671165a
1 changed files with 31 additions and 13 deletions

View File

@ -9,11 +9,27 @@ import {
isNarrowAspectRatio, isNarrowAspectRatio,
makeAspectRatioAware makeAspectRatioAware
} from '../../base/responsive-ui'; } from '../../base/responsive-ui';
import { isFilmstripVisible } from '../../filmstrip';
import AbstractLabels, { type Props } from './AbstractLabels'; import AbstractLabels, {
_abstractMapStateToProps,
type Props as AbstractLabelsProps
} from './AbstractLabels';
import styles from './styles'; import styles from './styles';
/**
* The type of the React {@code Component} props of {@link Labels}.
*/
type Props = AbstractLabelsProps & {
/**
* The indicator which determines whether the UI is reduced (to accommodate
* smaller display areas).
*
* @private
*/
_reducedUI: boolean
};
/** /**
* A container that renders the conference indicators, if any. * A container that renders the conference indicators, if any.
*/ */
@ -25,7 +41,7 @@ class Labels extends AbstractLabels<Props, *> {
*/ */
render() { render() {
const wide = !isNarrowAspectRatio(this); const wide = !isNarrowAspectRatio(this);
const { _filmstripVisible } = this.props; const { _filmstripVisible, _reducedUI } = this.props;
return ( return (
<View <View
@ -42,8 +58,14 @@ class Labels extends AbstractLabels<Props, *> {
this._renderRecordingLabel( this._renderRecordingLabel(
JitsiRecordingConstants.mode.STREAM) JitsiRecordingConstants.mode.STREAM)
} }
{ {/*
this._renderVideoQualityLabel() * Emil, Lyubomir, Nichole, and Zoli said that the Labels
* should not be rendered in Picture-in-Picture. Saul argued
* that the recording Labels should be rendered. As a temporary
* compromise, don't render the VideoQualityLabel at least
* because it's not that important.
*/
_reducedUI || this._renderVideoQualityLabel()
} }
</View> </View>
); );
@ -61,18 +83,14 @@ class Labels extends AbstractLabels<Props, *> {
* @param {Object} state - The redux state. * @param {Object} state - The redux state.
* @private * @private
* @returns {{ * @returns {{
* _filmstripVisible: boolean * _filmstripVisible: boolean,
* _reducedUI: boolean
* }} * }}
*/ */
function _mapStateToProps(state) { function _mapStateToProps(state) {
return { return {
/** ..._abstractMapStateToProps(state),
* The indicator which determines whether the filmstrip is visible. _reducedUI: state['features/base/responsive-ui'].reducedUI
*
* @private
* @type {boolean}
*/
_filmstripVisible: isFilmstripVisible(state)
}; };
} }