Merge branch 'master' into quotes

Author: Dhruv1249

frontend/package.json

@@ -31,7 +31,7 @@
     "@monkeytype/schemas": "workspace:*",
     "@monkeytype/util": "workspace:*",
     "@sentry/browser": "10.44.0",
-    "@sentry/vite-plugin": "3.3.1",
+    "@sentry/vite-plugin": "5.2.0",
     "@solid-devtools/overlay": "0.33.5",
     "@solid-primitives/refs": "1.1.2",
     "@solid-primitives/transition-group": "1.1.2",

frontend/src/ts/elements/custom-background-filter.ts

@@ -46,8 +46,8 @@ export function apply(): void {
     filter: filterCSS,
     width: `calc(100% + ${filters.blur.value * 4}rem)`,
     height: `calc(100% + ${filters.blur.value * 4}rem)`,
-    left: `-${filters.blur.value * 2}rem`,
-    top: `-${filters.blur.value * 2}rem`,
+    // left: `-${filters.blur.value * 2}rem`,
+    // top: `-${filters.blur.value * 2}rem`,
     position: "absolute",
   };
   qs(".customBackground img")?.setStyle(css);

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,
     ),
   };
 }

frontend/vite.config.ts

@@ -4,7 +4,6 @@ import {
   UserConfig,
   BuildEnvironmentOptions,
   PluginOption,
-  Plugin,
   CSSOptions,
 } from "vite";
 import path from "node:path";
@@ -181,15 +180,15 @@ function getPlugins({
       },
     }),
     useSentry
-      ? (sentryVitePlugin({
+      ? sentryVitePlugin({
           authToken: env["SENTRY_AUTH_TOKEN"],
           org: "monkeytype",
           project: "frontend",
           release: {
             name: clientVersion,
           },
           applicationKey: "monkeytype-frontend",
-        }) as Plugin)
+        })
       : null,
     injectPreload(),
     minifyJson(),