rustdoc-search: fix back/forward interaction after reload

Author: notriddle

src/librustdoc/html/static/js/main.js

@@ -253,7 +253,7 @@ function preLoadCss(cssUrl) {
                 const out = nonnull(nonnull(window.searchState.outputElement()).parentElement);
                 const hdr = document.createElement("div");
                 hdr.className = "main-heading search-results-main-heading";
-                const params = searchState.getQueryStringParams();
+                const params = window.searchState.getQueryStringParams();
                 const autofocusParam = params.search === "" ? "autofocus" : "";
                 hdr.innerHTML = `<nav class="sub">
                     <form class="search-form">
@@ -429,6 +429,66 @@ function preLoadCss(cssUrl) {
                 };
             }
 
+            // Push and pop states are used to add search results to the browser
+            // history.
+            if (browserSupportsHistoryApi()) {
+                // Store the previous <title> so we can revert back to it later.
+                const previousTitle = document.title;
+
+                window.addEventListener("popstate", e => {
+                    const params = window.searchState.getQueryStringParams();
+                    // Revert to the previous title manually since the History
+                    // API ignores the title parameter.
+                    document.title = previousTitle;
+                    // Synchronize search bar with query string state and
+                    // perform the search. This will empty the bar if there's
+                    // nothing there, which lets you really go back to a
+                    // previous state with nothing in the bar.
+                    const inputElement = window.searchState.inputElement();
+                    if (params.search !== undefined && inputElement !== null) {
+                        loadSearch();
+                        inputElement.value = params.search;
+                        // Some browsers fire "onpopstate" for every page load
+                        // (Chrome), while others fire the event only when actually
+                        // popping a state (Firefox), which is why search() is
+                        // called both here and at the end of the startSearch()
+                        // function.
+                        e.preventDefault();
+                        window.searchState.showResults();
+                        if (params.search === "") {
+                            window.searchState.focus();
+                        }
+                    } else {
+                        // When browsing back from search results the main page
+                        // visibility must be reset.
+                        window.searchState.hideResults();
+                    }
+                });
+            }
+
+            // This is required in firefox to avoid this problem: Navigating to a search result
+            // with the keyboard, hitting enter, and then hitting back would take you back to
+            // the doc page, rather than the search that should overlay it.
+            // This was an interaction between the back-forward cache and our handlers
+            // that try to sync state between the URL and the search input. To work around it,
+            // do a small amount of re-init on page show.
+            window.onpageshow = () => {
+                const inputElement = window.searchState.inputElement();
+                const qSearch = window.searchState.getQueryStringParams().search;
+                if (qSearch !== undefined && inputElement !== null) {
+                    if (inputElement.value === "") {
+                        inputElement.value = qSearch;
+                    }
+                    window.searchState.showResults();
+                    if (qSearch === "") {
+                        loadSearch();
+                        window.searchState.focus();
+                    }
+                } else {
+                    window.searchState.hideResults();
+                }
+            };
+
             const params = window.searchState.getQueryStringParams();
             if (params.search !== undefined) {
                 window.searchState.setLoadingSearch();
@@ -1752,12 +1812,12 @@ function preLoadCss(cssUrl) {
     // tablets), it's fixed-position, appears in the left side margin,
     // and it can be activated by resizing the sidebar into nothing.
     let sidebarButton = document.getElementById("sidebar-button");
-    if (!sidebarButton) {
+    const body = document.querySelector(".main-heading");
+    if (!sidebarButton && body) {
         sidebarButton = document.createElement("div");
         sidebarButton.id = "sidebar-button";
         const path = `${window.rootPath}${window.currentCrate}/all.html`;
         sidebarButton.innerHTML = `<a href="${path}" title="show sidebar"></a>`;
-        const body = document.querySelector(".main-heading");
         body.insertBefore(sidebarButton, body.firstChild);
     }
     if (sidebarButton) {

src/librustdoc/html/static/js/search.js

@@ -5322,61 +5322,6 @@ function registerSearchEvents() {
     inputElement.addEventListener("focus", () => {
         putBackSearch();
     });
-
-    // Push and pop states are used to add search results to the browser
-    // history.
-    if (browserSupportsHistoryApi()) {
-        // Store the previous <title> so we can revert back to it later.
-        const previousTitle = document.title;
-
-        window.addEventListener("popstate", e => {
-            // @ts-expect-error
-            const params = searchState.getQueryStringParams();
-            // Revert to the previous title manually since the History
-            // API ignores the title parameter.
-            document.title = previousTitle;
-            // When browsing forward to search results the previous
-            // search will be repeated, so the currentResults are
-            // cleared to ensure the search is successful.
-            currentResults = null;
-            // Synchronize search bar with query string state and
-            // perform the search. This will empty the bar if there's
-            // nothing there, which lets you really go back to a
-            // previous state with nothing in the bar.
-            if (params.search !== undefined) {
-                inputElement.value = params.search;
-                // Some browsers fire "onpopstate" for every page load
-                // (Chrome), while others fire the event only when actually
-                // popping a state (Firefox), which is why search() is
-                // called both here and at the end of the startSearch()
-                // function.
-                e.preventDefault();
-                search();
-            } else {
-                // When browsing back from search results the main page
-                // visibility must be reset.
-                // @ts-expect-error
-                searchState.hideResults();
-            }
-        });
-    }
-
-    // This is required in firefox to avoid this problem: Navigating to a search result
-    // with the keyboard, hitting enter, and then hitting back would take you back to
-    // the doc page, rather than the search that should overlay it.
-    // This was an interaction between the back-forward cache and our handlers
-    // that try to sync state between the URL and the search input. To work around it,
-    // do a small amount of re-init on page show.
-    window.onpageshow = () => {
-        // @ts-expect-error
-        const qSearch = searchState.getQueryStringParams().search;
-        if (qSearch !== undefined) {
-            if (inputElement.value === "") {
-                inputElement.value = qSearch;
-            }
-            search();
-        }
-    };
 }
 
 // @ts-expect-error