Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dynamic-branding) fix permissions screen not accounting for custo… #11097

Merged
merged 1 commit into from
Mar 10, 2022
Merged

fix(dynamic-branding) fix permissions screen not accounting for custo… #11097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions react/features/overlay/components/web/OverlayFrame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ type Props = {
* Indicates the css style of the overlay. If true, then lighter; darker,
* otherwise.
*/
isLightOverlay?: boolean
isLightOverlay?: boolean,

/**
* The style property.
*/
style: Object
};

/**
Expand All @@ -35,7 +40,8 @@ export default class OverlayFrame extends Component<Props> {
return (
<div
className = { this.props.isLightOverlay ? 'overlay__container-light' : 'overlay__container' }
id = 'overlay'>
id = 'overlay'
style = { this.props.style }>
<div className = { 'overlay__content' }>
{
this.props.children
Expand Down
27 changes: 24 additions & 3 deletions react/features/overlay/components/web/UserMediaPermissionsOverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,15 @@ class UserMediaPermissionsOverlay extends AbstractUserMediaPermissionsOverlay {
* @returns {ReactElement}
*/
render() {
const { browser, t } = this.props;
const { _premeetingBackground, browser, t } = this.props;
const style = _premeetingBackground ? {
background: _premeetingBackground,
backgroundPosition: 'center',
backgroundSize: 'cover'
} : {};

return (
<OverlayFrame>
<OverlayFrame style = { style }>
<div className = 'inlay'>
<span className = 'inlay__icon icon-microphone' />
<span className = 'inlay__icon icon-camera' />
Expand Down Expand Up @@ -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(
connect(abstractMapStateToProps)(UserMediaPermissionsOverlay));
connect(mapStateToProps)(UserMediaPermissionsOverlay));