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

package/dist/bundle.js

@@ -395,8 +395,8 @@ function isItemLocked(item, userContext) {
     const requiredRoles = normalizeRoleList(item?.roles);
     // No roles required = public content (not locked)
     if (!requiredRoles.length) return false;
-    // User is authenticated with valid userId = unlocked (regardless of roles)
-    if (userContext?.isAuthenticated && userContext?.userId) return false;
+    // User is authenticated = unlocked (regardless of roles)
+    if (userContext?.isAuthenticated) return false;
     // Has roles required but user is not authenticated = locked
     return true;
 }
@@ -7044,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) => {
@@ -7237,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.52",
+  "version": "0.7.54",
   "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.52",
-    "@rspress-theme-anatole/shared": "0.7.52",
+    "@rspress-theme-anatole/rspress-plugin-mermaid": "0.7.54",
+    "@rspress-theme-anatole/shared": "0.7.54",
     "@rspress/runtime": "1.43.8",
     "body-scroll-lock": "4.0.0-beta.0",
     "copy-to-clipboard": "^3.3.3",