improve keystrokes, cleanup

src/View/Modals/boardSettingsModal.tsx

@@ -4,13 +4,15 @@ import BoardViewModel from "../../ViewModel/Pages/boardViewModel";
 import { ColorPicker } from "../Components/colorPicker";
 import { DangerousActionButton } from "../Components/dangerousActionButton";
 import CoreViewModel from "../../ViewModel/Global/coreViewModel";
-import { setFocusWithDelay } from "../utility";
+import { ViewController } from "../viewController";
 
 export function BoardSettingsModal(
     coreViewModel: CoreViewModel,
     boardViewModel: BoardViewModel,
 ) {
-    boardViewModel.isPresentingSettingsModal.subscribe(setFocusWithDelay);
+    boardViewModel.isPresentingSettingsModal.subscribe(
+        ViewController.setFocusWithDelay,
+    );
 
     return (
         <div

src/View/Modals/dataTransferModal.tsx

@@ -8,8 +8,8 @@ import FileTransferViewModel, {
 import ConnectionViewModel from "../../ViewModel/Global/connectionViewModel";
 import StorageModel from "../../Model/Global/storageModel";
 import { StringToTextSpan } from "../Components/textSpan";
-import { reload } from "../utility";
 import CoreViewModel from "../../ViewModel/Global/coreViewModel";
+import { ViewController } from "../viewController";
 
 export function DataTransferModalWrapper(
     coreViewModel: CoreViewModel,
@@ -545,7 +545,7 @@ function DataReceptionModal(
                         ]}
                     ></div>
                 </main>
-                <button on:click={reload}>
+                <button on:click={ViewController.reload}>
                     {coreViewModel.translations.general.reloadAppButton}
                     <span class="icon">refresh</span>
                 </button>

src/View/Modals/messageFilterModal.tsx

@@ -4,7 +4,7 @@ import CoreViewModel from "../../ViewModel/Global/coreViewModel";
 import MessagePageViewModel from "../../ViewModel/Pages/messagePageViewModel";
 import { MessageReactionFilterButton } from "../Components/messageReactionFilterButton";
 import { ReactionSymbols } from "../../Model/Chat/chatModel";
-import { setFocusWithDelay } from "../utility";
+import { ViewController } from "../viewController";
 
 export function MessageFilterModal<T>(
     coreViewModel: CoreViewModel,
@@ -16,7 +16,14 @@ export function MessageFilterModal<T>(
         () => messagePageViewModel.reactionFilter.value == undefined,
     );
 
-    messagePageViewModel.isFilterModalOpen.subscribe(setFocusWithDelay);
+    messagePageViewModel.isFilterModalOpen.subscribe((isOpen) => {
+        if (isOpen == false) return;
+        ViewController.setFocusWithDelay();
+    });
+    React.createProxyState([messagePageViewModel.isFilterModalOpen], () => {
+        if (messagePageViewModel.isFilterModalOpen.value == false) return;
+        ViewController.setFocusWithDelay();
+    });
 
     return (
         <div class="modal" toggle:open={messagePageViewModel.isFilterModalOpen}>

src/View/Modals/searchModal.tsx

@@ -4,7 +4,7 @@ import SearchViewModel from "../../ViewModel/Utility/searchViewModel";
 import { StringToOption } from "../Components/option";
 import { v4 } from "uuid";
 import CoreViewModel from "../../ViewModel/Global/coreViewModel";
-import { setFocusWithDelay } from "../utility";
+import { ViewController } from "../viewController";
 
 export function SearchModal<T>(
     coreViewModel: CoreViewModel,
@@ -19,7 +19,10 @@ export function SearchModal<T>(
 
     const suggestionId = v4();
 
-    isOpen.subscribe(setFocusWithDelay);
+    isOpen.subscribe((isOpen) => {
+        if (!isOpen) return;
+        ViewController.setFocusWithDelay();
+    });
 
     return (
         <div class="modal" toggle:open={isOpen} extended>