refactor: move state

Author: Miodec

frontend/src/ts/elements/keymap.ts

@@ -6,7 +6,6 @@ import * as JSONData from "../utils/json-data";
 import * as Hangul from "hangul-js";
 import { showErrorNotification } from "../states/notifications";
 import { getActivePage } from "../states/core";
-import * as TestWords from "../test/test-words";
 import { onCapsLockChange, isCapsLockOn } from "@leonabcd123/modern-caps-lock";
 import * as ShiftTracker from "../test/shift-tracker";
 import * as AltTracker from "../test/alt-tracker";
@@ -20,6 +19,7 @@ import { requestDebouncedAnimationFrame } from "../utils/debounced-animation-fra
 import { getTheme } from "../states/theme";
 
 import { createEffectOn } from "../hooks/effects";
+import { wordsHaveNumbers } from "../test/test-state";
 
 export const keyDataDelimiter = "\uE000";
 const keymap = qsr("#keymap");
@@ -431,7 +431,7 @@ export async function refresh(): Promise<void> {
     }
 
     const showTopRow =
-      (TestWords.hasNumbers && Config.keymapMode === "next") ||
+      (wordsHaveNumbers && Config.keymapMode === "next") ||
       Config.keymapShowTopRow === "always" ||
       (layoutData.keymapShowTopRow && Config.keymapShowTopRow !== "never");
 

frontend/src/ts/test/test-logic.ts

@@ -587,7 +587,7 @@ async function init(): Promise<boolean> {
     }
   }
 
-  TestWords.setHasNumbers(hasNumbers);
+  TestState.setWordsHaveNumbers(hasNumbers);
   setWordsHaveTab(wordsHaveTab);
   setWordsHaveNewline(wordsHaveNewline);
 

frontend/src/ts/test/test-state.ts

@@ -14,6 +14,11 @@ export let resultVisible = false;
 export let resultCalculating = false;
 export let koreanStatus = false;
 export let lastEventLog: EventLog | null = null;
+export let wordsHaveNumbers = false;
+
+export function setWordsHaveNumbers(val: boolean): void {
+  wordsHaveNumbers = val;
+}
 
 export function setLastEventLog(log: EventLog): void {
   lastEventLog = log;

frontend/src/ts/test/test-words.ts

@@ -56,8 +56,3 @@ class Words {
 }
 
 export const words = new Words();
-export let hasNumbers = false;
-
-export function setHasNumbers(tf: boolean): void {
-  hasNumbers = tf;
-}