@redneckz/wildless-cms-uni-blocks 0.14.843 → 0.14.845

package/src/services/search/useSearch.ts

@@ -1,6 +1,8 @@
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { useDebouncedEffect } from '@redneckz/uni-jsx/lib/hooks/useDebouncedEffect';
+import { useRouter, type Router } from '../../external/useRouter';
+import { adjustHref } from '../../utils/adjustHref';
 import { fetchJSON } from '../../utils/fetchJSON';
 import { type Nullable } from '../../utils/Nullable';
 import { joinPath } from '../../utils/url';
@@ -28,13 +30,18 @@ export const useSearch = ({
 }: SearchParams): [SearchResult | null, SearchInputProps] => {
   const [query, setQuery] = useState(initialQuery || '');
 
+  const router = useRouter();
+
   useEffect(() => {
     if (initialQuery !== undefined && initialQuery !== null) {
       setQuery(initialQuery);
     }
   }, [initialQuery]);
 
-  const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex);
+  const { data } = useAsyncData(
+    basePathList?.length ? basePathList : null,
+    fetchSearchIndex(router),
+  );
 
   const [result, setResult] = useState<SearchResult | null>(null);
 
@@ -47,28 +54,32 @@ export const useSearch = ({
   return [result, { value: query, onChange: setQuery }];
 };
 
-const fetchSearchIndex = async (...basePathList: (string | null)[]): Promise<SearchIndex[]> =>
-  (
-    await Promise.allSettled(
-      basePathList.map(async (basePath) => [
-        basePath,
-        await fetchJSON(joinPath(basePath, SEARCH_INDEX_FILENAME)),
-      ]),
+const fetchSearchIndex =
+  (router: Router) =>
+  async (...basePathList: (string | null)[]): Promise<SearchIndex[]> =>
+    (
+      await Promise.allSettled(
+        basePathList.map(async (basePath) => [
+          basePath,
+          await fetchJSON(joinPath(basePath, SEARCH_INDEX_FILENAME)),
+        ]),
+      )
     )
-  )
-    .map((_) => (_.status === 'fulfilled' ? _.value : []) as FetchSearchIndexResult)
-    .map(getSearchIndex);
+      .map((_) => (_.status === 'fulfilled' ? _.value : []) as FetchSearchIndexResult)
+      .map(getSearchIndex(router));
 
-const getSearchIndex = ([basePath, result]: FetchSearchIndexResult): SearchIndex => {
-  if (!result) {
-    return {};
-  }
+const getSearchIndex =
+  (router: Router) =>
+  ([basePath, result]: FetchSearchIndexResult): SearchIndex => {
+    if (!result) {
+      return {};
+    }
 
-  return {
-    ...result,
-    corpus: result.corpus?.map((_) => ({
-      ..._,
-      uri: _.uri === 'index' ? basePath : joinPath(basePath, _.uri),
-    })),
+    return {
+      ...result,
+      corpus: result.corpus?.map((_) => ({
+        ..._,
+        uri: _.uri === 'index' ? basePath : adjustHref(router)(_.uri, basePath),
+      })),
+    };
   };
-};

package/src/ui-kit/BaseTile/BaseTile.tsx

@@ -94,7 +94,7 @@ export const BaseTile = JSX<BaseTileProps>(
 
 const renderMiddleContent = (insetTitle: VNode, children: VNode) =>
   insetTitle || children ? (
-    <div className="grow space-y-lg min-w-fit">
+    <div className="grow space-y-lg w-fit">
       {insetTitle}
       {children}
     </div>