@rspress-theme-anatole/theme-default 0.7.16 → 0.7.17

package/dist/bundle.js

@@ -5738,9 +5738,9 @@ function SearchPanel({ focused, setFocused }) {
             });
         }
     };
-    const { siteData, page: { lang, version } } = (0, __WEBPACK_EXTERNAL_MODULE__rspress_runtime_0abd3046__.usePageData)();
+    const { siteData, page: { lang, version, frontmatter, routePath } } = (0, __WEBPACK_EXTERNAL_MODULE__rspress_runtime_0abd3046__.usePageData)();
     const { searchPlaceholderText = 'Search Docs' } = useLocaleSiteData();
-    const { search, title: siteTitle } = siteData;
+    const { search, title: siteTitle, base } = siteData;
     const versionedSearch = search && 'remote' !== search.mode && search.versioned;
     const DEFAULT_RESULT = [
         {
@@ -5752,6 +5752,100 @@ function SearchPanel({ focused, setFocused }) {
     const currentSuggestions = searchResult[resultTabIndex]?.result ?? [];
     const currentRenderType = searchResult[resultTabIndex]?.renderType ?? types_RenderType.Default;
     if (false === search) return null;
+    // Extract related products from frontmatter for solution pages
+    const getRelatedProductsFromFrontmatter = (frontmatter) => {
+        if (!frontmatter?.features?.rows) return [];
+        
+        const products = [];
+        
+        // Loop through all rows and items in features
+        frontmatter.features.rows.forEach(row => {
+            if (row.items) {
+                row.items.forEach(item => {
+                    if (item.link) {
+                        // Extract product name from link
+                        const linkPath = item.link
+                            .replace(/^\.\.\//, '')  // Remove ../
+                            .replace(/^\.\//, '');   // Remove ./
+                        
+                        const productName = linkPath.split('/')[0];
+                        
+                        if (productName && !products.includes(productName)) {
+                            products.push(productName);
+                        }
+                    }
+                });
+            }
+        });
+        
+        return products;
+    };
+    // Calculate search scope
+    const searchScope = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(() => {
+        if (typeof window === 'undefined') return null;
+        
+        const pathname = window.location.pathname;
+        const pathParts = pathname.split('/').filter(Boolean);
+        
+        // Get language settings from site config
+        const localeLanguages = Object.values(siteData?.themeConfig?.locales || {});
+        const langArr = localeLanguages.map((item) => item.lang) || [];
+        
+        let startIndex = 0;
+        
+        // Skip base path if present
+        const baseTrimmed = (base || '').replace(/^\/|\/$/g, '');
+        if (baseTrimmed && pathParts[startIndex] === baseTrimmed) {
+            startIndex++;
+        }
+        
+        // Skip language prefix if present (e.g., /en/, /vn/, /zh/)
+        if (langArr.includes(pathParts[startIndex])) {
+            startIndex++;
+        }
+        
+        const firstSegment = pathParts[startIndex] || null;
+        const secondSegment = pathParts[startIndex + 1] || null;
+        
+        // Check if this is a solution page (contains 'solution-pages' in path)
+        if (firstSegment === 'solution-pages') {
+            const solutionFile = secondSegment || '';
+            const solutionName = solutionFile.replace(/\.html$/, '');
+            
+            // Get related products from frontmatter
+            const relatedProducts = getRelatedProductsFromFrontmatter(frontmatter);
+            
+            return {
+                scopeType: 'solution',
+                solutionName: solutionName,
+                relatedProducts: relatedProducts,
+                scopePath: null
+            };
+        }
+        
+        // Product page: /m365/... or /d365/...
+        const productName = firstSegment;
+        
+        // Exclude common non-product paths
+        const excludedPaths = ['index.html', 'index', 'what-is-coming-in-cloud', 'what-is-coming-in-cloud.html', 'solution-pages'];
+        
+        if (productName && !excludedPaths.includes(productName)) {
+            
+            return {
+                scopeType: 'product',
+                productName: productName,
+                scopePath: `/${productName}`,
+                relatedProducts: null
+            };
+        }
+        
+        // No specific scope (homepage or other pages)
+        return {
+            scopeType: null,
+            scopePath: null,
+            relatedProducts: null
+        };
+    }, [focused, siteData, base, frontmatter]);
     const createSearcher = () => {
         if (pageSearcherRef.current) return pageSearcherRef.current;
         const pageSearcherConfig = {
@@ -5876,6 +5970,69 @@ function SearchPanel({ focused, setFocused }) {
         version,
         versionedSearch
     ]);
+    const filterResultsByScope = (results, scope, basePath, currentLang) => {
+        if (!scope || !scope.scopeType) {
+            return results;
+        }
+        
+        return results.map(resultGroup => {
+            const filteredResult = resultGroup.result.filter(item => {
+                // Get the link path without domain
+                const linkPath = removeDomain(item.link);
+                
+                // Remove base path for comparison
+                const baseTrimmed = (basePath || '').replace(/^\/|\/$/g, '');
+                let cleanPath = linkPath;
+                if (baseTrimmed) {
+                    cleanPath = cleanPath.replace(new RegExp(`^/?${baseTrimmed}/?`), '/');
+                }
+                
+                // Ensure leading slash
+                if (!cleanPath.startsWith('/')) {
+                    cleanPath = `/${cleanPath}`;
+                }
+                
+                // Remove language prefix if present
+                if (currentLang) {
+                    cleanPath = cleanPath.replace(new RegExp(`^/${currentLang}/`), '/');
+                }
+                
+                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;
+                }
+                
+                if (scope.scopeType === 'solution') {
+                    // Solution page: search across related products
+                    const relatedProducts = scope.relatedProducts || [];
+                    
+                    if (relatedProducts.length === 0) {
+                        // No related products found in frontmatter, return all results
+                        return true;
+                    }
+                    
+                    // Check if the result is in any of the related products
+                    const matches = relatedProducts.some(product => {
+                        return cleanPath.startsWith(`/${product}/`) || 
+                            cleanPath === `/${product}` ||
+                            cleanPath.startsWith(`/${product}.html`);
+                    });
+                    
+                    return matches;
+                }
+                
+                return true;
+            });
+            
+            return {
+                ...resultGroup,
+                result: filteredResult
+            };
+        });
+    };
     const handleQueryChangedImpl = async (value) => {
         let newQuery = value;
         setQuery(newQuery);
@@ -5903,7 +6060,13 @@ function SearchPanel({ focused, setFocused }) {
             }
             const currQuery = searchInputRef.current?.value;
             if (currQuery === newQuery) {
-                setSearchResult(searchResult || DEFAULT_RESULT);
+                const filteredResult = filterResultsByScope(
+                    searchResult || DEFAULT_RESULT,
+                    searchScope,
+                    base, 
+                    lang
+                );
+                setSearchResult(filteredResult);
                 setIsSearching(false);
             }
         }
@@ -5997,6 +6160,21 @@ function SearchPanel({ focused, setFocused }) {
             })
         });
     };
+    const getScopedPlaceholder = () => {
+        if (!searchScope || !searchScope.scopeType) return searchPlaceholderText;
+        
+        if (searchScope.scopeType === 'product') {
+            return `Search in ${searchScope.productName.toUpperCase()}...`;
+        }
+        if (searchScope.scopeType === 'solution') {
+            const formattedName = searchScope.solutionName
+                .split('-')
+                .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+                .join(' ');
+            return `Search in ${formattedName}...`;
+        }
+        return searchPlaceholderText;
+    };
     return (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(__WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.Fragment, {
         children: focused && (0, __WEBPACK_EXTERNAL_MODULE_react_dom_7136dc57__.createPortal)((0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
             className: Search_index_module.mask,
@@ -6024,7 +6202,7 @@ function SearchPanel({ focused, setFocused }) {
                                     (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("input", {
                                         className: `rspress-search-panel-input ${Search_index_module.input}`,
                                         ref: searchInputRef,
-                                        placeholder: searchPlaceholderText,
+                                        placeholder: getScopedPlaceholder(),
                                         "aria-label": "SearchPanelInput",
                                         autoComplete: "off",
                                         autoFocus: true,

package/package.json

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