From 309d17740e1c9007254b8e7e78eeb87bedaf72aa Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 12 May 2025 17:15:12 +0200
Subject: [PATCH] wip #7462 @2

---
 js/libs/fluidbook/fluidbook.accessibility.js | 2 +-
 js/libs/fluidbook/fluidbook.burger.js        | 4 ++--
 js/libs/fluidbook/fluidbook.keyboard.js      | 3 +++
 js/libs/fluidbook/fluidbook.menu.js          | 1 -
 style/accessibility.less                     | 4 ++++
 style/burger.less                            | 6 +++++-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.accessibility.js b/js/libs/fluidbook/fluidbook.accessibility.js
index 9958e3ca..5d39ec51 100644
--- a/js/libs/fluidbook/fluidbook.accessibility.js
+++ b/js/libs/fluidbook/fluidbook.accessibility.js
@@ -72,7 +72,7 @@ FluidbookAccessibility.prototype = {
     // Using mousedown instead of mouseover, so that previously focused elements don't lose focus ring on mouse move
     add_event_listener('mousedown', function () {
         $('body').removeClass('keyboard-navigating');
-        set_css(':focus{outline:0}::-moz-focus-inner{border:0;}');
+        set_css(':focus{outline:0;border-inline:0;}::-moz-focus-inner{border:0;border-inline:0;}');
     });
 
     add_event_listener('keydown', function (e) {
diff --git a/js/libs/fluidbook/fluidbook.burger.js b/js/libs/fluidbook/fluidbook.burger.js
index 8f2f9f0e..5b00db45 100644
--- a/js/libs/fluidbook/fluidbook.burger.js
+++ b/js/libs/fluidbook/fluidbook.burger.js
@@ -305,8 +305,8 @@ FluidbookBurger.prototype = {
 
         var $this = this;
         var res = '<form action="#" id="searchForm" method="post">';
-        res += '<input id="q" name="q" type="search" value="" tabindex="2" placeholder="' + this.fluidbook.l10n.__('search') + '" autocorrect="off" autocomplete="off" autocapitalize="off" />';
-        res += '<a href="#" id="submitSearch" class="icon-submitSearch" role="button" tabindex="1"><svg viewBox="0 0 512 512" class="nav-search nav-icon svg-icon" aria-hidden="true"><use xlink:href="#nav-search"></use></svg></a>';
+        res += '<input id="q" name="q" type="search" value="" placeholder="' + this.fluidbook.l10n.__('search') + '" autocorrect="off" autocomplete="off" autocapitalize="off" />';
+        res += '<a href="#" id="submitSearch" class="icon-submitSearch" role="button" tabindex="-1"><svg viewBox="0 0 512 512" class="nav-search nav-icon svg-icon" aria-hidden="true"><use xlink:href="#nav-search"></use></svg></a>';
         res += '</form>';
         res += '<div id="menuSearchHints" class="mm-nopanel"></div>';
         res += '<div id="menuSearchResults" class="mm-nopanel"></div>';
diff --git a/js/libs/fluidbook/fluidbook.keyboard.js b/js/libs/fluidbook/fluidbook.keyboard.js
index 5f406372..f47bdf02 100644
--- a/js/libs/fluidbook/fluidbook.keyboard.js
+++ b/js/libs/fluidbook/fluidbook.keyboard.js
@@ -95,6 +95,9 @@ FluidbookKeyboard.prototype = {
         var elements = $(selector).find(focusableElementsString);
         var list = [];
         $(elements).each(function () {
+            if ($(this).attr('tabindex') == '-1') {
+                return;
+            }
             if ($(this).parents('[tabindex="-1"],.ignore-tab-children').length === 0 && $(this).is(':visible')) {
                 list.push(this);
             }
diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index cc6cf39c..adadf618 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -1332,7 +1332,6 @@ FluidbookMenu.prototype = {
                 $($this).addClass('visible');
                 menu.fluidbook.hideLoader();
             }, 500);
-
         });
     },
 };
diff --git a/style/accessibility.less b/style/accessibility.less
index 796a34c0..7eb96a72 100644
--- a/style/accessibility.less
+++ b/style/accessibility.less
@@ -60,4 +60,8 @@
 
 #q:focus {
   outline: 0;
+
+  .using-keyboard & {
+    border-color: #c00;
+  }
 }
\ No newline at end of file
diff --git a/style/burger.less b/style/burger.less
index 6c1d5b19..7896916d 100644
--- a/style/burger.less
+++ b/style/burger.less
@@ -271,16 +271,20 @@ html.mm-opening .mm-menu.mm-opened[class*=mm-pagedim] ~ #mm-blocker {
 #q {
   background-color: @menu-field-background;
   color: @menu-field-text;
-  border: none;
   border-radius: 0;
   height: 60px;
   font-size: 16px;
   padding: 0 1em 0 70px;
   width: 260px;
+  border: transparent 6px solid;
 
   .rtl & {
     padding: 0 70px 0 1em;
   }
+
+  &:focus{
+
+  }
 }
 
 #submitSearch {
-- 
2.39.5