refactor: move test event to its own file, move test specific signals

Miodec · Miodec · commit f91eef36f0ee · 2026-03-25T08:56:55.000+01:00
diff --git a/frontend/src/ts/components/layout/footer/Footer.tsx b/frontend/src/ts/components/layout/footer/Footer.tsx
@@ -1,7 +1,8 @@
 import { JSXElement } from "solid-js";
 
-import { getFocus, getIsScreenshotting } from "../../../states/core";
+import { getIsScreenshotting } from "../../../states/core";
 import { showModal } from "../../../states/modals";
+import { getFocus } from "../../../states/test";
 import { cn } from "../../../utils/cn";
 import { Button } from "../../common/Button";
 import { Keytips } from "./Keytips";
diff --git a/frontend/src/ts/components/layout/footer/Keytips.tsx b/frontend/src/ts/components/layout/footer/Keytips.tsx
@@ -1,7 +1,7 @@
 import { JSXElement, Show } from "solid-js";
 
 import { getConfig } from "../../../config/store";
-import { getFocus } from "../../../states/core";
+import { getFocus } from "../../../states/test";
 import { Conditional } from "../../common/Conditional";
 
 export function Keytips(): JSXElement {
diff --git a/frontend/src/ts/components/layout/header/AccountXpBar.tsx b/frontend/src/ts/components/layout/header/AccountXpBar.tsx
@@ -11,12 +11,12 @@ import {
 import { createEvent } from "../../../hooks/createEvent";
 import { createSignalWithSetters } from "../../../hooks/createSignalWithSetters";
 import { createEffectOn } from "../../../hooks/effects";
-import { getFocus } from "../../../states/core";
 import {
   skipBreakdownEvent,
   getXpBarData,
   setAnimatedLevel,
 } from "../../../states/header";
+import { getFocus } from "../../../states/test";
 import { getXpDetails } from "../../../utils/levels";
 import { sleep } from "../../../utils/misc";
 import { Anime, AnimePresence, AnimeShow } from "../../common/anime";
diff --git a/frontend/src/ts/components/layout/header/Header.tsx b/frontend/src/ts/components/layout/header/Header.tsx
@@ -1,6 +1,7 @@
 import { JSXElement } from "solid-js";
 
-import { getFocus, getIsScreenshotting } from "../../../states/core";
+import { getIsScreenshotting } from "../../../states/core";
+import { getFocus } from "../../../states/test";
 import { cn } from "../../../utils/cn";
 import { Logo } from "./Logo";
 import { Nav } from "./Nav";
diff --git a/frontend/src/ts/components/layout/header/Logo.tsx b/frontend/src/ts/components/layout/header/Logo.tsx
@@ -1,10 +1,8 @@
 import { JSXElement } from "solid-js";
 
-import {
-  restartTestEvent,
-  getActivePage,
-  getFocus,
-} from "../../../states/core";
+import { restartTestEvent } from "../../../events/test";
+import { getActivePage } from "../../../states/core";
+import { getFocus } from "../../../states/test";
 import { cn } from "../../../utils/cn";
 import { isDevEnvironment } from "../../../utils/env";
 
diff --git a/frontend/src/ts/components/layout/header/Nav.tsx b/frontend/src/ts/components/layout/header/Nav.tsx
@@ -1,24 +1,22 @@
 import { useQuery } from "@tanstack/solid-query";
 import { createMemo, JSXElement, Show } from "solid-js";
 
+import { restartTestEvent } from "../../../events/test";
 import { createEffectOn } from "../../../hooks/effects";
 import {
   prefetchAboutPage,
   prefetchLeaderboardPage,
 } from "../../../queries/prefetch";
 import { getServerConfigurationQueryOptions } from "../../../queries/server-configuration";
-import {
-  restartTestEvent,
-  getActivePage,
-  getFocus,
-} from "../../../states/core";
+import { getActivePage } from "../../../states/core";
 import {
   getAccountButtonSpinner,
   getAnimatedLevel,
   setAnimatedLevel,
 } from "../../../states/header";
 import { showModal } from "../../../states/modals";
 import { getSnapshot } from "../../../states/snapshot";
+import { getFocus } from "../../../states/test";
 import { cn } from "../../../utils/cn";
 import { getLevelFromTotalXp } from "../../../utils/levels";
 import { AnimeConditional } from "../../common/anime";
diff --git a/frontend/src/ts/components/layout/overlays/Notifications.tsx b/frontend/src/ts/components/layout/overlays/Notifications.tsx
@@ -1,17 +1,14 @@
 import { AnimationParams } from "animejs";
 import { For, JSXElement } from "solid-js";
 
-import {
-  getFocus,
-  getGlobalOffsetTop,
-  getIsScreenshotting,
-} from "../../../states/core";
+import { getGlobalOffsetTop, getIsScreenshotting } from "../../../states/core";
 import {
   Notification,
   getNotifications,
   removeNotification,
   clearAllNotifications,
 } from "../../../states/notifications";
+import { getFocus } from "../../../states/test";
 import { cn } from "../../../utils/cn";
 import { Anime } from "../../common/anime/Anime";
 import { AnimePresence } from "../../common/anime/AnimePresence";
diff --git a/frontend/src/ts/components/modals/CustomTestDurationModal.tsx b/frontend/src/ts/components/modals/CustomTestDurationModal.tsx
@@ -3,7 +3,7 @@ import { JSXElement } from "solid-js";
 
 import { setConfig } from "../../config/setters";
 import { getConfig } from "../../config/store";
-import { restartTestEvent } from "../../states/core";
+import { restartTestEvent } from "../../events/test";
 import { hideModalAndClearChain } from "../../states/modals";
 import { showNoticeNotification } from "../../states/notifications";
 import { AnimatedModal } from "../common/AnimatedModal";
diff --git a/frontend/src/ts/components/modals/CustomTextModal.tsx b/frontend/src/ts/components/modals/CustomTextModal.tsx
@@ -7,8 +7,8 @@ import type { FaSolidIcon } from "../../types/font-awesome";
 
 import { setConfig } from "../../config/setters";
 import { Config } from "../../config/store";
+import { restartTestEvent } from "../../events/test";
 import * as CustomTextState from "../../legacy-states/custom-text-name";
-import { restartTestEvent } from "../../states/core";
 import { hideModalAndClearChain, showModal } from "../../states/modals";
 import {
   showNoticeNotification,
diff --git a/frontend/src/ts/components/modals/CustomWordAmountModal.tsx b/frontend/src/ts/components/modals/CustomWordAmountModal.tsx
@@ -3,7 +3,7 @@ import { JSXElement } from "solid-js";
 
 import { setConfig } from "../../config/setters";
 import { getConfig } from "../../config/store";
-import { restartTestEvent } from "../../states/core";
+import { restartTestEvent } from "../../events/test";
 import { hideModalAndClearChain } from "../../states/modals";
 import { showNoticeNotification } from "../../states/notifications";
 import { AnimatedModal } from "../common/AnimatedModal";
diff --git a/frontend/src/ts/components/modals/MobileTestConfigModal.tsx b/frontend/src/ts/components/modals/MobileTestConfigModal.tsx
@@ -8,7 +8,8 @@ import { For, JSXElement, Show } from "solid-js";
 
 import { setConfig, setQuoteLengthAll } from "../../config/setters";
 import { getConfig } from "../../config/store";
-import { isLoggedIn, restartTestEvent } from "../../states/core";
+import { restartTestEvent } from "../../events/test";
+import { isLoggedIn } from "../../states/core";
 import { showModal } from "../../states/modals";
 import { areUnsortedArraysEqual } from "../../utils/arrays";
 import { AnimatedModal } from "../common/AnimatedModal";
diff --git a/frontend/src/ts/components/pages/test/TestConfig.tsx b/frontend/src/ts/components/pages/test/TestConfig.tsx
@@ -2,15 +2,12 @@ import { ComponentProps, For, JSXElement, Show } from "solid-js";
 
 import { setConfig, setQuoteLengthAll } from "../../../config/setters";
 import { getConfig } from "../../../config/store";
+import { restartTestEvent } from "../../../events/test";
 import { createEffectOn } from "../../../hooks/effects";
 import { useRefWithUtils } from "../../../hooks/useRefWithUtils";
-import {
-  getFocus,
-  getResultVisible,
-  isLoggedIn,
-  restartTestEvent,
-} from "../../../states/core";
+import { isLoggedIn } from "../../../states/core";
 import { showModal } from "../../../states/modals";
+import { getResultVisible, getFocus } from "../../../states/test";
 import { FaSolidIcon } from "../../../types/font-awesome";
 import { areUnsortedArraysEqual } from "../../../utils/arrays";
 import { cn } from "../../../utils/cn";
diff --git a/frontend/src/ts/events/test.ts b/frontend/src/ts/events/test.ts
@@ -0,0 +1,3 @@
+import { createEvent } from "../hooks/createEvent";
+
+export const restartTestEvent = createEvent();
diff --git a/frontend/src/ts/states/core.ts b/frontend/src/ts/states/core.ts
@@ -1,5 +1,4 @@
 import { createSignal } from "solid-js";
-import { createEvent } from "../hooks/createEvent";
 import { PageName } from "../pages/page";
 
 export const [getActivePage, setActivePage] = createSignal<PageName>("loading");
@@ -27,7 +26,6 @@ export const [getCommandlineSubgroup, setCommandlineSubgroup] = createSignal<
   string | null
 >(null);
 
-export const [getFocus, setFocus] = createSignal(false);
 export const [getGlobalOffsetTop, setGlobalOffsetTop] = createSignal(0);
 export const [getIsScreenshotting, setIsScreenshotting] = createSignal(false);
 
@@ -37,7 +35,3 @@ export const isLoggedIn = (): boolean => getUserId() !== null;
 export const [getSelectedProfileName, setSelectedProfileName] = createSignal<
   string | undefined
 >(undefined);
-export const [getResultVisible, setResultVisible] =
-  createSignal<boolean>(false);
-
-export const restartTestEvent = createEvent();
diff --git a/frontend/src/ts/states/test.ts b/frontend/src/ts/states/test.ts
@@ -3,3 +3,6 @@ import { createSignal } from "solid-js";
 
 export const [getLoadedChallenge, setLoadedChallenge] =
   createSignal<Challenge | null>(null);
+export const [getResultVisible, setResultVisible] =
+  createSignal<boolean>(false);
+export const [getFocus, setFocus] = createSignal(false);
diff --git a/frontend/src/ts/test/focus.ts b/frontend/src/ts/test/focus.ts
@@ -5,7 +5,7 @@ import * as LiveAcc from "./live-acc";
 import * as TimerProgress from "./timer-progress";
 import * as PageTransition from "../legacy-states/page-transition";
 import { requestDebouncedAnimationFrame } from "../utils/debounced-animation-frame";
-import { getFocus, setFocus } from "../states/core";
+import { getFocus, setFocus } from "../states/test";
 import { qsa, ElementsWithUtils } from "../utils/dom";
 
 const unfocusPx = 3;
diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
@@ -26,11 +26,9 @@ import * as TodayTracker from "./today-tracker";
 import * as ChallengeContoller from "../controllers/challenge-controller";
 import { clearQuoteStats } from "../states/quote-rate";
 import * as Result from "./result";
-import {
-  getActivePage,
-  restartTestEvent,
-  setResultVisible,
-} from "../states/core";
+import { getActivePage } from "../states/core";
+import { setResultVisible } from "../states/test";
+import { restartTestEvent } from "../events/test";
 import * as TestInput from "./test-input";
 import * as TestWords from "./test-words";
 import * as WordsGenerator from "./words-generator";
