From 2a5f7e3fecc98debea2b3408662d402a1e1681a0 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Mon, 28 Feb 2022 01:13:06 +0100
Subject: feat: Handle service load failures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a "failed" state for services where the BrowserView and WebContents
should be left around to keep history and allow people to navigate back.

Access to the browser history otherwise doesn't seem possible
(see https://github.com/electron/electron/issues/26727
and https://github.com/electron/electron/issues/7186),
so destroying BrowserView and managing our own history is not possible.

Also keep https://github.com/electron/electron/issues/24113 in mind.

Signed-off-by: Kristóf Marussy <kristof@marussy.com>
---
 packages/renderer/src/components/locationBar/NavigationButtons.tsx   | 2 +-
 packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/renderer')

diff --git a/packages/renderer/src/components/locationBar/NavigationButtons.tsx b/packages/renderer/src/components/locationBar/NavigationButtons.tsx
index e71d3d8..5c5c959 100644
--- a/packages/renderer/src/components/locationBar/NavigationButtons.tsx
+++ b/packages/renderer/src/components/locationBar/NavigationButtons.tsx
@@ -59,7 +59,7 @@ function NavigationButtons({
       >
         {direction === 'ltr' ? <IconArrowForward /> : <IconArrowBack />}
       </IconButton>
-      {service?.state === 'loading' ? (
+      {service?.loading ?? false ? (
         <IconButton aria-label="Stop" onClick={() => service?.stop()}>
           <IconStop />
         </IconButton>
diff --git a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
index d2f0745..57b17e9 100644
--- a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
+++ b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
@@ -56,7 +56,7 @@ function ToggleLocationBarButton(): JSX.Element {
       onClick={() => settings.toggleLocationBar()}
     >
       <ToggleLocationBarIcon
-        loading={selectedService?.state === 'loading'}
+        loading={selectedService?.loading ?? false}
         show={showLocationBar}
       />
     </IconButton>
-- 
cgit v1.2.3-54-g00ecf