From 36b1de5efcae3f3f82e6abbcb635b0727fc7e9b0 Mon Sep 17 00:00:00 2001
From: Frank419 <hufang2007@icloud.com>
Date: Wed, 28 Aug 2024 10:13:28 +0800
Subject: [PATCH] Improved focus trapping. Focus trapping now also happens
 backwards.

---
 header.php | 1 +
 js/menu.js | 3 +++
 style.css  | 7 ++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/header.php b/header.php
index 4c6ea13..b39c2c3 100644
--- a/header.php
+++ b/header.php
@@ -89,6 +89,7 @@ $label = get_theme_mod( 'minimalistflex_header_label' );
         </h1>
     <?php endif; ?>
     <div class="spacer"></div>
+    <a id="minimalistflex-menu-focus-hack-2" href="#minimalistflex-menu-focus-hack-2" aria-label="<?php esc_attr_e( 'This element sends you to the last menu item.', 'minimalistflex' ) ?>"></a>
     <?php if ( has_nav_menu( 'main-menu' ) ): ?>
         <button id="menu-toggle" aria-label="<?php esc_attr_e( 'Toggle navigation dropdown', 'minimalistflex' ) ?>">
             <i id="menu-toggle-icon"></i>
diff --git a/js/menu.js b/js/menu.js
index 007d7ae..04e710a 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -15,4 +15,7 @@ jQuery(document).ready(function($){
     $("#minimalistflex-menu-focus-hack").focus(function(){
         $("#menu-toggle").focus()
     })
+    $("#minimalistflex-menu-focus-hack-2").focus(function(){
+        $(".minimalistflex-menu").find(".menu-item:last").children("a").focus()
+    })
 })
\ No newline at end of file
diff --git a/style.css b/style.css
index 0ca548a..04c0c82 100644
--- a/style.css
+++ b/style.css
@@ -356,7 +356,8 @@ a[target=_blank]::before {
     margin-top: 0.5em;
 }
 
-#minimalistflex-menu-focus-hack {
+#minimalistflex-menu-focus-hack,
+#minimalistflex-menu-focus-hack-2 {
     display: none;
 }
 
@@ -1518,6 +1519,10 @@ a img.alignwide {
         display: inline;
     }
 
+    .active #minimalistflex-menu-focus-hack-2 {
+        display: inline;
+    }
+
     .minimalistflex-menu ul {
         flex-direction: column;
     }