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

…m backgrounds
jitsi · Mar 9, 2022 · 276cda9 · 276cda9
1 parent c60a51e
commit 276cda9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/react/features/overlay/components/web/OverlayFrame.js b/react/features/overlay/components/web/OverlayFrame.js
@@ -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
 };
 
 /**
@@ -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

diff --git a/react/features/overlay/components/web/UserMediaPermissionsOverlay.js b/react/features/overlay/components/web/UserMediaPermissionsOverlay.js
@@ -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' />
@@ -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));