From b84d5fb6afbb7410246eb21b74597b2009fd0e00 Mon Sep 17 00:00:00 2001
From: Aliaksandr Radzivanovich <aradzivanovich@gmail.com>
Date: Thu, 7 Nov 2024 22:33:55 +0100
Subject: [PATCH] feat: rework the typing test page

---
 .../lib/TypingTestPage.test.tsx               |  7 +--
 .../lib/components/LineTemplate.module.less   | 10 ---
 .../lib/components/LineTemplate.tsx           | 27 +-------
 .../lib/components/Replay.tsx                 |  4 +-
 .../{Progress.tsx => ReplayProgress.tsx}      |  6 +-
 .../lib/components/ReportScreen.tsx           |  5 +-
 .../lib/components/SettingsScreen.tsx         |  1 -
 .../lib/components/TestProgress.module.less   | 18 ++++++
 .../lib/components/TestProgress.tsx           | 34 ++++++++++
 .../lib/components/TestScreen.module.less     |  2 +
 .../lib/components/TestScreen.tsx             | 62 ++++++++++---------
 .../lib/components/Toolbar.tsx                | 22 +++----
 .../settings/TypingSettings.module.less       |  3 -
 .../settings/text/CommonWordsSettings.tsx     |  4 --
 .../page-typing-test/lib/session/session.ts   | 12 +++-
 15 files changed, 117 insertions(+), 100 deletions(-)
 rename packages/page-typing-test/lib/components/{Progress.tsx => ReplayProgress.tsx} (84%)
 create mode 100644 packages/page-typing-test/lib/components/TestProgress.module.less
 create mode 100644 packages/page-typing-test/lib/components/TestProgress.tsx
 delete mode 100644 packages/page-typing-test/lib/components/settings/TypingSettings.module.less

diff --git a/packages/page-typing-test/lib/TypingTestPage.test.tsx b/packages/page-typing-test/lib/TypingTestPage.test.tsx
index 965e9239d..d3dd2e356 100644
--- a/packages/page-typing-test/lib/TypingTestPage.test.tsx
+++ b/packages/page-typing-test/lib/TypingTestPage.test.tsx
@@ -4,10 +4,10 @@ import { KeyboardProvider } from "@keybr/keyboard";
 import { FakePhoneticModel } from "@keybr/phonetic-model";
 import { PhoneticModelLoader } from "@keybr/phonetic-model-loader";
 import { FakeSettingsContext } from "@keybr/settings";
-import { fireEvent, render } from "@testing-library/react";
+import { render } from "@testing-library/react";
 import { TypingTestPage } from "./TypingTestPage.tsx";
 
-test("render", async () => {
+test("render", () => {
   PhoneticModelLoader.loader = FakePhoneticModel.loader;
 
   const r = render(
@@ -20,8 +20,5 @@ test("render", async () => {
     </FakeIntlProvider>,
   );
 
-  fireEvent.click(await r.findByTitle("Settings", { exact: false }));
-  fireEvent.click(await r.findByTitle("Save settings", { exact: false }));
-
   r.unmount();
 });
diff --git a/packages/page-typing-test/lib/components/LineTemplate.module.less b/packages/page-typing-test/lib/components/LineTemplate.module.less
index 299512952..37d9388bf 100644
--- a/packages/page-typing-test/lib/components/LineTemplate.module.less
+++ b/packages/page-typing-test/lib/components/LineTemplate.module.less
@@ -1,13 +1,3 @@
 .line {
-  display: flex;
-  align-items: center;
   border-block-end: var(--separator-border);
 }
-
-.text {
-  flex: auto;
-}
-
-.stats {
-  text-align: end;
-}
diff --git a/packages/page-typing-test/lib/components/LineTemplate.tsx b/packages/page-typing-test/lib/components/LineTemplate.tsx
index 8ddac5e1d..0378db782 100644
--- a/packages/page-typing-test/lib/components/LineTemplate.tsx
+++ b/packages/page-typing-test/lib/components/LineTemplate.tsx
@@ -1,6 +1,5 @@
-import { formatDuration, Value } from "@keybr/widget";
 import { memo, type ReactNode } from "react";
-import { type Progress, type SessionLine } from "../session/index.ts";
+import { type SessionLine } from "../session/index.ts";
 import * as styles from "./LineTemplate.module.less";
 
 export const LineTemplate = memo(function LineTemplate({
@@ -8,26 +7,6 @@ export const LineTemplate = memo(function LineTemplate({
   progress,
 }: {
   readonly children: ReactNode;
-} & SessionLine): ReactNode {
-  return (
-    <div className={styles.line}>
-      <div className={styles.text}>{children}</div>
-      <div className={styles.stats}>{progress && <Stats {...progress} />}</div>
-    </div>
-  );
+} & SessionLine) {
+  return <div className={styles.line}>{children}</div>;
 });
-
-function Stats({ length, time, progress }: Progress): ReactNode {
-  return (
-    <>
-      <Value
-        value={formatDuration(time, { showMillis: true })}
-        title="Time passed."
-      />
-      {" / "}
-      <Value value={`${length}`} title="Characters inputted." />
-      {" / "}
-      <Value value={`${Math.floor(progress * 100)}%`} title="Progress made." />
-    </>
-  );
-}
diff --git a/packages/page-typing-test/lib/components/Replay.tsx b/packages/page-typing-test/lib/components/Replay.tsx
index 487d54395..2a859cd7d 100644
--- a/packages/page-typing-test/lib/components/Replay.tsx
+++ b/packages/page-typing-test/lib/components/Replay.tsx
@@ -12,8 +12,8 @@ import { Box, useDocumentVisibility } from "@keybr/widget";
 import { type ReactNode, useEffect, useMemo, useState } from "react";
 import { ReplayState, Session, type TestResult } from "../session/index.ts";
 import { useCompositeSettings } from "../settings.ts";
-import { Progress } from "./Progress.tsx";
 import * as styles from "./Replay.module.less";
+import { ReplayProgress } from "./ReplayProgress.tsx";
 
 export function Replay({
   result: { steps, events },
@@ -29,7 +29,7 @@ export function Replay({
   );
   return (
     <div className={styles.root}>
-      <Progress stepper={stepper} />
+      <ReplayProgress stepper={stepper} />
       <Box className={styles.text} alignItems="center" justifyContent="center">
         <StaticText settings={textDisplay} lines={lines} cursor={true} />
       </Box>
diff --git a/packages/page-typing-test/lib/components/Progress.tsx b/packages/page-typing-test/lib/components/ReplayProgress.tsx
similarity index 84%
rename from packages/page-typing-test/lib/components/Progress.tsx
rename to packages/page-typing-test/lib/components/ReplayProgress.tsx
index b248944b6..0af598331 100644
--- a/packages/page-typing-test/lib/components/Progress.tsx
+++ b/packages/page-typing-test/lib/components/ReplayProgress.tsx
@@ -8,9 +8,9 @@ import {
 import { useEffect, useState } from "react";
 import { type ReplayState } from "../session/index.ts";
 
-export function Progress({ stepper }: { readonly stepper: ReplayState }) {
+export function ReplayProgress({ stepper }: { readonly stepper: ReplayState }) {
   const { formatSpeed } = useFormatter();
-  const { progress, time } = useProgress(stepper);
+  const { progress, time } = useReplayProgress(stepper);
   return (
     <Para align="center">
       <NameValue
@@ -26,7 +26,7 @@ export function Progress({ stepper }: { readonly stepper: ReplayState }) {
   );
 }
 
-function useProgress(stepper: ReplayState) {
+function useReplayProgress(stepper: ReplayState) {
   const { state, progress } = stepper;
   const [time, setTime] = useState(0);
   useEffect(() => {
diff --git a/packages/page-typing-test/lib/components/ReportScreen.tsx b/packages/page-typing-test/lib/components/ReportScreen.tsx
index 57d4f97bb..c01435da6 100644
--- a/packages/page-typing-test/lib/components/ReportScreen.tsx
+++ b/packages/page-typing-test/lib/components/ReportScreen.tsx
@@ -137,7 +137,6 @@ export function ReportScreen({ result }: { readonly result: TestResult }) {
           <Button
             label="Next test"
             icon={<Icon shape={mdiSkipNext} />}
-            title="Try another test."
             onClick={handleNext}
           />
         </Field>
@@ -154,14 +153,12 @@ export function ReportScreen({ result }: { readonly result: TestResult }) {
 function Indicator({
   name,
   value,
-  title,
 }: {
   readonly name: ReactNode;
   readonly value: ReactNode;
-  readonly title?: string;
 }) {
   return (
-    <div className={styles.indicator} title={title}>
+    <div className={styles.indicator}>
       <div className={styles.indicatorValue}>
         <Value>{value}</Value>
       </div>
diff --git a/packages/page-typing-test/lib/components/SettingsScreen.tsx b/packages/page-typing-test/lib/components/SettingsScreen.tsx
index f902df1e3..5efaee718 100644
--- a/packages/page-typing-test/lib/components/SettingsScreen.tsx
+++ b/packages/page-typing-test/lib/components/SettingsScreen.tsx
@@ -43,7 +43,6 @@ export function SettingsScreen() {
             <Button
               icon={<Icon shape={mdiCheckCircle} />}
               label="Done"
-              title="Save settings and return to the test."
               onClick={() => {
                 setView("test");
               }}
diff --git a/packages/page-typing-test/lib/components/TestProgress.module.less b/packages/page-typing-test/lib/components/TestProgress.module.less
new file mode 100644
index 000000000..4d556a6c7
--- /dev/null
+++ b/packages/page-typing-test/lib/components/TestProgress.module.less
@@ -0,0 +1,18 @@
+.root {
+  position: relative;
+  background-color: var(--primary-l1);
+}
+
+.bar {
+  position: absolute;
+  inset-inline-start: 0;
+  inset-block-start: 0;
+  inset-block-end: 0;
+  background-color: var(--primary-d1);
+}
+
+.info {
+  position: relative;
+  inset: 0;
+  text-align: center;
+}
diff --git a/packages/page-typing-test/lib/components/TestProgress.tsx b/packages/page-typing-test/lib/components/TestProgress.tsx
new file mode 100644
index 000000000..bf3326188
--- /dev/null
+++ b/packages/page-typing-test/lib/components/TestProgress.tsx
@@ -0,0 +1,34 @@
+import { useIntlNumbers } from "@keybr/intl";
+import { useFormatter } from "@keybr/lesson-ui";
+import { formatDuration, Para, Value, withDeferred } from "@keybr/widget";
+import { memo } from "react";
+import { type Progress } from "../session/index.ts";
+import * as styles from "./TestProgress.module.less";
+
+export const TestProgress0 = memo(function TestProgress({
+  progress: { length, time, progress, speed },
+}: {
+  readonly progress: Progress;
+}) {
+  const { formatNumber, formatPercents } = useIntlNumbers();
+  const { formatSpeed } = useFormatter();
+  return (
+    <Para className={styles.root}>
+      <div
+        className={styles.bar}
+        style={{ inlineSize: `${Math.floor(progress * 100)}%` }}
+      />
+      <div className={styles.info}>
+        <Value value={formatDuration(time, { showMillis: true })} />
+        {" / "}
+        <Value value={formatNumber(length)} />
+        {" / "}
+        <Value value={formatPercents(progress)} />
+        {" / "}
+        <Value value={formatSpeed(speed)} />
+      </div>
+    </Para>
+  );
+});
+
+export const TestProgress = withDeferred(TestProgress0);
diff --git a/packages/page-typing-test/lib/components/TestScreen.module.less b/packages/page-typing-test/lib/components/TestScreen.module.less
index 0c17d3526..c7de45b67 100644
--- a/packages/page-typing-test/lib/components/TestScreen.module.less
+++ b/packages/page-typing-test/lib/components/TestScreen.module.less
@@ -1,5 +1,7 @@
 .text {
+  max-inline-size: 60rem;
   margin: -1rem;
   padding: 1rem;
+  overflow: hidden;
   backdrop-filter: blur(10px);
 }
diff --git a/packages/page-typing-test/lib/components/TestScreen.tsx b/packages/page-typing-test/lib/components/TestScreen.tsx
index 23972b6a2..5165708f6 100644
--- a/packages/page-typing-test/lib/components/TestScreen.tsx
+++ b/packages/page-typing-test/lib/components/TestScreen.tsx
@@ -1,7 +1,7 @@
 import { Screen } from "@keybr/pages-shared";
 import { type LineList, makeStats } from "@keybr/textinput";
 import { TextArea } from "@keybr/textinput-ui";
-import { type Focusable, Spacer, useView } from "@keybr/widget";
+import { Box, type Focusable, Spacer, useView } from "@keybr/widget";
 import { useEffect, useRef, useState } from "react";
 import {
   type TextGenerator,
@@ -11,6 +11,7 @@ import { Session, type TestResult } from "../session/index.ts";
 import { type CompositeSettings, useCompositeSettings } from "../settings.ts";
 import { views } from "../views.tsx";
 import { LineTemplate } from "./LineTemplate.tsx";
+import { TestProgress } from "./TestProgress.tsx";
 import * as styles from "./TestScreen.module.less";
 import { Toolbar } from "./Toolbar.tsx";
 
@@ -34,10 +35,9 @@ function Controller({
   const { setView } = useView(views);
   const settings = useCompositeSettings();
   const focusRef = useRef<Focusable>(null);
-  const [session, setSession] = useState<Session>(() =>
-    nextTest(settings, generator),
-  );
+  const [session, setSession] = useState(() => nextTest(settings, generator));
   const [lines, setLines] = useState<LineList>(Session.emptyLines);
+  const [progress, setProgress] = useState(Session.emptyProgress);
   useEffect(() => {
     generator.reset(mark);
     const session = nextTest(settings, generator);
@@ -55,36 +55,40 @@ function Controller({
         }}
       />
       <Spacer size={10} />
-      <div className={styles.text}>
-        <TextArea
-          focusRef={focusRef}
-          settings={settings.textDisplay}
-          lines={lines}
-          wrap={false}
-          onFocus={() => {
-            generator.reset(mark);
-            const session = nextTest(settings, generator);
-            setSession(session);
-            setLines(session.getLines());
-          }}
-          onKeyDown={session.handleKeyDown}
-          onKeyUp={session.handleKeyUp}
-          onInput={(event) => {
-            const { completed } = session.handleInput(event);
-            setLines(session.getLines());
-            if (completed) {
-              setView("report", { result: makeResult(session) });
-            }
-          }}
-          lineTemplate={LineTemplate}
-        />
-      </div>
+      <Box alignItems="center" justifyContent="center">
+        <div className={styles.text}>
+          <TextArea
+            focusRef={focusRef}
+            settings={settings.textDisplay}
+            lines={lines}
+            wrap={false}
+            onFocus={() => {
+              generator.reset(mark);
+              const session = nextTest(settings, generator);
+              setSession(session);
+              setLines(session.getLines());
+            }}
+            onKeyDown={session.handleKeyDown}
+            onKeyUp={session.handleKeyUp}
+            onInput={(event) => {
+              const { progress, completed } = session.handleInput(event);
+              setLines(session.getLines());
+              setProgress(progress);
+              if (completed) {
+                setView("report", { result: makeResult(session) });
+              }
+            }}
+            lineTemplate={LineTemplate}
+          />
+          <TestProgress progress={progress} />
+        </div>
+      </Box>
     </Screen>
   );
 }
 
 function nextTest(settings: CompositeSettings, generator: TextGenerator) {
-  return new Session({ ...settings, numLines: 7, numCols: 55 }, generator);
+  return new Session({ ...settings, numLines: 5, numCols: 55 }, generator);
 }
 
 function makeResult(session: Session): TestResult {
diff --git a/packages/page-typing-test/lib/components/Toolbar.tsx b/packages/page-typing-test/lib/components/Toolbar.tsx
index 3d7a86aba..0e0494f5a 100644
--- a/packages/page-typing-test/lib/components/Toolbar.tsx
+++ b/packages/page-typing-test/lib/components/Toolbar.tsx
@@ -16,17 +16,14 @@ export const Toolbar = memo(function Toolbar({
 }): ReactNode {
   return (
     <FieldList>
+      <Field.Filler />
       <Field>
         <DurationSwitcher onChange={onChange} />
       </Field>
-      <Field.Filler />
       <Field>
-        <IconButton
-          icon={<Icon shape={mdiCog} />}
-          title="Settings..."
-          onClick={onConfigure}
-        />
+        <IconButton icon={<Icon shape={mdiCog} />} onClick={onConfigure} />
       </Field>
+      <Field.Filler />
     </FieldList>
   );
 });
@@ -35,11 +32,12 @@ export const DurationSwitcher = memo(function DurationSwitcher({
   onChange,
 }: {
   readonly onChange: () => void;
-}): ReactNode {
+}) {
   const { settings, updateSettings } = useSettings();
   const compositeSettings = toCompositeSettings(settings);
   const children: ReactNode[] = [];
-  durations.forEach(({ duration, label }, index) => {
+  for (let index = 0; index < durations.length; index++) {
+    const { duration, label } = durations[index];
     if (index > 0) {
       children.push(<span key={children.length}>{" | "}</span>);
     }
@@ -66,10 +64,6 @@ export const DurationSwitcher = memo(function DurationSwitcher({
         {label}
       </Link>,
     );
-  });
-  return (
-    <>
-      <span>Test duration:</span> {children}
-    </>
-  );
+  }
+  return <>{children}</>;
 });
diff --git a/packages/page-typing-test/lib/components/settings/TypingSettings.module.less b/packages/page-typing-test/lib/components/settings/TypingSettings.module.less
deleted file mode 100644
index 5b9e43038..000000000
--- a/packages/page-typing-test/lib/components/settings/TypingSettings.module.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.demoText {
-  border-block-end: var(--separator-border);
-}
diff --git a/packages/page-typing-test/lib/components/settings/text/CommonWordsSettings.tsx b/packages/page-typing-test/lib/components/settings/text/CommonWordsSettings.tsx
index 07dadbbff..19aea4189 100644
--- a/packages/page-typing-test/lib/components/settings/text/CommonWordsSettings.tsx
+++ b/packages/page-typing-test/lib/components/settings/text/CommonWordsSettings.tsx
@@ -81,10 +81,6 @@ function Content({ wordList }: { readonly wordList: WordList }): ReactNode {
             max={typingTestProps.wordList.wordListSize.max}
             step={1}
             value={settings.get(typingTestProps.wordList.wordListSize)}
-            title={formatMessage({
-              id: "settings.wordListSize.description",
-              defaultMessage: "Chose how many common words to use.",
-            })}
             onChange={(value) => {
               updateSettings(
                 settings.set(typingTestProps.wordList.wordListSize, value),
diff --git a/packages/page-typing-test/lib/session/session.ts b/packages/page-typing-test/lib/session/session.ts
index c3f52f939..4755d1686 100644
--- a/packages/page-typing-test/lib/session/session.ts
+++ b/packages/page-typing-test/lib/session/session.ts
@@ -19,7 +19,17 @@ import {
 } from "./types.ts";
 
 export class Session {
-  static readonly emptyLines = { text: "", lines: [] } satisfies SessionLines;
+  static readonly emptyLines = {
+    text: "",
+    lines: [],
+  } satisfies SessionLines;
+  static readonly emptyProgress = {
+    time: 0,
+    length: 0,
+    progress: 0,
+    speed: 0,
+  } satisfies Progress;
+
   /** A list of events to replay. */
   #events: AnyEvent[] = [];
   /** The currently visible lines. */