From ba64b9ddb71e4182a6048fecd3b87207d3cb2099 Mon Sep 17 00:00:00 2001
From: byseif21 <byseif21@gmail.com>
Date: Fri, 23 Jan 2026 17:00:31 +0200
Subject: [PATCH 1/5] fix: stuck hover on focus for header and restart button
 (@byseif21)

---
 frontend/src/styles/nav.scss  |  1 +
 frontend/src/styles/test.scss | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/src/styles/nav.scss b/frontend/src/styles/nav.scss
index 91c58ceb8ceb..283f1385fcc2 100644
--- a/frontend/src/styles/nav.scss
+++ b/frontend/src/styles/nav.scss
@@ -411,6 +411,7 @@ header {
   }
   //top focus
   &.focus {
+    pointer-events: none !important;
     color: var(--sub-color) !important;
 
     .notificationBubble {
diff --git a/frontend/src/styles/test.scss b/frontend/src/styles/test.scss
index d0064f2c7c24..0e7d3cb7946a 100644
--- a/frontend/src/styles/test.scss
+++ b/frontend/src/styles/test.scss
@@ -1541,14 +1541,12 @@
 }
 
 main.focus .pageTest {
-  #testModesNotice {
-    opacity: 0 !important;
-  }
-  #testConfig {
-    opacity: 0 !important;
-  }
-  #mobileTestConfigButton {
+  #testModesNotice,
+  #testConfig,
+  #mobileTestConfigButton,
+  #restartTestButton {
     opacity: 0 !important;
+    pointer-events: none !important;
   }
 }
 

From 584425ed9fec77bfd98a7d0048599797cdb91bed Mon Sep 17 00:00:00 2001
From: byseif21 <byseif21@gmail.com>
Date: Fri, 27 Feb 2026 22:02:42 +0200
Subject: [PATCH 2/5] cleanup

---
 frontend/src/styles/test.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/styles/test.scss b/frontend/src/styles/test.scss
index 0e7d3cb7946a..ae1c6ce5956a 100644
--- a/frontend/src/styles/test.scss
+++ b/frontend/src/styles/test.scss
@@ -1546,7 +1546,6 @@ main.focus .pageTest {
   #mobileTestConfigButton,
   #restartTestButton {
     opacity: 0 !important;
-    pointer-events: none !important;
   }
 }
 

From d867a8f857bf81597db10cc6e5211020caef75e0 Mon Sep 17 00:00:00 2001
From: byseif21 <byseif21@gmail.com>
Date: Tue, 3 Mar 2026 16:34:14 +0200
Subject: [PATCH 3/5] fix keyboard nav

---
 frontend/src/styles/test.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/styles/test.scss b/frontend/src/styles/test.scss
index 59cc8ed56d69..3d75fb78d1b9 100644
--- a/frontend/src/styles/test.scss
+++ b/frontend/src/styles/test.scss
@@ -1604,9 +1604,14 @@
 main.focus .pageTest {
   #testModesNotice,
   #testConfig,
-  #mobileTestConfigButton,
+  #mobileTestConfigButton {
+    opacity: 0 !important;
+  }
   #restartTestButton {
     opacity: 0 !important;
+    &:focus-visible {
+      opacity: 1 !important;
+    }
   }
 }
 

From 596b00d7e9b485fb0ec15002a152c23c4c444c1f Mon Sep 17 00:00:00 2001
From: byseif21 <byseif21@gmail.com>
Date: Thu, 5 Mar 2026 05:42:16 +0200
Subject: [PATCH 4/5] revert

---
 frontend/src/styles/nav.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/styles/nav.scss b/frontend/src/styles/nav.scss
index f4ca8cb8c542..e3c018f55bfe 100644
--- a/frontend/src/styles/nav.scss
+++ b/frontend/src/styles/nav.scss
@@ -411,7 +411,6 @@ header {
   }
   //top focus
   &.focus {
-    pointer-events: none !important;
     color: var(--sub-color) !important;
 
     .notificationBubble {

From ed559f6283f3b1095606c92d0a1c2215eca83ae0 Mon Sep 17 00:00:00 2001
From: byseif21 <byseif21@gmail.com>
Date: Thu, 5 Mar 2026 16:46:31 +0200
Subject: [PATCH 5/5] fix? accountMenu is not static anymore, try starting a
 test while hover on account button or it's list and see?

---
 frontend/src/ts/components/layout/header/Nav.tsx | 3 ++-
 frontend/src/ts/test/focus.ts                    | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/ts/components/layout/header/Nav.tsx b/frontend/src/ts/components/layout/header/Nav.tsx
index 79bd36f4a421..8434c527bbfe 100644
--- a/frontend/src/ts/components/layout/header/Nav.tsx
+++ b/frontend/src/ts/components/layout/header/Nav.tsx
@@ -149,7 +149,8 @@ export function Nav(): JSXElement {
             <div
               class={cn(
                 "relative",
-                "hover:**:data-[ui-element='accountMenu']:pointer-events-auto hover:**:data-[ui-element='accountMenu']:opacity-100",
+                !getFocus() &&
+                  "hover:**:data-[ui-element='accountMenu']:pointer-events-auto hover:**:data-[ui-element='accountMenu']:opacity-100",
                 "focus-within:**:data-[ui-element='accountMenu']:pointer-events-auto focus-within:**:data-[ui-element='accountMenu']:opacity-100",
               )}
             >
diff --git a/frontend/src/ts/test/focus.ts b/frontend/src/ts/test/focus.ts
index 0908543f6d6d..4ecc6c525d79 100644
--- a/frontend/src/ts/test/focus.ts
+++ b/frontend/src/ts/test/focus.ts
@@ -19,7 +19,6 @@ let cache: {
 function initializeCache(): void {
   if (cacheReady) return;
 
-  const cursorSelector = "body, button, a";
   const elementsSelector = [
     "app",
     "footer",
@@ -33,7 +32,6 @@ function initializeCache(): void {
     "#ad-footer-small-wrapper",
   ].join(",");
 
-  cache.cursor = qsa(cursorSelector);
   cache.focus = qsa(elementsSelector);
 
   cacheReady = true;
@@ -44,6 +42,7 @@ function initializeCache(): void {
 export function set(value: boolean, withCursor = false): void {
   requestDebouncedAnimationFrame("focus.set", () => {
     initializeCache();
+    cache.cursor = qsa("body, button, a");
 
     if (value && !getFocus()) {
       setFocus(true);
@@ -52,7 +51,7 @@ export function set(value: boolean, withCursor = false): void {
       if (cache.focus) {
         cache.focus.addClass("focus");
       }
-      if (!withCursor && cache.cursor) {
+      if (!withCursor && cache.cursor !== undefined) {
         cache.cursor.setStyle({ cursor: "none" });
       }
 
@@ -67,7 +66,7 @@ export function set(value: boolean, withCursor = false): void {
       if (cache.focus) {
         cache.focus.removeClass("focus");
       }
-      if (cache.cursor) {
+      if (cache.cursor !== undefined) {
         cache.cursor.setStyle({ cursor: "" });
       }