@easyops-cn/docusaurus-search-local 0.27.0 → 0.28.0-alpha.1

package/dist/client/client/theme/SearchBar/SearchBar.jsx

@@ -4,7 +4,8 @@ import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
 import ExecutionEnvironment from "@docusaurus/ExecutionEnvironment";
 import { useHistory, useLocation } from "@docusaurus/router";
 import { translate } from "@docusaurus/Translate";
-import { useActiveVersion } from '@docusaurus/plugin-content-docs/client';
+import { useDocsPreferredVersion } from '@docusaurus/theme-common';
+import { useActivePlugin } from '@docusaurus/plugin-content-docs/client';
 import { fetchIndexes } from "./fetchIndexes";
 import { SearchSourceFactory } from "../../utils/SearchSourceFactory";
 import { SuggestionTemplate } from "./SuggestionTemplate";
@@ -28,9 +29,16 @@ async function fetchAutoCompleteJS() {
 const SEARCH_PARAM_HIGHLIGHT = "_highlight";
 export default function SearchBar({ handleSearchBarToggle, }) {
     let { siteConfig: { baseUrl }, } = useDocusaurusContext();
-    const activeVersion = useActiveVersion();
-    if (activeVersion && !activeVersion.isLast) {
-        baseUrl = activeVersion.path + "/";
+    // It returns undefined for non-docs pages
+    const activePlugin = useActivePlugin();
+    let versionUrl = baseUrl;
+    // For non-docs pages while using plugin-content-docs with custom ids,
+    // this will throw an error of:
+    //   > Docusaurus plugin global data not found for "docusaurus-plugin-content-docs" plugin with id "default".
+    // It seems that we can not get the correct id for non-docs pages.
+    const { preferredVersion } = useDocsPreferredVersion(activePlugin?.pluginId);
+    if (preferredVersion && !preferredVersion.isLast) {
+        versionUrl = preferredVersion.path + "/";
     }
     const history = useHistory();
     const location = useLocation();
@@ -50,7 +58,7 @@ export default function SearchBar({ handleSearchBarToggle, }) {
         indexState.current = "loading";
         setLoading(true);
         const [{ wrappedIndexes, zhDictionary }, autoComplete] = await Promise.all([
-            fetchIndexes(baseUrl),
+            fetchIndexes(versionUrl),
             fetchAutoCompleteJS(),
         ]);
         search.current = autoComplete(searchBarRef.current, {
@@ -128,7 +136,7 @@ export default function SearchBar({ handleSearchBarToggle, }) {
             }
             input.focus();
         }
-    }, [baseUrl, history]);
+    }, [baseUrl, versionUrl, history]);
     useEffect(() => {
         if (!Mark) {
             return;
@@ -201,7 +209,7 @@ export default function SearchBar({ handleSearchBarToggle, }) {
         // We always clear these here because in case no match was selected the above history push wont happen
         setInputValue("");
         search.current?.autocomplete.setVal("");
-    }, [location.pathname, location.search, location.hash]);
+    }, [location.pathname, location.search, location.hash, history]);
     return (<div className={clsx("navbar__search", styles.searchBarContainer, {
             [styles.searchIndexLoading]: loading && inputChanged,
         })}>

package/dist/client/client/theme/SearchPage/SearchPage.jsx

@@ -4,7 +4,8 @@ import Layout from "@theme/Layout";
 import Head from "@docusaurus/Head";
 import Link from "@docusaurus/Link";
 import { translate } from "@docusaurus/Translate";
-import { usePluralForm } from "@docusaurus/theme-common";
+import { usePluralForm, useDocsPreferredVersion } from "@docusaurus/theme-common";
+import { useActivePlugin } from '@docusaurus/plugin-content-docs/client';
 import useSearchQuery from "../hooks/useSearchQuery";
 import { fetchIndexes } from "../SearchBar/fetchIndexes";
 import { SearchSourceFactory } from "../../utils/SearchSourceFactory";
@@ -15,7 +16,20 @@ import LoadingRing from "../LoadingRing/LoadingRing";
 import styles from "./SearchPage.module.css";
 import { concatDocumentPath } from "../../utils/concatDocumentPath";
 export default function SearchPage() {
-    const { siteConfig: { baseUrl }, } = useDocusaurusContext();
+    return (<Layout>
+      <SearchPageContent />
+    </Layout>);
+}
+function SearchPageContent() {
+    let { siteConfig: { baseUrl }, } = useDocusaurusContext();
+    // It returns undefined for non-docs pages.
+    const activePlugin = useActivePlugin();
+    let versionUrl = baseUrl;
+    // There is an issue, see `SearchBar.tsx`.
+    const { preferredVersion } = useDocsPreferredVersion(activePlugin?.pluginId);
+    if (preferredVersion && !preferredVersion.isLast) {
+        versionUrl = preferredVersion.path + "/";
+    }
     const { selectMessage } = usePluralForm();
     const { searchValue, updateSearchPath } = useSearchQuery();
     const [searchQuery, setSearchQuery] = useState(searchValue);
@@ -59,12 +73,12 @@ export default function SearchPage() {
     }, [searchValue]);
     useEffect(() => {
         async function doFetchIndexes() {
-            const { wrappedIndexes, zhDictionary } = await fetchIndexes(baseUrl);
+            const { wrappedIndexes, zhDictionary } = await fetchIndexes(versionUrl);
             setSearchSource(() => SearchSourceFactory(wrappedIndexes, zhDictionary, 100));
         }
         doFetchIndexes();
-    }, [baseUrl]);
-    return (<Layout>
+    }, [versionUrl]);
+    return (<React.Fragment>
       <Head>
         {/*
          We should not index search pages
@@ -106,7 +120,7 @@ export default function SearchPage() {
             searchResults.map((item) => (<SearchResultItem key={item.document.i} searchResult={item}/>))}
         </section>
       </div>
-    </Layout>);
+    </React.Fragment>);
 }
 function SearchResultItem({ searchResult: { document, type, page, tokens, metadata }, }) {
     const isTitle = type === 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyops-cn/docusaurus-search-local",
-  "version": "0.27.0",
+  "version": "0.28.0-alpha.1",
   "description": "An offline/local search plugin for Docusaurus v2",
   "repository": "https://github.com/easyops-cn/docusaurus-search-local",
   "homepage": "https://github.com/easyops-cn/docusaurus-search-local",
@@ -24,7 +24,6 @@
   "license": "MIT",
   "dependencies": {
     "@docusaurus/plugin-content-docs": "^2.0.0-beta.20",
-    "@docusaurus/theme-common": "^2.0.0-beta.20",
     "@docusaurus/theme-translations": "^2.0.0-beta.20",
     "@docusaurus/utils": "^2.0.0-beta.20",
     "@docusaurus/utils-common": "^2.0.0-beta.20",
@@ -43,6 +42,7 @@
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^2.0.0-beta.20",
+    "@docusaurus/theme-common": "^2.0.0-beta.20",
     "@docusaurus/types": "^2.0.0-beta.20",
     "@tsconfig/docusaurus": "^1.0.2",
     "@types/cheerio": "^0.22.31",
@@ -61,6 +61,8 @@
     "typescript": "^4.6.4"
   },
   "peerDependencies": {
-    "react": "^16.14.0 || 17 || 18"
+    "@docusaurus/theme-common": "^2.0.0-beta.20",
+    "react": "^16.14.0 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0"
   }
 }