Merge pull request #24 from kris7t/partial-interpretation

Changes for supporting partial interpretation

7 files changed, 10 insertions, 17 deletions

diff --git a/subprojects/frontend/src/Refinery.tsx b/subprojects/frontend/src/Refinery.tsx
index 93a82ee1..f0162349 100644
--- a/subprojects/frontend/src/Refinery.tsx
+++ b/subprojects/frontend/src/Refinery.tsx
@@ -8,7 +8,6 @@ import EditorPane from './editor/EditorPane';
 
 export default function Refinery(): JSX.Element {
   return (
-    // @ts-expect-error -- notistack has problems with `exactOptionalPropertyTypes
     <SnackbarProvider TransitionComponent={Grow}>
       <UpdateNotification />
       <Stack direction="column" height="100%" overflow="auto">
diff --git a/subprojects/frontend/src/UpdateNotification.tsx b/subprojects/frontend/src/UpdateNotification.tsx
index 07f7f5f7..5c8c2d01 100644
--- a/subprojects/frontend/src/UpdateNotification.tsx
+++ b/subprojects/frontend/src/UpdateNotification.tsx
@@ -32,14 +32,14 @@ export default observer(function UpdateNotification(): null {
       return enqueueLater('Failed to download update', {
         variant: 'error',
         action: (
-          <>
+          <ContrastThemeProvider>
             <Button color="inherit" onClick={() => pwaStore.checkForUpdates()}>
               Try again
             </Button>
             <Button color="inherit" onClick={() => pwaStore.dismissError()}>
               Dismiss
             </Button>
-          </>
+          </ContrastThemeProvider>
         ),
       });
     }
diff --git a/subprojects/frontend/src/editor/scrollbarViewPlugin.ts b/subprojects/frontend/src/editor/scrollbarViewPlugin.ts
index f54251a9..f44034fd 100644
--- a/subprojects/frontend/src/editor/scrollbarViewPlugin.ts
+++ b/subprojects/frontend/src/editor/scrollbarViewPlugin.ts
@@ -266,7 +266,6 @@ export default function scrollbarViewPlugin(
         if (firstRunTimeout !== undefined) {
           clearTimeout(firstRunTimeout);
         }
-        // @ts-expect-error `@types/node` typings should not be in effect here.
         firstRunTimeout = setTimeout(() => {
           spacer.style.minHeight = `${scrollHeight}px`;
           firstRun = false;
diff --git a/subprojects/frontend/src/theme/ThemeProvider.tsx b/subprojects/frontend/src/theme/ThemeProvider.tsx
index 7bda1ede..ff97d524 100644
--- a/subprojects/frontend/src/theme/ThemeProvider.tsx
+++ b/subprojects/frontend/src/theme/ThemeProvider.tsx
@@ -6,7 +6,6 @@ import {
   type ThemeOptions,
   ThemeProvider as MaterialUiThemeProvider,
   type TypographyStyle,
-  useTheme,
   type CSSObject,
 } from '@mui/material/styles';
 import { observer } from 'mobx-react-lite';
@@ -350,15 +349,14 @@ export function ContrastThemeProvider({
 }: {
   children?: ReactNode;
 }): JSX.Element {
-  const theme = useTheme();
   const contrastTheme = useContext(ContrastThemeContext);
   if (!contrastTheme) {
     throw new Error('ContrastThemeProvider must be used within ThemeProvider');
   }
   return (
-    <ThemeAndContrastThemeProvider theme={contrastTheme} contrastTheme={theme}>
+    <MaterialUiThemeProvider theme={contrastTheme}>
       {children}
-    </ThemeAndContrastThemeProvider>
+    </MaterialUiThemeProvider>
   );
 }
 
@@ -378,7 +376,7 @@ const ThemeProvider = observer(function ThemeProvider({
   return (
     <ThemeAndContrastThemeProvider
       theme={darkMode ? darkTheme : lightTheme}
-      contrastTheme={darkMode ? lightTheme : darkTheme}
+      contrastTheme={darkTheme}
     >
       {children}
     </ThemeAndContrastThemeProvider>
diff --git a/subprojects/frontend/src/utils/PendingTask.ts b/subprojects/frontend/src/utils/PendingTask.ts
index fd52cef1..d0b24c1f 100644
--- a/subprojects/frontend/src/utils/PendingTask.ts
+++ b/subprojects/frontend/src/utils/PendingTask.ts
@@ -20,7 +20,6 @@ export default class PendingTask<T> {
   ) {
     this.resolveCallback = resolveCallback;
     this.rejectCallback = rejectCallback;
-    // @ts-expect-error See https://github.com/mobxjs/mobx/issues/3582 on `@types/node` pollution
     this.timeout = setTimeout(() => {
       if (!this.resolved) {
         this.reject(new TimeoutError());
diff --git a/subprojects/frontend/src/utils/useDelayedSnackbar.ts b/subprojects/frontend/src/utils/useDelayedSnackbar.ts
index 54716c0c..03ad6caa 100644
--- a/subprojects/frontend/src/utils/useDelayedSnackbar.ts
+++ b/subprojects/frontend/src/utils/useDelayedSnackbar.ts
@@ -21,7 +21,6 @@ export default function useDelayedSnackbar(
       delay = defaultDelay,
     ) => {
       let key: SnackbarKey | undefined;
-      // @ts-expect-error See https://github.com/mobxjs/mobx/issues/3582 on `@types/node` pollution
       let timeout: number | undefined = setTimeout(() => {
         timeout = undefined;
         key = enqueueSnackbar(message, options);
diff --git a/subprojects/frontend/src/xtext/webSocketMachine.ts b/subprojects/frontend/src/xtext/webSocketMachine.ts
index 216ed86a..fc53fef3 100644
--- a/subprojects/frontend/src/xtext/webSocketMachine.ts
+++ b/subprojects/frontend/src/xtext/webSocketMachine.ts
@@ -1,5 +1,5 @@
 import ms from 'ms';
-import { actions, assign, createMachine, RaiseAction } from 'xstate';
+import { actions, assign, createMachine } from 'xstate';
 
 const { raise } = actions;
 
@@ -217,16 +217,15 @@ export default createMachine(
         ...context,
         errors: [],
       })),
-      // Workaround from https://github.com/statelyai/xstate/issues/1414#issuecomment-699972485
       raiseTimeoutError: raise({
         type: 'ERROR',
         message: 'Open timeout',
-      }) as RaiseAction<WebSocketEvent>,
+      }),
       raisePromiseRejectionError: (_context, { data }) =>
-        raise({
+        raise<WebSocketContext, WebSocketEvent>({
           type: 'ERROR',
-          message: data,
-        }) as RaiseAction<WebSocketEvent>,
+          message: String(data),
+        }),
     },
   },
 );