fix: nospace and newline word navigation issues (@Leonabcd123)

frontend/__tests__/input/helpers/fail-or-finish.spec.ts

@@ -139,15 +139,15 @@ describe("checkIfFailedDueToDifficulty", () => {
       desc: "zen mode, master - never fails",
       config: { mode: "zen", difficulty: "master" },
       correct: false,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: "hello",
       expected: false,
     },
     {
       desc: "zen mode - never fails",
       config: { mode: "zen", difficulty: "normal" },
       correct: false,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: "hello",
       expected: false,
     },
@@ -156,31 +156,31 @@ describe("checkIfFailedDueToDifficulty", () => {
       desc: "normal typing incorrect- never fails",
       config: { difficulty: "normal" },
       correct: false,
-      spaceOrNewline: false,
+      isCommitChar: false,
       input: "hello",
       expected: false,
     },
     {
       desc: "normal typing space incorrect - never fails",
       config: { difficulty: "normal" },
       correct: false,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: "hello",
       expected: false,
     },
     {
       desc: "normal typing correct - never fails",
       config: { difficulty: "normal" },
       correct: true,
-      spaceOrNewline: false,
+      isCommitChar: false,
       input: "hello",
       expected: false,
     },
     {
       desc: "normal typing space correct - never fails",
       config: { difficulty: "normal" },
       correct: true,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: "hello",
       expected: false,
     },
@@ -189,31 +189,31 @@ describe("checkIfFailedDueToDifficulty", () => {
       desc: "expert - fail if incorrect space",
       config: { difficulty: "expert" },
       correct: false,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: "he",
       expected: true,
     },
     {
       desc: "expert - dont fail if space is the first character",
       config: { difficulty: "expert" },
       correct: false,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: " ",
       expected: false,
     },
     {
       desc: "expert: - dont fail if just typing",
       config: { difficulty: "expert" },
       correct: false,
-      spaceOrNewline: false,
+      isCommitChar: false,
       input: "h",
       expected: false,
     },
     {
       desc: "expert: - dont fail if just typing",
       config: { difficulty: "expert" },
       correct: true,
-      spaceOrNewline: false,
+      isCommitChar: false,
       input: "h",
       expected: false,
     },
@@ -222,40 +222,40 @@ describe("checkIfFailedDueToDifficulty", () => {
       desc: "master - fail if incorrect char",
       config: { difficulty: "master" },
       correct: false,
-      spaceOrNewline: false,
+      isCommitChar: false,
       input: "h",
       expected: true,
     },
     {
       desc: "master - fail if incorrect first space",
       config: { difficulty: "master" },
       correct: true,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: " ",
       expected: false,
     },
     {
       desc: "master - dont fail if correct char",
       config: { difficulty: "master" },
       correct: true,
-      spaceOrNewline: false,
+      isCommitChar: false,
       input: "a",
       expected: false,
     },
     {
       desc: "master - dont fail if correct space",
       config: { difficulty: "master" },
       correct: true,
-      spaceOrNewline: true,
+      isCommitChar: true,
       input: " ",
       expected: false,
     },
-  ])("$desc", ({ config, correct, spaceOrNewline, input, expected }) => {
+  ])("$desc", ({ config, correct, isCommitChar, input, expected }) => {
     replaceConfig(config as any);
     const result = checkIfFailedDueToDifficulty({
       testInputWithData: input,
       correct,
-      spaceOrNewline,
+      isCommitChar,
     });
     expect(result).toBe(expected);
   });

frontend/__tests__/input/helpers/validation.spec.ts

@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach, afterAll } from "vitest";
 import {
   isCharCorrect,
   isWordCorrect,
-  shouldInsertSpaceCharacter,
+  shouldJumpToNextWord,
 } from "../../../src/ts/input/helpers/validation";
 import { __testing } from "../../../src/ts/config/testing";
 import * as FunboxList from "../../../src/ts/test/funbox/list";
@@ -13,6 +13,7 @@ const { replaceConfig } = __testing;
 // Mock dependencies
 vi.mock("../../../src/ts/test/funbox/list", () => ({
   findSingleActiveFunboxWithFunction: vi.fn(),
+  isFunboxActiveWithProperty: vi.fn(),
 }));
 
 vi.mock("../../../src/ts/utils/strings", async () => {
@@ -155,7 +156,7 @@ describe("isCharCorrect", () => {
   });
 });
 
-describe("shouldInsertSpaceCharacter", () => {
+describe("shouldJumpToNextWord", () => {
   beforeEach(() => {
     replaceConfig({
       mode: "time",
@@ -169,20 +170,10 @@ describe("shouldInsertSpaceCharacter", () => {
     replaceConfig({});
   });
 
-  it("returns null if data is not a space", () => {
-    expect(
-      shouldInsertSpaceCharacter({
-        data: "a",
-        inputValue: "test",
-        targetWord: "test",
-      }),
-    ).toBe(null);
-  });
-
   it("returns false in zen mode", () => {
     replaceConfig({ mode: "zen" });
     expect(
-      shouldInsertSpaceCharacter({
+      shouldJumpToNextWord({
         data: " ",
         inputValue: "test",
         targetWord: "test",
@@ -202,7 +193,7 @@ describe("shouldInsertSpaceCharacter", () => {
           strictSpace: false,
           difficulty: "normal",
         },
-        expected: false,
+        expected: true,
       },
       {
         desc: "submit incorrect word (stopOnError off)",
@@ -213,30 +204,30 @@ describe("shouldInsertSpaceCharacter", () => {
           strictSpace: false,
           difficulty: "normal",
         },
-        expected: false,
+        expected: true,
       },
       // Stop on error
       {
-        desc: "insert space if incorrect (stopOnError letter)",
+        desc: "not submit if incorrect (stopOnError letter)",
         inputValue: "hel",
         targetWord: "hello",
         config: {
           stopOnError: "letter",
           strictSpace: false,
           difficulty: "normal",
         },
-        expected: true,
+        expected: false,
       },
       {
-        desc: "insert space if incorrect (stopOnError word)",
+        desc: "not submit if incorrect (stopOnError word)",
         inputValue: "hel",
         targetWord: "hello",
         config: {
           stopOnError: "word",
           strictSpace: false,
           difficulty: "normal",
         },
-        expected: true,
+        expected: false,
       },
       {
         desc: "submit if correct (stopOnError letter)",
@@ -247,30 +238,30 @@ describe("shouldInsertSpaceCharacter", () => {
           strictSpace: false,
           difficulty: "normal",
         },
-        expected: false,
+        expected: true,
       },
       // Strict space / Difficulty
       {
-        desc: "insert space if empty input (strictSpace on)",
+        desc: "not submit if empty input (strictSpace on)",
         inputValue: "",
         targetWord: "hello",
         config: {
           stopOnError: "off",
           strictSpace: true,
           difficulty: "normal",
         },
-        expected: true,
+        expected: false,
       },
       {
-        desc: "insert space if empty input (difficulty not normal - expert or master)",
+        desc: "not submit if empty input (difficulty not normal - expert or master)",
         inputValue: "",
         targetWord: "hello",
         config: {
           stopOnError: "off",
           strictSpace: false,
           difficulty: "expert",
         },
-        expected: true,
+        expected: false,
       },
       {
         desc: "submit if not empty input (strictSpace on)",
@@ -281,12 +272,12 @@ describe("shouldInsertSpaceCharacter", () => {
           strictSpace: true,
           difficulty: "normal",
         },
-        expected: false,
+        expected: true,
       },
     ])("$desc", ({ inputValue, targetWord, config, expected }) => {
       replaceConfig(config as any);
       expect(
-        shouldInsertSpaceCharacter({
+        shouldJumpToNextWord({
           data: " ",
           inputValue,
           targetWord,

frontend/src/ts/input/handlers/before-insert-text.ts

@@ -7,7 +7,7 @@ import { isFunboxActiveWithProperty } from "../../test/funbox/list";
 import { isSpace } from "../../utils/strings";
 import { getInputElementValue } from "../input-element";
 import { isAwaitingNextWord } from "../state";
-import { shouldInsertSpaceCharacter } from "../helpers/validation";
+import { shouldJumpToNextWord } from "../helpers/validation";
 import * as SlowTimer from "../../legacy-states/slow-timer";
 import { wordsHaveNewline } from "../../states/test";
 
@@ -31,11 +31,6 @@ export function onBeforeInsertText(data: string): boolean {
 
   const { inputValue } = getInputElementValue();
   const dataIsSpace = isSpace(data);
-  const shouldInsertSpaceAsCharacter = shouldInsertSpaceCharacter({
-    data,
-    inputValue,
-    targetWord: TestWords.words.getCurrentText(),
-  });
 
   //prevent space from being inserted if input is empty
   //allow if strict space is enabled
@@ -58,11 +53,17 @@ export function onBeforeInsertText(data: string): boolean {
     return true;
   }
 
+  const shouldGoToNextWord = shouldJumpToNextWord({
+    data,
+    inputValue,
+    targetWord: TestWords.words.getCurrentText(),
+  });
+
   // block input if the word is too long
   const inputLimit =
     Config.mode === "zen" ? 30 : TestWords.words.getCurrentText().length + 20;
   const overLimit = getCurrentInput().length >= inputLimit;
-  if (overLimit && (shouldInsertSpaceAsCharacter === true || !dataIsSpace)) {
+  if (overLimit && !shouldGoToNextWord) {
     console.error("Hitting word limit");
     return true;
   }
@@ -79,7 +80,7 @@ export function onBeforeInsertText(data: string): boolean {
     !Config.blindMode &&
     !Config.hideExtraLetters &&
     inputIsLongerThanOrEqualToWord &&
-    (shouldInsertSpaceAsCharacter === true || !dataIsSpace) &&
+    !shouldGoToNextWord &&
     Config.mode !== "zen"
   ) {
     // make sure to only check this when really necessary