4 files changed, 72 insertions, 60 deletions

diff --git a/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx b/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx
index 24cfd0c..7aa9124 100644
--- a/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx
+++ b/packages/renderer/src/components/sidebar/ServiceSwitcher.tsx
@@ -26,9 +26,9 @@ import { observer } from 'mobx-react-lite';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import type RendererStore from '../../stores/RendererStore';
 import type Service from '../../stores/Service';
 import { getServicePanelID } from '../ServicePanel';
-import { useStore } from '../StoreProvider';
 
 import ServiceIcon from './ServiceIcon';
 
@@ -88,14 +88,13 @@ function getServiceTitle(service: Service, t: TFunction) {
   return t('service.title.nameWithMessages', { name, messages: messagesText });
 }
 
-function ServiceSwitcher(): JSX.Element {
-  // This needs to be here even if we don't use any translations in this component,
-  // because the component must stay suspended until the translations are loaded.
-  // See: https://github.com/mui/material-ui/issues/14077
-  // TODO Try and remove this once mui and mobx-react-lite have updated to react 18.
+function ServiceSwitcher({
+  store: { settings, services },
+}: {
+  store: RendererStore;
+}): JSX.Element {
   const { t } = useTranslation();
 
-  const { settings, services } = useStore();
   const { selectedService } = settings;
 
   return (
diff --git a/packages/renderer/src/components/sidebar/Sidebar.tsx b/packages/renderer/src/components/sidebar/Sidebar.tsx
index fc57302..6c802ac 100644
--- a/packages/renderer/src/components/sidebar/Sidebar.tsx
+++ b/packages/renderer/src/components/sidebar/Sidebar.tsx
@@ -19,54 +19,60 @@
  */
 
 import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
 import React from 'react';
 
+import RendererStore from '../../stores/RendererStore';
+
 import ServiceSwitcher from './ServiceSwitcher';
 import ToggleDarkModeButton from './ToggleDarkModeButton';
 import ToggleLocationBarButton from './ToggleLocationBarButton';
 
-export default function Sidebar(): JSX.Element {
+const SidebarRoot = styled(Box)(({ theme }) => ({
+  flex: 0,
+  display: 'flex',
+  position: 'relative',
+  overflow: 'hidden',
+  flexDirection: 'column',
+  alignItems: 'center',
+  padding: `${theme.spacing(1)} 0`,
+  gap: theme.spacing(1),
+  backgroundColor:
+    theme.palette.mode === 'dark'
+      ? 'rgba(255, 255, 255, 0.09)'
+      : 'rgba(0, 0, 0, 0.06)',
+  minWidth: `calc(${theme.spacing(4)} + 36px)`,
+  '::after': {
+    content: '" "',
+    position: 'absolute',
+    top: '-20px',
+    bottom: '-20px',
+    right: '-20px',
+    zIndex: 100,
+    width: '20px',
+    boxShadow: theme.shadows[4],
+  },
+}));
+
+const SidebarFill = styled(Box)({
+  flex: 1,
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'flex-start',
+});
+
+export default function Sidebar({
+  store,
+}: {
+  store: RendererStore;
+}): JSX.Element {
   return (
-    <Box
-      component="aside"
-      sx={(theme) => ({
-        flex: 0,
-        display: 'flex',
-        position: 'relative',
-        overflow: 'hidden',
-        flexDirection: 'column',
-        alignItems: 'center',
-        paddingY: 1,
-        gap: 1,
-        backgroundColor:
-          theme.palette.mode === 'dark'
-            ? 'rgba(255, 255, 255, 0.09)'
-            : 'rgba(0, 0, 0, 0.06)',
-        minWidth: `calc(${theme.spacing(4)} + 36px)`,
-        '::after': {
-          content: '" "',
-          position: 'absolute',
-          top: '-20px',
-          bottom: '-20px',
-          right: '-20px',
-          zIndex: 100,
-          width: '20px',
-          boxShadow: theme.shadows[4],
-        },
-      })}
-    >
-      <ToggleLocationBarButton />
-      <Box
-        sx={{
-          flex: 1,
-          display: 'flex',
-          flexDirection: 'column',
-          justifyContent: 'flex-start',
-        }}
-      >
-        <ServiceSwitcher />
-      </Box>
-      <ToggleDarkModeButton />
-    </Box>
+    <SidebarRoot component="aside">
+      <ToggleLocationBarButton store={store} />
+      <SidebarFill>
+        <ServiceSwitcher store={store} />
+      </SidebarFill>
+      <ToggleDarkModeButton store={store} />
+    </SidebarRoot>
   );
 }
diff --git a/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx b/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx
index 51c3b18..a922389 100644
--- a/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx
+++ b/packages/renderer/src/components/sidebar/ToggleDarkModeButton.tsx
@@ -25,19 +25,23 @@ import { observer } from 'mobx-react-lite';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useStore } from '../StoreProvider';
+import type RendererStore from '../../stores/RendererStore';
 
-export default observer(() => {
+function ToggleDarkModeButton({
+  store: { shared },
+}: {
+  store: RendererStore;
+}): JSX.Element {
   const { t } = useTranslation();
-  const { shared } = useStore();
-  const { shouldUseDarkColors } = shared;
 
   return (
     <IconButton
       aria-label={t('toolbar.toggleDarkMode')}
       onClick={() => shared.toggleDarkMode()}
     >
-      {shouldUseDarkColors ? <LightModeIcon /> : <DarkModeIcon />}
+      {shared.shouldUseDarkColors ? <LightModeIcon /> : <DarkModeIcon />}
     </IconButton>
   );
-});
+}
+
+export default observer(ToggleDarkModeButton);
diff --git a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
index c697170..b6644a3 100644
--- a/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
+++ b/packages/renderer/src/components/sidebar/ToggleLocationBarButton.tsx
@@ -27,7 +27,7 @@ import { observer } from 'mobx-react-lite';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useStore } from '../StoreProvider';
+import type RendererStore from '../../stores/RendererStore';
 import { getLocaltionBarID } from '../locationBar/LocationBar';
 
 function ToggleLocationBarIcon({
@@ -45,12 +45,15 @@ function ToggleLocationBarIcon({
   return left ? <IconChevronLeft /> : <IconChevronRight />;
 }
 
-function ToggleLocationBarButton(): JSX.Element {
-  const { t } = useTranslation();
-  const {
+function ToggleLocationBarButton({
+  store: {
     shared: { locationBarVisible, canToggleLocationBar },
     settings,
-  } = useStore();
+  },
+}: {
+  store: RendererStore;
+}): JSX.Element {
+  const { t } = useTranslation();
   const { selectedService } = settings;
 
   return (