aboutsummaryrefslogtreecommitdiffstats
path: root/packages/renderer
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2022-02-28 01:13:06 +0100
committerLibravatar Kristóf Marussy <kristof@marussy.com>2022-03-06 18:56:49 +0100
commit2a5f7e3fecc98debea2b3408662d402a1e1681a0 (patch)
tree39b363cd8453007a8b6537e01813e0c8e61fe46c /packages/renderer
parentfix(service-preload): Browser view canvas background (diff)
downloadsophie-2a5f7e3fecc98debea2b3408662d402a1e1681a0.tar.gz
sophie-2a5f7e3fecc98debea2b3408662d402a1e1681a0.tar.zst
sophie-2a5f7e3fecc98debea2b3408662d402a1e1681a0.zip
feat: Handle service load failures
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>
Diffstat (limited to 'packages/renderer')
-rw-r--r--packages/renderer/src/components/locationBar/NavigationButtons.tsx2
-rw-r--r--packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx2
2 files changed, 2 insertions, 2 deletions
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({
59 > 59 >
60 {direction === 'ltr' ? <IconArrowForward /> : <IconArrowBack />} 60 {direction === 'ltr' ? <IconArrowForward /> : <IconArrowBack />}
61 </IconButton> 61 </IconButton>
62 {service?.state === 'loading' ? ( 62 {service?.loading ?? false ? (
63 <IconButton aria-label="Stop" onClick={() => service?.stop()}> 63 <IconButton aria-label="Stop" onClick={() => service?.stop()}>
64 <IconStop /> 64 <IconStop />
65 </IconButton> 65 </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 {
56 onClick={() => settings.toggleLocationBar()} 56 onClick={() => settings.toggleLocationBar()}
57 > 57 >
58 <ToggleLocationBarIcon 58 <ToggleLocationBarIcon
59 loading={selectedService?.state === 'loading'} 59 loading={selectedService?.loading ?? false}
60 show={showLocationBar} 60 show={showLocationBar}
61 /> 61 />
62 </IconButton> 62 </IconButton>