@rspress-theme-anatole/theme-default 0.7.51 → 0.7.53

package/dist/bundle.js

@@ -6520,34 +6520,54 @@ const ICON_MAP = {
     header: __WEBPACK_EXTERNAL_MODULE__theme_assets_header_54924fa3__["default"],
     content: __WEBPACK_EXTERNAL_MODULE__theme_assets_file_9182f35f__["default"]
 };
-function SuggestItem({ suggestion, closeSearch, isCurrent, setCurrentSuggestionIndex, inCurrentDocIndex, scrollTo, onMouseMove }) {
+function SuggestItem({ suggestion, query, closeSearch, isCurrent, setCurrentSuggestionIndex, inCurrentDocIndex, scrollTo, onMouseMove }) {
     const HitIcon = ICON_MAP[suggestion.type];
     const link = inCurrentDocIndex && !(0, __WEBPACK_EXTERNAL_MODULE__rspress_runtime_0abd3046__.isProduction)() ? removeDomain(suggestion.link) : suggestion.link;
     const selfRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(null);
     if (isCurrent && selfRef.current?.offsetTop) scrollTo(selfRef.current?.offsetTop, selfRef.current?.offsetHeight);
-    const getHighlightedFragments = (rawText, highlights) => {
+    const getHighlightedFragments = (rawText) => {
+        if (!rawText || !query) return [rawText];
+        const terms = [...new Set(
+            query.trim().split(/\s+/).filter(Boolean)
+                .sort((a, b) => b.length - a.length)
+        )];
+        if (terms.length === 0) return [rawText];
+
+        const pattern = new RegExp(
+            `(${terms.map(t => t.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&')).join('|')})`,
+            'giu'
+        );
+
         const fragmentList = [];
         let lastIndex = 0;
-        for (const highlightInfo of highlights) {
-            const { start, length } = highlightInfo;
-            const prefix = rawText.slice(lastIndex, start);
-            const queryStr = getSlicedStrByByteLength(rawText, start, length);
-            fragmentList.push(prefix);
-            fragmentList.push((0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("span", {
-                className: Search_index_module.mark,
-                children: queryStr
-            }, start));
-            lastIndex = start + queryStr.length;
+        let match;
+        pattern.lastIndex = 0;
+
+        while ((match = pattern.exec(rawText)) !== null) {
+            if (match.index > lastIndex) {
+                fragmentList.push(rawText.slice(lastIndex, match.index));
+            }
+            fragmentList.push(
+                (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(
+                    "span",
+                    { className: Search_index_module.mark, children: match[0] },
+                    match.index
+                )
+            );
+            lastIndex = match.index + match[0].length;
+        }
+
+        if (lastIndex < rawText.length) {
+            fragmentList.push(rawText.slice(lastIndex));
         }
-        if (lastIndex < rawText.length) fragmentList.push(rawText.slice(lastIndex));
         return fragmentList;
     };
+
     const renderHeaderMatch = () => {
         if ('header' === suggestion.type || 'title' === suggestion.type) {
-            const { header, highlightInfoList } = suggestion;
             return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
                 className: "font-medium",
-                children: getHighlightedFragments(header, highlightInfoList)
+                children: getHighlightedFragments(suggestion.header)
             });
         }
         return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
@@ -6555,19 +6575,20 @@ function SuggestItem({ suggestion, closeSearch, isCurrent, setCurrentSuggestionI
             children: suggestion.header
         });
     };
+
     const renderStatementMatch = () => {
         if ('content' !== suggestion.type) return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {});
-        const { statement, highlightInfoList } = suggestion;
         return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
             className: "text-sm text-gray-light w-full",
-            children: getHighlightedFragments(statement, highlightInfoList)
+            children: getHighlightedFragments(suggestion.statement)
         });
     };
     const renderLink = () => {
         const displayLink = removeDomain(suggestion.link);
+        const cleanDisplayLink = displayLink.replace(/([?&])kb_highlight=[^&#]*/,'').replace(/\?$/,'') ;
         return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("p", {
             className: "text-xs text-gray-400 mt-1 truncate opacity-70",
-            children: displayLink
+            children: cleanDisplayLink
         });
     };
     let hitContent = null;
@@ -7023,56 +7044,93 @@ function SearchPanel({ focused, setFocused }) {
     const handleQueryChangedImpl = async (value) => {
         let newQuery = value;
         setQuery(newQuery);
-        if (search && 'remote' === search.mode && search.searchLoading) setIsSearching(true);
-        if (newQuery) setIsSearching(true);
-        if (newQuery) {
-            try {
-                await ensureSearcherReady();
-            } catch (_error) {
-                setIsSearching(false);
-                return;
-            }
-            const searchResult = [];
-            if ('beforeSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
-                const key = 'beforeSearch';
-                const transformedQuery = await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery);
-                if (transformedQuery) newQuery = transformedQuery;
-            }
-            let defaultSearchResult = await pageSearcherRef.current?.match(newQuery, getScopedSearchLimit(searchScope));
-            let filteredDefaultSearchResult = filterResultsByScope(
-                defaultSearchResult || DEFAULT_RESULT,
-                searchScope,
-                base,
-                lang
-            );
-            if (searchScope?.scopeType && !hasSearchResults(filteredDefaultSearchResult)) {
-                defaultSearchResult = await pageSearcherRef.current?.match(newQuery, getScopedSearchLimit(searchScope, true));
-            }
-            if (defaultSearchResult) searchResult.push(...defaultSearchResult);
-            if ('onSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
-                const key = 'onSearch';
-                const customSearchResult = await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery, searchResult, searchScope);
-                if (customSearchResult) searchResult.push(...customSearchResult.map((item) => ({
-                    renderType: types_RenderType.Custom,
-                    ...item
-                })));
-            }
-            if ('afterSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
-                const key = 'afterSearch';
-                await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery, searchResult);
-            }
-            const currQuery = searchInputRef.current?.value;
-            if (currQuery === newQuery) {
-                const filteredResult = filterResultsByScope(
-                    searchResult || DEFAULT_RESULT,
-                    searchScope,
-                    base, 
-                    lang
-                );
-                setSearchResult(filteredResult);
-                setIsSearching(false);
-            }
+
+        if (!newQuery) {
+            setIsSearching(false);
+            return;
         }
+
+        setIsSearching(true);
+
+        // Kick off local searcher init in background (non-blocking)
+        const searcherPromise = ensureSearcherReady().catch(() => null);
+
+        // === TYPESENSE FIRST (not wait local searcher) ===
+        const typesenseResult = [...DEFAULT_RESULT];
+
+        if ('beforeSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
+            const key = 'beforeSearch';
+            const transformedQuery = await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery);
+            if (transformedQuery) newQuery = transformedQuery;
+        }
+
+        if ('onSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
+            const key = 'onSearch';
+            await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery, typesenseResult, searchScope);
+        }
+
+        if ('afterSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
+            const key = 'afterSearch';
+            await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery, typesenseResult);
+        }
+
+        // If the query has changed while waiting → skip
+        if (searchInputRef.current?.value !== value) return;
+
+        const typesenseHasResults = hasSearchResults(typesenseResult);
+
+        if (typesenseHasResults) {
+            // Typesense has results → display immediately, do not wait for local
+            const filtered = filterResultsByScope(typesenseResult, searchScope, base, lang);
+            setSearchResult(filtered);
+            setIsSearching(false);
+            // Local searcher still warms up in the background for the next time
+            return;
+        }
+
+        // === FALLBACK: wait for local FlexSearch searcher ===
+        const searcher = await searcherPromise;
+
+        if (searchInputRef.current?.value !== value) return;
+
+        if (!searcher) {
+            // Local searcher also failed → show empty
+            setSearchResult(DEFAULT_RESULT);
+            setIsSearching(false);
+            return;
+        }
+
+        const localResult = [];
+        let defaultSearchResult = await searcher.match(newQuery, getScopedSearchLimit(searchScope));
+        let filteredDefaultSearchResult = filterResultsByScope(
+            defaultSearchResult || DEFAULT_RESULT,
+            searchScope,
+            base,
+            lang
+        );
+
+        if (searchScope?.scopeType && !hasSearchResults(filteredDefaultSearchResult)) {
+            defaultSearchResult = await searcher.match(newQuery, getScopedSearchLimit(searchScope, true));
+        }
+
+        if (defaultSearchResult) localResult.push(...defaultSearchResult);
+
+        // Re-run onSearch/afterSearch với local result
+        if ('onSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
+            const key = 'onSearch';
+            await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery, localResult, searchScope);
+        }
+
+        if ('afterSearch' in __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__) {
+            const key = 'afterSearch';
+            await __WEBPACK_EXTERNAL_MODULE_virtual_search_hooks_9d01d01f__[key](newQuery, localResult);
+        }
+
+        if (searchInputRef.current?.value !== value) return;
+
+        const filtered = filterResultsByScope(localResult || DEFAULT_RESULT, searchScope, base, lang);
+        setSearchResult(filtered);
+        setIsSearching(false);
     };
     const handleQueryChange = useDebounce(handleQueryChangedImpl);
     const normalizeSuggestions = (suggestions) => suggestions.reduce((groups, item) => {
@@ -7145,6 +7203,7 @@ function SearchPanel({ focused, setFocused }) {
                             const suggestionIndex = accumulateIndex;
                             return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(SuggestItem, {
                                 suggestion: suggestion,
+                                query: query,
                                 isCurrent: suggestionIndex === currentSuggestionIndex,
                                 setCurrentSuggestionIndex: (event) => {
                                     if (mousePositionRef.current.pageX === event.pageX && mousePositionRef.current.pageY === event.pageY) return;
@@ -7215,8 +7274,8 @@ function SearchPanel({ focused, setFocused }) {
                                         "aria-label": "SearchPanelInput",
                                         autoComplete: "off",
                                         autoFocus: true,
-                                        // onChange: (e) => handleQueryChange(e.target.value)
-                                        onKeyUp: (e) => handleQueryChange(e.target.value)
+                                        onChange: (e) => handleQueryChange(e.target.value)
+                                        // onKeyUp: (e) => handleQueryChange(e.target.value)
                                     }),
                                     (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("label", {
                                         children: (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(SvgWrapper, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rspress-theme-anatole/theme-default",
   "author": "Anatole Tong",
-  "version": "0.7.51",
+  "version": "0.7.53",
   "license": "MIT",
   "sideEffects": [
     "*.css",
@@ -21,8 +21,8 @@
   "types": "./dist/bundle.d.ts",
   "dependencies": {
     "@mdx-js/react": "2.3.0",
-    "@rspress-theme-anatole/rspress-plugin-mermaid": "0.7.51",
-    "@rspress-theme-anatole/shared": "0.7.51",
+    "@rspress-theme-anatole/rspress-plugin-mermaid": "0.7.53",
+    "@rspress-theme-anatole/shared": "0.7.53",
     "@rspress/runtime": "1.43.8",
     "body-scroll-lock": "4.0.0-beta.0",
     "copy-to-clipboard": "^3.3.3",