{
backgroundColor: 'var(--docsearch-modal-background)',
boxShadow: '0 2px 8px rgba(0,0,0,0.1)'
}}>
-
diff --git a/src/theme/SearchBar/searchHit.jsx b/src/theme/SearchBar/searchHit.jsx
index 3eed981e57c..e4fd9dd82f7 100644
--- a/src/theme/SearchBar/searchHit.jsx
+++ b/src/theme/SearchBar/searchHit.jsx
@@ -1,15 +1,63 @@
import Link from '@docusaurus/Link';
import { trackSearchResultClick } from './utils/searchAnalytics';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
export function SearchHit({ hit, children }) {
+ const { i18n: { currentLocale } } = useDocusaurusContext();
const handleClick = () => trackSearchResultClick(hit);
-
+
+ // Transform the URL to ensure it's correct
+ // This is a safety measure in case transformSearchItems doesn't work
+ let transformedUrl = hit.url;
+
+ try {
+ let pathname, hash;
+
+ // If it's an absolute URL, extract pathname and hash
+ if (hit.url.startsWith('http://') || hit.url.startsWith('https://')) {
+ const urlObj = new URL(hit.url);
+ pathname = urlObj.pathname;
+ hash = urlObj.hash;
+ } else {
+ // It's already a relative URL, split pathname and hash
+ const hashIndex = hit.url.indexOf('#');
+ if (hashIndex !== -1) {
+ pathname = hit.url.substring(0, hashIndex);
+ hash = hit.url.substring(hashIndex);
+ } else {
+ pathname = hit.url;
+ hash = '';
+ }
+ }
+
+ // Now transform the pathname
+ if (currentLocale !== 'en') {
+ const prefix = `/docs/${currentLocale}`;
+ if (pathname.startsWith(prefix)) {
+ transformedUrl = pathname.substring(prefix.length) || '/';
+ } else {
+ transformedUrl = pathname;
+ }
+ } else {
+ const prefix = '/docs';
+ if (pathname.startsWith(prefix)) {
+ transformedUrl = pathname.substring(prefix.length) || '/';
+ } else {
+ transformedUrl = pathname;
+ }
+ }
+
+ transformedUrl += hash;
+ } catch (e) {
+ // If transformation fails, use original URL
+ }
+
// Extract multiple URL segments after /docs/ and clean them up
const segments = hit.url.split('/docs/')[1]?.split('/').filter(Boolean) || [];
const breadcrumbs = segments
.slice(0, 3) // Take first 3 segments max
.map(segment => segment.replace(/-/g, ' ').replace(/\b\w/g, l => l.toUpperCase()));
-
+
// Format doc_type for display, stripping quotes and formatting
const formatDocType = (docType) => {
if (!docType) return null;
@@ -17,21 +65,21 @@ export function SearchHit({ hit, children }) {
const cleaned = docType.replace(/^'|'$/g, '');
return cleaned.replace(/-/g, ' ').replace(/\b\w/g, l => l.toUpperCase());
};
-
+
const docTypeDisplay = formatDocType(hit.doc_type);
-
+
return (
-
+
{children}
-
{/* Doc type badge */}
{docTypeDisplay && (
-
)}
-
+
{/* Breadcrumbs */}
{breadcrumbs.length > 0 && (
{breadcrumbs.join(' › ')}
diff --git a/src/theme/SearchBar/utils/searchConfig.js b/src/theme/SearchBar/utils/searchConfig.js
index a1f87ae6c56..7df28493e0b 100644
--- a/src/theme/SearchBar/utils/searchConfig.js
+++ b/src/theme/SearchBar/utils/searchConfig.js
@@ -60,15 +60,73 @@ export function createSearchParameters(props, contextualSearch, contextualSearch
* Create navigator for handling search result clicks
* @param {Object} history - React router history object
* @param {RegExp} externalUrlRegex - Regex to match external URLs
+ * @param {string} currentLocale - Current locale
* @returns {Object} - Navigator object
*/
-export function createSearchNavigator(history, externalUrlRegex) {
+export function createSearchNavigator(history, externalUrlRegex, currentLocale) {
return {
navigate({ itemUrl }) {
- if (isRegexpStringMatch(externalUrlRegex, itemUrl)) {
- window.location.href = itemUrl;
+ let url = itemUrl;
+
+ try {
+ let pathname, hash;
+
+ // Handle both absolute and relative URLs
+ if (itemUrl.startsWith('http://') || itemUrl.startsWith('https://')) {
+ // Absolute URL - parse it
+ const urlObj = new URL(itemUrl);
+ pathname = urlObj.pathname;
+ hash = urlObj.hash;
+ } else {
+ // Relative URL - split pathname and hash manually
+ const hashIndex = itemUrl.indexOf('#');
+ if (hashIndex !== -1) {
+ pathname = itemUrl.substring(0, hashIndex);
+ hash = itemUrl.substring(hashIndex);
+ } else {
+ pathname = itemUrl;
+ hash = '';
+ }
+ }
+
+ // Transform the pathname if it starts with /docs
+ if (currentLocale !== 'en') {
+ const prefix = `/docs/${currentLocale}`;
+ if (pathname.startsWith(prefix)) {
+ url = pathname.substring(prefix.length) || '/';
+ } else {
+ url = pathname;
+ }
+ } else {
+ const prefix = '/docs';
+ if (pathname.startsWith(prefix)) {
+ url = pathname.substring(prefix.length) || '/';
+ } else {
+ url = pathname;
+ }
+ }
+
+ url += hash;
+ } catch (e) {
+ // If parsing fails, use as-is
+ }
+
+ // If the URL is relative, prepend the locale-specific baseUrl
+ // This is needed because history.push expects the full path including baseUrl
+ if (!url.startsWith('http://') && !url.startsWith('https://')) {
+ // Construct the baseUrl based on locale
+ const baseUrl = currentLocale !== 'en' ? `/docs/${currentLocale}` : '/docs';
+
+ // Only prepend if the URL doesn't already start with the baseUrl
+ if (!url.startsWith(baseUrl)) {
+ url = baseUrl + url;
+ }
+ }
+
+ if (isRegexpStringMatch(externalUrlRegex, url)) {
+ window.location.href = url;
} else {
- history.push(itemUrl);
+ history.push(url);
}
},
};
@@ -143,7 +201,11 @@ export function transformSearchItems(items, options) {
return transformed;
});
- const result = transformItems ? transformItems(items) : baseTransform(items);
+ // Always apply base transformation first to fix URLs
+ const baseTransformed = baseTransform(items);
+
+ // Then optionally apply custom transformation on top
+ const result = transformItems ? transformItems(baseTransformed) : baseTransformed;
return result;
}
\ No newline at end of file