fix(layout emulator): automatically typing special characters when ca…

…ps lock is enabled actually closes #4743 this time
monkeytypegame · Oct 30, 2023 · dffbeda · dffbeda
1 parent 05fc903
commit dffbeda
Showing 1 changed file with 38 additions and 1 deletion.
diff --git a/frontend/src/ts/test/layout-emulator.ts b/frontend/src/ts/test/layout-emulator.ts
@@ -3,6 +3,37 @@ import * as Misc from "../utils/misc";
 import { capsState } from "./caps-warning";
 import * as Notifications from "../elements/notifications";
 
+function shouldCapslockUseSecondCharLocation(keyLocation: string): boolean {
+  return [
+    "KeyQ",
+    "KeyW",
+    "KeyE",
+    "KeyR",
+    "KeyT",
+    "KeyY",
+    "KeyU",
+    "KeyI",
+    "KeyO",
+    "KeyP",
+    "KeyA",
+    "KeyS",
+    "KeyD",
+    "KeyF",
+    "KeyG",
+    "KeyH",
+    "KeyJ",
+    "KeyK",
+    "KeyL",
+    "KeyZ",
+    "KeyX",
+    "KeyC",
+    "KeyV",
+    "KeyB",
+    "KeyN",
+    "KeyM",
+  ].includes(keyLocation);
+}
+
 export async function getCharFromEvent(
   event: JQuery.KeyDownEvent
 ): Promise<string | null> {
@@ -197,8 +228,14 @@ export async function getCharFromEvent(
       return null;
     }
   }
+
+  const capsSwap = shouldCapslockUseSecondCharLocation(event.code);
   const charIndex =
-    (capsState && !event.shiftKey) || (!capsState && event.shiftKey) ? 1 : 0;
+    (capsState && !event.shiftKey && capsSwap) ||
+    (capsState && event.shiftKey && !capsSwap) ||
+    (!capsState && event.shiftKey)
+      ? 1
+      : 0;
   const char = layoutMap[mapIndex][charIndex];
   if (char) {
     return char;