npm - @rspress-theme-anatole/theme-default - Versions diffs - 0.7.47 → 0.7.49 - Mend

@rspress-theme-anatole/theme-default 0.7.47 → 0.7.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/assets/loading.js CHANGED Viewed

@@ -1,50 +1,50 @@
-import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__ from "react/jsx-runtime";
-import "react";
-const SvgLoading = (props)=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("svg", {
-        width: 32,
-        height: 32,
-        viewBox: "0 0 24 24",
-        ...props,
-        children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)("g", {
-            fill: "none",
-            stroke: "var(--rp-c-brand)",
-            strokeLinecap: "round",
-            strokeWidth: 2,
-            children: [
-                /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("path", {
-                    strokeDasharray: 60,
-                    strokeDashoffset: 60,
-                    strokeOpacity: 0.3,
-                    d: "M12 3a9 9 0 1 1 0 18 9 9 0 0 1 0-18Z",
-                    children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("animate", {
-                        fill: "freeze",
-                        attributeName: "stroke-dashoffset",
-                        dur: "1.3s",
-                        values: "60;0"
-                    })
-                }),
-                /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)("path", {
-                    strokeDasharray: 15,
-                    strokeDashoffset: 15,
-                    d: "M12 3a9 9 0 0 1 9 9",
-                    children: [
-                        /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("animate", {
-                            fill: "freeze",
-                            attributeName: "stroke-dashoffset",
-                            dur: "0.3s",
-                            values: "15;0"
-                        }),
-                        /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("animateTransform", {
-                            attributeName: "transform",
-                            dur: "1.5s",
-                            repeatCount: "indefinite",
-                            type: "rotate",
-                            values: "0 12 12;360 12 12"
-                        })
-                    ]
-                })
-            ]
-        })
-    });
-const loading_rslib_entry_ = SvgLoading;
-export { loading_rslib_entry_ as default };
+import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__ from "react/jsx-runtime";
+import "react";
+const SvgLoading = (props)=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("svg", {
+        width: 32,
+        height: 32,
+        viewBox: "0 0 24 24",
+        ...props,
+        children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)("g", {
+            fill: "none",
+            stroke: "#32363E",
+            strokeLinecap: "round",
+            strokeWidth: 2,
+            children: [
+                /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("path", {
+                    strokeDasharray: 60,
+                    strokeDashoffset: 60,
+                    strokeOpacity: 0.3,
+                    d: "M12 3a9 9 0 1 1 0 18 9 9 0 0 1 0-18Z",
+                    children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("animate", {
+                        fill: "freeze",
+                        attributeName: "stroke-dashoffset",
+                        dur: "1.3s",
+                        values: "60;0"
+                    })
+                }),
+                /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)("path", {
+                    strokeDasharray: 15,
+                    strokeDashoffset: 15,
+                    d: "M12 3a9 9 0 0 1 9 9",
+                    children: [
+                        /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("animate", {
+                            fill: "freeze",
+                            attributeName: "stroke-dashoffset",
+                            dur: "0.3s",
+                            values: "15;0"
+                        }),
+                        /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("animateTransform", {
+                            attributeName: "transform",
+                            dur: "1.5s",
+                            repeatCount: "indefinite",
+                            type: "rotate",
+                            values: "0 12 12;360 12 12"
+                        })
+                    ]
+                })
+            ]
+        })
+    });
+const loading_rslib_entry_ = SvgLoading;
+export { loading_rslib_entry_ as default };

package/dist/bundle.js CHANGED Viewed

@@ -6667,7 +6667,7 @@ function SearchPanel({ focused, setFocused }) {
         }
     };
     const { siteData, page: { lang, version, frontmatter, routePath } } = (0, __WEBPACK_EXTERNAL_MODULE__rspress_runtime_0abd3046__.usePageData)();
-    const { searchPlaceholderText = 'Search Docs', scopedSearchPrefixText = 'Search in' } = useLocaleSiteData();
+    const { searchPlaceholderText = 'Search Docs', scopedSearchPrefixText = 'Search in', searchingText = 'Searching...' } = useLocaleSiteData();
     const { search, title: siteTitle, base } = siteData;
     const versionedSearch = search && 'remote' !== search.mode && search.versioned;
     const DEFAULT_RESULT = [
@@ -6718,6 +6718,15 @@ function SearchPanel({ focused, setFocused }) {
         });
         return products;
     };
+    const getRelatedProductsForScope = (primaryProductName) => {
+        const relatedProducts = getRelatedProductsFromFrontmatter(frontmatter);
+        if (!primaryProductName) return relatedProducts;
+        if (relatedProducts.includes(primaryProductName)) return relatedProducts;
+        return [
+            primaryProductName,
+            ...relatedProducts
+        ];
+    };
     const getScopedPathInfo = (pathname, basePath, localeLangs) => {
         const pathParts = pathname.split('/').filter(Boolean);
         let startIndex = 0;
@@ -6742,7 +6751,7 @@ function SearchPanel({ focused, setFocused }) {
                 scopeType: 'product',
                 productName: secondSegment,
                 scopePath: `/${secondSegment}`,
-                relatedProducts: null
+                relatedProducts: getRelatedProductsForScope(secondSegment)
             };
         }
         const productName = normalizeProductName(firstSegment || '');
@@ -6750,7 +6759,7 @@ function SearchPanel({ focused, setFocused }) {
             scopeType: 'product',
             productName: productName,
             scopePath: `/${productName}`,
-            relatedProducts: null
+            relatedProducts: getRelatedProductsForScope(productName)
         };
         return {
             scopeType: null,
@@ -6807,6 +6816,7 @@ function SearchPanel({ focused, setFocused }) {
         const searcher = await ensureSearcherReady();
         const query = searchInputRef.current?.value;
         if (query) {
+            setIsSearching(true);
             const matched = await searcher.match(query);
             setSearchResult(matched || DEFAULT_RESULT);
             setIsSearching(false);
@@ -6960,11 +6970,11 @@ function SearchPanel({ focused, setFocused }) {
                 }
                 if (scope.scopeType === 'product') {
-                    // Product page: only show results from this product
-                    const matches = cleanPath.startsWith(scope.scopePath + '/') ||
-                                cleanPath === scope.scopePath ||
-                                cleanPath.startsWith(scope.scopePath + '.html');
-                    return matches;
+                    const relatedProducts = scope.relatedProducts || [];
+                    const scopePaths = relatedProducts.length > 0 ? relatedProducts.map(product => `/${product}`) : [
+                        scope.scopePath
+                    ].filter(Boolean);
+                    return scopePaths.some(scopePath => cleanPath.startsWith(scopePath + '/') || cleanPath === scopePath || cleanPath.startsWith(scopePath + '.html'));
                 }
                 if (scope.scopeType === 'solution') {
@@ -7004,6 +7014,7 @@ function SearchPanel({ focused, setFocused }) {
         let newQuery = value;
         setQuery(newQuery);
         if (search && 'remote' === search.mode && search.searchLoading) setIsSearching(true);
+        if (newQuery) setIsSearching(true);
         if (newQuery) {
             try {
                 await ensureSearcherReady();
@@ -7030,7 +7041,7 @@ function SearchPanel({ focused, setFocused }) {
             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);
+                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
@@ -7096,10 +7107,16 @@ function SearchPanel({ focused, setFocused }) {
     const renderSearchResultItem = (suggestionList, query, isSearching) => {
         if (isSearching) return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
             className: "flex flex-col items-center",
-            children: (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(SvgWrapper, {
-                icon: __WEBPACK_EXTERNAL_MODULE__theme_assets_loading_5f550a25__["default"],
-                className: "m-8 opacity-80"
-            })
+            children: [
+                (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(SvgWrapper, {
+                    icon: __WEBPACK_EXTERNAL_MODULE__theme_assets_loading_5f550a25__["default"],
+                    className: "m-8 opacity-80"
+                }),
+                (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("span", {
+                    className: "text-sm opacity-60 -mt-4 mb-8",
+                    children: searchingText
+                })
+            ]
         });
         if (0 === suggestionList.length && 'inited' === initStatus) return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(NoSearchResult, {
             query: query
@@ -7218,7 +7235,7 @@ function SearchPanel({ focused, setFocused }) {
                             })
                         ]
                     }),
-                    query && 'inited' === initStatus ? (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
+                    query && 'initial' !== initStatus ? (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
                         className: `${Search_index_module.searchHits}  rspress-scrollbar`,
                         ref: searchResultRef,
                         children: renderSearchResult(searchResult, search, isSearching)

package/package.json CHANGED Viewed

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