fix(dynamic-branding) fix permissions screen not accounting for custom backgrounds (#11097)
This commit is contained in:
parent
c60a51e671
commit
f0f135ac7d
|
@ -18,7 +18,12 @@ type Props = {
|
||||||
* Indicates the css style of the overlay. If true, then lighter; darker,
|
* Indicates the css style of the overlay. If true, then lighter; darker,
|
||||||
* otherwise.
|
* otherwise.
|
||||||
*/
|
*/
|
||||||
isLightOverlay?: boolean
|
isLightOverlay?: boolean,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The style property.
|
||||||
|
*/
|
||||||
|
style: Object
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -35,7 +40,8 @@ export default class OverlayFrame extends Component<Props> {
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className = { this.props.isLightOverlay ? 'overlay__container-light' : 'overlay__container' }
|
className = { this.props.isLightOverlay ? 'overlay__container-light' : 'overlay__container' }
|
||||||
id = 'overlay'>
|
id = 'overlay'
|
||||||
|
style = { this.props.style }>
|
||||||
<div className = { 'overlay__content' }>
|
<div className = { 'overlay__content' }>
|
||||||
{
|
{
|
||||||
this.props.children
|
this.props.children
|
||||||
|
|
|
@ -23,10 +23,15 @@ class UserMediaPermissionsOverlay extends AbstractUserMediaPermissionsOverlay {
|
||||||
* @returns {ReactElement}
|
* @returns {ReactElement}
|
||||||
*/
|
*/
|
||||||
render() {
|
render() {
|
||||||
const { browser, t } = this.props;
|
const { _premeetingBackground, browser, t } = this.props;
|
||||||
|
const style = _premeetingBackground ? {
|
||||||
|
background: _premeetingBackground,
|
||||||
|
backgroundPosition: 'center',
|
||||||
|
backgroundSize: 'cover'
|
||||||
|
} : {};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<OverlayFrame>
|
<OverlayFrame style = { style }>
|
||||||
<div className = 'inlay'>
|
<div className = 'inlay'>
|
||||||
<span className = 'inlay__icon icon-microphone' />
|
<span className = 'inlay__icon icon-microphone' />
|
||||||
<span className = 'inlay__icon icon-camera' />
|
<span className = 'inlay__icon icon-camera' />
|
||||||
|
@ -84,5 +89,21 @@ class UserMediaPermissionsOverlay extends AbstractUserMediaPermissionsOverlay {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maps (parts of) the redux state to the React {@code Component} props.
|
||||||
|
*
|
||||||
|
* @param {Object} state - The redux state.
|
||||||
|
* @param {Object} ownProps - The props passed to the component.
|
||||||
|
* @returns {Object}
|
||||||
|
*/
|
||||||
|
function mapStateToProps(state): Object {
|
||||||
|
const { premeetingBackground } = state['features/dynamic-branding'];
|
||||||
|
|
||||||
|
return {
|
||||||
|
...abstractMapStateToProps,
|
||||||
|
_premeetingBackground: premeetingBackground
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
export default translate(
|
export default translate(
|
||||||
connect(abstractMapStateToProps)(UserMediaPermissionsOverlay));
|
connect(mapStateToProps)(UserMediaPermissionsOverlay));
|
||||||
|
|
Loading…
Reference in New Issue