@apify/docs-theme 1.0.69 → 1.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apify/docs-theme",
-    "version": "1.0.69",
+    "version": "1.0.71",
     "description": "",
     "main": "./src/index.js",
     "files": [

package/src/theme/SearchBar/index.js

@@ -4,10 +4,7 @@ import { DocSearchButton, useDocSearchKeyboardEvents } from '@docsearch/react';
 import Head from '@docusaurus/Head';
 import Link from '@docusaurus/Link';
 import { useSearchPage } from '@docusaurus/theme-common/internal';
-import {
-    useAlgoliaContextualFacetFilters,
-    useSearchResultUrlProcessor,
-} from '@docusaurus/theme-search-algolia/client';
+import { useAlgoliaContextualFacetFilters } from '@docusaurus/theme-search-algolia/client';
 import { useActiveDocContext } from '@docusaurus/plugin-content-docs/client';
 import Translate from '@docusaurus/Translate';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
@@ -17,22 +14,24 @@ import translations from '@theme/SearchTranslations';
 let DocSearchModal = null;
 
 function A(props) {
-    return <Link {...props} onClick={((e) => {
-        e.preventDefault();
-        window.location.assign(props.href || props.to);
-    })}>
-        {props.children}
-    </Link>;
+    const { siteConfig } = useDocusaurusContext();
+    if (props.href.startsWith(siteConfig.baseUrl)) {
+        return <Link {...props}>
+            {props.children}
+        </Link>;
+    }
+
+    return <a {...props}>{props.children}</a>;
 }
 
 function Hit({ hit, children }) {
-    return <A to={hit.url}>{children}</A>;
+    return <A href={hit.url}>{children}</A>;
 }
 
 function ResultsFooter({ state, onClose }) {
     const { generateSearchPageLink } = useSearchPage();
     return (
-        <A to={generateSearchPageLink(state.query)} onClick={onClose}>
+        <A href={generateSearchPageLink(state.query)} onClick={onClose}>
             <Translate
                 id="theme.SearchBar.seeAll"
                 values={{ count: state.context.nbHits }}>
@@ -49,7 +48,6 @@ function mergeFacetFilters(f1, f2) {
 
 function DocSearch({ contextualSearch, externalUrlRegex, ...props }) {
     const { siteMetadata, siteConfig } = useDocusaurusContext();
-    const processSearchResultUrl = useSearchResultUrlProcessor();
     const contextualSearchFacetFilters = useAlgoliaContextualFacetFilters();
     const configFacetFilters = props.searchParameters?.facetFilters ?? [];
     const facetFilters = contextualSearch
@@ -120,15 +118,12 @@ function DocSearch({ contextualSearch, externalUrlRegex, ...props }) {
             window.location.href = itemUrl;
         },
     }).current;
-    const transformItems = useRef((items) => (props.transformItems
-        ? // Custom transformItems
-        props.transformItems(items)
-        : // Default transformItems
-        items.map((item) => ({
-            ...item,
-            url: processSearchResultUrl(item.url).replace(new RegExp(`^${siteConfig.baseUrl}`), '/'),
-        }))),
-    ).current;
+    const transformItems = useRef((items) => (items.map((item) => {
+        if (item.url.startsWith(siteConfig.url)) {
+            return { ...item, url: item.url.substring(siteConfig.url.length) };
+        }
+        return item;
+    }))).current;
     const resultsFooterComponent = useMemo(
         () =>
             // eslint-disable-next-line react/no-unstable-nested-components,react/display-name,implicit-arrow-linebreak

package/src/theme/SearchMetadata/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import Head from '@docusaurus/Head';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-import { useActiveDocContext } from '@docusaurus/plugin-content-docs/client';
+import { useThemeConfig } from '@docusaurus/theme-common';
 
 export default function SearchMetadata({ locale, version, tag }) {
     const { siteConfig } = useDocusaurusContext();
@@ -10,12 +10,11 @@ export default function SearchMetadata({ locale, version, tag }) {
     // keep the tag on same value for all the content, and add a new section + section tag
     const section = siteConfig.projectName;
     const sectionTag = tag;
-    const docsPluginId = siteConfig.presets[0][1].docs.id ?? 'default';
-    const activeDocContext = useActiveDocContext(docsPluginId);
+    const { versions } = useThemeConfig();
 
     // normalize the latest version regardless of what number it has,
     // so we can search across all "latest versions of the docs"
-    if (!version || !activeDocContext.activeVersion || activeDocContext.activeVersion.isLast) {
+    if (!version || !versions || version === versions[0]) {
         version = 'latest';
     }