From c9b1d44c280713c30fa1b3b2cb55c563a6ebdd5e Mon Sep 17 00:00:00 2001
From: Matthias Mair <code@mjmair.com>
Date: Mon, 15 Apr 2024 12:33:26 +0200
Subject: [PATCH] fix types

---
 src/frontend/src/components/buttons/ActionButton.tsx | 3 +--
 src/frontend/src/components/nav/DetailDrawer.tsx     | 4 ++--
 src/frontend/src/hooks/UseForm.tsx                   | 4 ++--
 src/frontend/src/hooks/UseModal.tsx                  | 4 ++--
 src/frontend/src/pages/Auth/Login.tsx                | 2 +-
 src/frontend/src/states/LocalState.tsx               | 7 +++----
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/frontend/src/components/buttons/ActionButton.tsx b/src/frontend/src/components/buttons/ActionButton.tsx
index 4383fc89c5..1a4eb08a31 100644
--- a/src/frontend/src/components/buttons/ActionButton.tsx
+++ b/src/frontend/src/components/buttons/ActionButton.tsx
@@ -1,5 +1,4 @@
-import { ActionIcon, Group, Tooltip } from '@mantine/core';
-import { FloatingPosition } from '@mantine/core/lib/Floating';
+import { ActionIcon, FloatingPosition, Group, Tooltip } from '@mantine/core';
 import { ReactNode } from 'react';
 
 import { notYetImplemented } from '../../functions/notifications';
diff --git a/src/frontend/src/components/nav/DetailDrawer.tsx b/src/frontend/src/components/nav/DetailDrawer.tsx
index ce5b9eac45..57f001899b 100644
--- a/src/frontend/src/components/nav/DetailDrawer.tsx
+++ b/src/frontend/src/components/nav/DetailDrawer.tsx
@@ -3,7 +3,7 @@ import {
   Divider,
   Drawer,
   Group,
-  MantineNumberSize,
+  MantineSize,
   Stack,
   Text
 } from '@mantine/core';
@@ -26,7 +26,7 @@ export interface DrawerProps {
   position?: 'right' | 'left';
   renderContent: (id?: string) => React.ReactNode;
   urlPrefix?: string;
-  size?: MantineNumberSize;
+  size?: MantineSize | (string & {}) | number;
   closeOnEscape?: boolean;
 }
 
diff --git a/src/frontend/src/hooks/UseForm.tsx b/src/frontend/src/hooks/UseForm.tsx
index f42bbad285..492226e81f 100644
--- a/src/frontend/src/hooks/UseForm.tsx
+++ b/src/frontend/src/hooks/UseForm.tsx
@@ -1,5 +1,5 @@
 import { t } from '@lingui/macro';
-import { Alert, Divider, MantineNumberSize, Stack } from '@mantine/core';
+import { Alert, Divider, MantineSize, Stack } from '@mantine/core';
 import { useId } from '@mantine/hooks';
 import { useEffect, useMemo, useRef } from 'react';
 
@@ -20,7 +20,7 @@ export interface ApiFormModalProps extends ApiFormProps {
   onClose?: () => void;
   onOpen?: () => void;
   closeOnClickOutside?: boolean;
-  size?: MantineNumberSize;
+  size?: MantineSize | (string & {}) | number;
 }
 
 /**
diff --git a/src/frontend/src/hooks/UseModal.tsx b/src/frontend/src/hooks/UseModal.tsx
index d8377f749e..5c99fe4088 100644
--- a/src/frontend/src/hooks/UseModal.tsx
+++ b/src/frontend/src/hooks/UseModal.tsx
@@ -1,4 +1,4 @@
-import { MantineNumberSize, Modal } from '@mantine/core';
+import { MantineSize, Modal } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import React, { useCallback } from 'react';
 
@@ -7,7 +7,7 @@ import { StylishText } from '../components/items/StylishText';
 export interface UseModalProps {
   title: string;
   children: React.ReactElement;
-  size?: MantineNumberSize;
+  size?: MantineSize | (string & {}) | number;
   onOpen?: () => void;
   onClose?: () => void;
   closeOnClickOutside?: boolean;
diff --git a/src/frontend/src/pages/Auth/Login.tsx b/src/frontend/src/pages/Auth/Login.tsx
index 28bfd21e71..3b38928845 100644
--- a/src/frontend/src/pages/Auth/Login.tsx
+++ b/src/frontend/src/pages/Auth/Login.tsx
@@ -35,7 +35,7 @@ export default function Login() {
   const location = useLocation();
 
   // Data manipulation functions
-  function ChangeHost(newHost: string): void {
+  function ChangeHost(newHost: string | null): void {
     setHost(hostList[newHost]?.host, newHost);
     setApiDefaults();
     fetchServerApiState();
diff --git a/src/frontend/src/states/LocalState.tsx b/src/frontend/src/states/LocalState.tsx
index 81d498463d..e9b9e5c15e 100644
--- a/src/frontend/src/states/LocalState.tsx
+++ b/src/frontend/src/states/LocalState.tsx
@@ -1,5 +1,4 @@
-import { MantineNumberSize } from '@mantine/core';
-import { LoaderType } from '@mantine/styles/lib/theme/types/MantineTheme';
+import { MantineSize } from '@mantine/core';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 
@@ -19,8 +18,8 @@ interface LocalStateProps {
   primaryColor: string;
   whiteColor: string;
   blackColor: string;
-  radius: MantineNumberSize;
-  loader: LoaderType;
+  radius: MantineSize | (string & {}) | number;
+  loader: string;
   lastUsedPanels: Record<string, string>;
   setLastUsedPanel: (panelKey: string) => (value: string) => void;
   tableColumnNames: Record<string, Record<string, string>>;