Improve webview loader

7 files changed, 45 insertions, 12 deletions

diff --git a/package-lock.json b/package-lock.json
index 67ca6c463..abd4f9266 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6869,6 +6869,11 @@
       "integrity": "sha512-iWOUTZu7KQGhErV8JfTQDH5F/M2D0HVd0sexS4Grg4e4RYAiN3c4jfpPqKgfedqeebKcNZBl2z3zlgCtFjpFJQ==",
       "dev": true
     },
+    "hex-to-rgba": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hex-to-rgba/-/hex-to-rgba-1.0.2.tgz",
+      "integrity": "sha512-fL+4NFccs86iOuDnFl1Mhyn471qTPAkpE7k39+JYGPMB3+S9LoUnauQI2nz6BUb3DpYQCx8RqENbaf8IFdKYOg=="
+    },
     "history": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz",
diff --git a/package.json b/package.json
index 03a584267..63d5139b1 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "electron-window-state": "^4.1.0",
     "fs-extra": "7.0.1",
     "gulp-cli": "1.2.2",
+    "hex-to-rgba": "1.0.2",
     "ini": "^1.3.4",
     "jshashes": "^1.0.6",
     "jsonwebtoken": "^7.4.1",
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 9919163b9..b1a2c0207 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -89,7 +89,7 @@ export default @observer class ServiceWebview extends Component {
 
     return (
       <div className={webviewClasses}>
-        {service.isActive && (
+        {service.isActive && service.isEnabled && (
           <Fragment>
             {service.hasCrashed && (
               <WebviewCrashHandler
@@ -100,7 +100,7 @@ export default @observer class ServiceWebview extends Component {
             )}
             {service.isEnabled && service.isLoading && service.isFirstLoad && (
               <WebviewLoader
-                loaded={!service.isLoading}
+                loaded={false}
                 name={service.name}
               />
             )}
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js
index 950312bbb..ab17199e5 100644
--- a/src/components/ui/WebviewLoader/index.js
+++ b/src/components/ui/WebviewLoader/index.js
@@ -1,16 +1,24 @@
-import React from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import injectSheet from 'react-jss';
 
 import FullscreenLoader from '../FullscreenLoader';
 
-const WebviewLoader = ({ name }) => (
-  <FullscreenLoader
-    title={`Loading ${name}`}
-  />
-);
+import styles from './styles';
 
-WebviewLoader.propTypes = {
-  name: PropTypes.string.isRequired,
-};
+export default @injectSheet(styles) class WebviewLoader extends Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    classes: PropTypes.object.isRequired,
+  }
 
-export default WebviewLoader;
+  render() {
+    const { classes, name } = this.props;
+    return (
+      <FullscreenLoader
+        className={classes.component}
+        title={`Loading ${name}`}
+      />
+    );
+  }
+}
diff --git a/src/components/ui/WebviewLoader/styles.js b/src/components/ui/WebviewLoader/styles.js
new file mode 100644
index 000000000..dbd75db8a
--- /dev/null
+++ b/src/components/ui/WebviewLoader/styles.js
@@ -0,0 +1,9 @@
+export default theme => ({
+  component: {
+    background: theme.colorWebviewLoaderBackground,
+    padding: 20,
+    width: 'auto',
+    margin: [0, 'auto'],
+    borderRadius: 6,
+  },
+});
diff --git a/src/theme/dark/index.js b/src/theme/dark/index.js
index 76fece134..aafa7cb27 100644
--- a/src/theme/dark/index.js
+++ b/src/theme/dark/index.js
@@ -1,3 +1,5 @@
+import hexToRgba from 'hex-to-rgba';
+
 import * as legacyStyles from '../default/legacy';
 
 export const colorBackground = legacyStyles.darkThemeGrayDarkest;
@@ -5,3 +7,6 @@ export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo;
 
 export const colorHeadline = legacyStyles.darkThemeTextColor;
 export const colorText = legacyStyles.darkThemeTextColor;
+
+// Webview Loader
+export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.darkThemeGrayDarkest, 0.5);
diff --git a/src/theme/default/index.js b/src/theme/default/index.js
index cdd9aa5e6..9640b1cb0 100644
--- a/src/theme/default/index.js
+++ b/src/theme/default/index.js
@@ -1,3 +1,5 @@
+import hexToRgba from 'hex-to-rgba';
+
 import * as legacyStyles from './legacy';
 
 export const brandPrimary = '#3498db';
@@ -20,3 +22,6 @@ export const colorSubscriptionContainerBorder = [1, 'solid', brandPrimary];
 export const colorSubscriptionContainerTitle = brandPrimary;
 export const colorSubscriptionContainerActionButtonBackground = brandPrimary;
 export const colorSubscriptionContainerActionButtonColor = '#FFF';
+
+// Webview Loader
+export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.themeGrayLighter, 0.8);