fix: close mobile sidebar before history back

static/app.js

@@ -2488,6 +2488,13 @@ function updateSidebarHeader() {
   updateSidebarExpandButton();
 }
 
+function sidebarHistoryRouteKey(rawUrl) {
+  const url = new URL(rawUrl, location.href);
+  const params = new URLSearchParams(url.search);
+  ["sidebar", "filters", "wide"].forEach(key => params.delete(key));
+  return url.origin + url.pathname + (params.toString() ? "?" + params.toString() : "");
+}
+
 function setSidebarExpanded(expanded) {
   if (!DOM.leftSidebar) return;
   DOM.leftSidebar.classList.toggle("expanded-wide", Boolean(expanded));
@@ -2530,13 +2537,9 @@ function handleSidebarBackNavigation(event) {
   }
   if (!STATE.isMobile || (!STATE.leftSidebarOpen && !STATE.rightSidebarOpen) || !sidebarHistoryActive)
     return false;
-  if (event.state?.voiceSidebarGuard) {
-    sidebarHistoryRoute = location.href;
-    return false;
-  }
+  if (sidebarHistoryRouteKey(sidebarHistoryRoute) !== sidebarHistoryRouteKey(location.href)) return false;
   sidebarHistoryActive = false;
   sidebarHistoryRoute = "";
-  ROUTER.apply();
   STATE.leftSidebarOpen = false;
   STATE.rightSidebarOpen = false;
   updateSidebarVisibility();

tests/test_browser.py

@@ -527,6 +527,23 @@ class BrowserInteractionTests(unittest.TestCase):
         finally:
             context.close()
 
+    def test_mobile_back_closes_drawer_before_restoring_route_history(self):
+        context, page, errors = self.open_page({"width": 390, "height": 844})
+        try:
+            page.goto(self.base_url + "/?sidebar=0", wait_until="domcontentloaded")
+            page.locator("#search-input").wait_for(state="visible")
+            page.locator("#hamburger-btn").click()
+            page.evaluate("ROUTER.navigate('repo', 'Test')")
+            page.wait_for_function("STATE.mode === 'repo' && STATE.leftSidebarOpen")
+            page.evaluate("history.back()")
+            page.wait_for_function("STATE.mode === 'repo' && !STATE.leftSidebarOpen")
+            self.assertIn("/Test", page.url)
+            page.evaluate("history.back()")
+            page.wait_for_function("STATE.mode === 'global'")
+            self.assertEqual(errors, [])
+        finally:
+            context.close()
+
     def test_mobile_back_closes_visible_drawer_before_leaving_search(self):
         context, page, errors = self.open_page({"width": 390, "height": 844})
         try: