fix: hotkey issues (@Miodec) (#7802)

Author: Miodec

frontend/src/ts/input/hotkeys/quickrestart.ts

@@ -6,7 +6,7 @@ import { getActivePage } from "../../states/core";
 import { hotkeys, quickRestartHotkeyMap } from "../../states/hotkeys";
 import { createHotkey } from "./utils";
 import { getConfig } from "../../config/store";
-import { isLongTest } from "../../states/test";
+import { isLongTest, wordsHaveNewline, wordsHaveTab } from "../../states/test";
 
 function quickRestart(e: KeyboardEvent): void {
   if (isAnyPopupVisible()) {
@@ -37,5 +37,10 @@ createHotkey(
 createHotkey(
   () => quickRestartHotkeyMap[getConfig.quickRestart],
   quickRestart,
-  () => ({ enabled: isLongTest() }),
+  () => ({
+    enabled:
+      isLongTest() &&
+      !(wordsHaveTab() && getConfig.quickRestart === "tab") &&
+      !(wordsHaveNewline() && getConfig.quickRestart === "enter"),
+  }),
 );

frontend/src/ts/states/hotkeys.ts

@@ -28,14 +28,26 @@ createEffect(() => {
 
 function updateHotkeys(): Hotkeys {
   const isOnTestPage = getActivePage() === "test";
+
+  const quickRestartIsTab = getConfig.quickRestart === "tab";
+  const quickRestartIsEnter = getConfig.quickRestart === "enter";
+  // const quickRestartIsEsc = getConfig.quickRestart === "esc";
+
+  const commandlineIsTab = getConfig.quickRestart === "esc";
+  // const commandlineIsEsc = getConfig.quickRestart !== "esc";
+
   return {
     quickRestart: shiftHotkey(
       quickRestartHotkeyMap[getConfig.quickRestart],
-      isOnTestPage && (wordsHaveTab() || isLongTest()),
+      isOnTestPage &&
+        ((wordsHaveTab() && quickRestartIsTab) ||
+          ((wordsHaveNewline() || getConfig.funbox.includes("58008")) &&
+            quickRestartIsEnter) ||
+          isLongTest()),
     ),
     commandline: shiftHotkey(
-      getConfig.quickRestart === "esc" ? "Tab" : "Escape",
-      isOnTestPage && wordsHaveNewline(),
+      commandlineIsTab ? "Tab" : "Escape",
+      isOnTestPage && wordsHaveTab() && commandlineIsTab,
     ),
   };
 }