From b4f1f04e5f464dc2aaceb207bee634ed54c4e7ac Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Sun, 9 Dec 2018 23:44:54 +0100
Subject: Only render service handler when service is selected

---
 src/components/services/content/ServiceWebview.js | 60 +++++++++++++----------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 69983a80a..9919163b9 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { autorun } from 'mobx';
 import { observer } from 'mobx-react';
@@ -89,33 +89,41 @@ export default @observer class ServiceWebview extends Component {
 
     return (
       <div className={webviewClasses}>
-        {service.hasCrashed && (
-          <WebviewCrashHandler
-            name={service.recipe.name}
-            webview={service.webview}
-            reload={reload}
-          />
-        )}
-        {service.isEnabled && service.isLoading && service.isFirstLoad && (
-          <WebviewLoader
-            loaded={!service.isLoading}
-            name={service.name}
-          />
-        )}
-        {service.isError && (
-          <WebviewErrorHandler
-            name={service.recipe.name}
-            errorMessage={service.errorMessage}
-            reload={reload}
-            edit={edit}
-          />
+        {service.isActive && (
+          <Fragment>
+            {service.hasCrashed && (
+              <WebviewCrashHandler
+                name={service.recipe.name}
+                webview={service.webview}
+                reload={reload}
+              />
+            )}
+            {service.isEnabled && service.isLoading && service.isFirstLoad && (
+              <WebviewLoader
+                loaded={!service.isLoading}
+                name={service.name}
+              />
+            )}
+            {service.isError && (
+              <WebviewErrorHandler
+                name={service.recipe.name}
+                errorMessage={service.errorMessage}
+                reload={reload}
+                edit={edit}
+              />
+            )}
+          </Fragment>
         )}
         {!service.isEnabled ? (
-          <ServiceDisabled
-            name={service.recipe.name}
-            webview={service.webview}
-            enable={enable}
-          />
+          <Fragment>
+            {service.isActive && (
+              <ServiceDisabled
+                name={service.recipe.name}
+                webview={service.webview}
+                enable={enable}
+              />
+            )}
+          </Fragment>
         ) : (
           <Webview
             ref={(element) => { this.webview = element; }}
-- 
cgit v1.2.3-70-g09d2