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

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;
@@ -7145,6 +7166,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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rspress-theme-anatole/theme-default",
   "author": "Anatole Tong",
-  "version": "0.7.51",
+  "version": "0.7.52",
   "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.52",
+    "@rspress-theme-anatole/shared": "0.7.52",
     "@rspress/runtime": "1.43.8",
     "body-scroll-lock": "4.0.0-beta.0",
     "copy-to-clipboard": "^3.3.3",