[pull] master from monkeytypegame:master

frontend/src/ts/modals/quote-approve.ts

@@ -4,6 +4,7 @@ import * as Notifications from "../elements/notifications";
 import { format } from "date-fns/format";
 import AnimatedModal, { ShowOptions } from "../utils/animated-modal";
 import { Quote } from "@monkeytype/schemas/quotes";
+import { escapeHTML } from "../utils/misc";
 
 let quotes: Quote[] = [];
 
@@ -12,10 +13,10 @@ function updateList(): void {
   quotes.forEach((quote, index) => {
     const quoteEl = $(`
       <div class="quote" data-id="${index}" data-db-id="${quote._id}">
-        <textarea class="text">${quote.text}</textarea>
-        <input type="text" class="source" placeholder="Source" value="${
-          quote.source
-        }">
+        <textarea class="text">${escapeHTML(quote.text)}</textarea>
+        <input type="text" class="source" placeholder="Source" value="${escapeHTML(
+          quote.source,
+        )}">
         <div class="buttons">
           <button disabled class="textButton undo" aria-label="Undo changes" data-balloon-pos="left"><i class="fas fa-fw fa-undo-alt"></i></button>
           <button class="textButton refuse" aria-label="Refuse quote" data-balloon-pos="left"><i class="fas fa-fw fa-times"></i></button>

frontend/src/ts/test/test-ui.ts

@@ -26,7 +26,10 @@ import {
 } from "./funbox/list";
 import * as TestState from "./test-state";
 import * as PaceCaret from "./pace-caret";
-import { requestDebouncedAnimationFrame } from "../utils/debounced-animation-frame";
+import {
+  cancelPendingAnimationFramesStartingWith,
+  requestDebouncedAnimationFrame,
+} from "../utils/debounced-animation-frame";
 import * as SoundController from "../controllers/sound-controller";
 import * as Numbers from "@monkeytype/util/numbers";
 import * as TestStats from "./test-stats";
@@ -165,6 +168,7 @@ export function setResultCalculating(val: boolean): void {
 
 export function reset(): void {
   currentTestLine = 0;
+  cancelPendingAnimationFramesStartingWith("test-ui");
 }
 
 export function focusWords(force = false): void {
@@ -254,7 +258,14 @@ export function updateActiveElement(
       void scrollTape();
     }
 
-    if (!Config.showAllLines && previousActiveWordTop !== null) {
+    if (previousActiveWordTop === null) return;
+
+    const isTimedTest =
+      Config.mode === "time" ||
+      (Config.mode === "custom" && CustomText.getLimitMode() === "time") ||
+      (Config.mode === "custom" && CustomText.getLimitValue() === 0);
+
+    if (isTimedTest || !Config.showAllLines) {
       const newActiveWordTop = newActiveWord.offsetTop;
       if (newActiveWordTop > previousActiveWordTop) {
         void lineJump(previousActiveWordTop);

frontend/src/ts/utils/debounced-animation-frame.ts

@@ -19,3 +19,15 @@ function cancelIfPending(frameId: string): void {
     pendingFrames.delete(frameId);
   }
 }
+
+export function cancelPendingAnimationFrame(frameId: string): void {
+  cancelIfPending(frameId);
+}
+
+export function cancelPendingAnimationFramesStartingWith(prefix: string): void {
+  for (const frameId of pendingFrames.keys()) {
+    if (frameId.startsWith(prefix)) {
+      cancelIfPending(frameId);
+    }
+  }
+}

frontend/vite-plugins/env-config.ts

@@ -1,5 +1,10 @@
 import { Plugin } from "vite";
 import { EnvConfig } from "virtual:env-config";
+import { config as dotenvConfig } from "dotenv";
+
+const envFile =
+  process.env["NODE_ENV"] === "production" ? ".env.production" : ".env";
+dotenvConfig({ path: envFile });
 
 const virtualModuleId = "virtual:env-config";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;