@redneckz/wildless-cms-uni-blocks 0.13.22 → 0.13.23

package/mobile/bundle/services/search/useSearch.d.ts

@@ -1,13 +1,13 @@
+import type { Nullable } from '../../utils/Nullable';
 import { CorpusItem } from './search';
 export declare type SearchResult = Array<CorpusItem[]>;
 interface SearchParams {
-    basePathList?: string[];
+    basePathList: Nullable<string[]>;
     initialQuery?: string;
-    wasOpened?: boolean;
 }
 export interface SearchInputProps {
     value: string;
     onChange: (query: string) => void;
 }
-export declare const useSearch: ({ basePathList, initialQuery, wasOpened, }: SearchParams) => [SearchResult | null, SearchInputProps];
+export declare const useSearch: ({ basePathList, initialQuery, }: SearchParams) => [SearchResult | null, SearchInputProps];
 export {};

package/mobile/bundle/utils/Nullable.d.ts

@@ -0,0 +1 @@
+export declare type Nullable<T> = T | null | undefined;

package/mobile/dist/services/search/useSearch.d.ts

@@ -1,13 +1,13 @@
+import type { Nullable } from '../../utils/Nullable';
 import { CorpusItem } from './search';
 export declare type SearchResult = Array<CorpusItem[]>;
 interface SearchParams {
-    basePathList?: string[];
+    basePathList: Nullable<string[]>;
     initialQuery?: string;
-    wasOpened?: boolean;
 }
 export interface SearchInputProps {
     value: string;
     onChange: (query: string) => void;
 }
-export declare const useSearch: ({ basePathList, initialQuery, wasOpened, }: SearchParams) => [SearchResult | null, SearchInputProps];
+export declare const useSearch: ({ basePathList, initialQuery, }: SearchParams) => [SearchResult | null, SearchInputProps];
 export {};

package/mobile/dist/services/search/useSearch.js

@@ -7,17 +7,14 @@ const url_1 = require("../../utils/url");
 const useDebouncedEffect_1 = require("../../utils/useDebouncedEffect");
 const search_1 = require("./search");
 const SEARCH_INDEX_FILENAME = 'search.index.json';
-const DEFAULT_BASE_PATH = ['/'];
-const useSearch = ({ basePathList = DEFAULT_BASE_PATH, initialQuery = '', wasOpened, }) => {
+const useSearch = ({ basePathList, initialQuery = '', }) => {
     const [query, setQuery] = (0, hooks_1.useState)(initialQuery || '');
     (0, hooks_1.useEffect)(() => {
         if (initialQuery !== undefined && initialQuery !== null) {
             setQuery(initialQuery);
         }
     }, [initialQuery]);
-    const key = (0, hooks_1.useMemo)(() => basePathList.map((_) => (wasOpened ? _ : null)), // Load search index on very first search
-    [wasOpened, basePathList]);
-    const { data } = (0, useAsyncData_1.useAsyncData)(key, fetchSearchIndex);
+    const { data } = (0, useAsyncData_1.useAsyncData)(basePathList?.length ? basePathList : null, fetchSearchIndex);
     const [result, setResult] = (0, hooks_1.useState)(null);
     (0, useDebouncedEffect_1.useDebouncedEffect)(() => {
         if (data) {

package/mobile/dist/services/search/useSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":";;AAAA,uDAA2E;AAC3E,2EAAwE;AACxE,qDAAkD;AAClD,yCAA2C;AAC3C,uEAAoE;AACpE,qCAA2D;AAE3D,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAClD,MAAM,iBAAiB,GAAG,CAAC,GAAG,CAAC,CAAC;AAezB,MAAM,SAAS,GAAG,CAAC,EACxB,YAAY,GAAG,iBAAiB,EAChC,YAAY,GAAG,EAAE,EACjB,SAAS,GACI,EAA2C,EAAE;IAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAEvD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACvD,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,GAAG,GAAG,IAAA,eAAO,EACjB,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,yCAAyC;IAChG,CAAC,SAAS,EAAE,YAAY,CAAC,CAC1B,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAErD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAsB,IAAI,CAAC,CAAC;IAEhE,IAAA,uCAAkB,EAAC,GAAG,EAAE;QACtB,IAAI,IAAI,EAAE;YACR,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC;AA7BW,QAAA,SAAS,aA6BpB;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAG,YAA+B,EAA0B,EAAE,CAC5F,CACE,MAAM,OAAO,CAAC,UAAU,CACtB,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,qBAAS,EAAC,IAAA,cAAQ,EAAC,QAAQ,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAC1F,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAgB,CAAC,CAAC"}
+{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":";;AAAA,uDAAkE;AAClE,2EAAwE;AAExE,qDAAkD;AAClD,yCAA2C;AAC3C,uEAAoE;AACpE,qCAA2D;AAE3D,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAc3C,MAAM,SAAS,GAAG,CAAC,EACxB,YAAY,EACZ,YAAY,GAAG,EAAE,GACJ,EAA2C,EAAE;IAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAEvD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACvD,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAE5F,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAsB,IAAI,CAAC,CAAC;IAEhE,IAAA,uCAAkB,EAAC,GAAG,EAAE;QACtB,IAAI,IAAI,EAAE;YACR,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC;AAvBW,QAAA,SAAS,aAuBpB;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAG,YAA+B,EAA0B,EAAE,CAC5F,CACE,MAAM,OAAO,CAAC,UAAU,CACtB,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,qBAAS,EAAC,IAAA,cAAQ,EAAC,QAAQ,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAC1F,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAgB,CAAC,CAAC"}

package/mobile/dist/ui-kit/SearchDialog/SearchDialog.js

@@ -16,7 +16,6 @@ exports.SearchDialog = (0, uni_jsx_1.JSX)(({ initialQuery }) => {
     const [searchResult, searchInputProps] = (0, useSearch_1.useSearch)({
         basePathList,
         initialQuery,
-        wasOpened: false,
     });
     const searchItems = (0, hooks_1.useMemo)(() => combineTopItemsAndSearchResult(topItems)(searchResult), [topItems, searchResult]);
     (0, hooks_1.useEffect)(() => printSearchItems(searchItems), [searchItems]); // Temp

package/mobile/dist/ui-kit/SearchDialog/SearchDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAiE;AAEjE,+DAA+E;AAE/E,kEAA+D;AAC/D,yCAA2C;AAC3C,yCAAsC;AACtC,oDAAiD;AACjD,gDAA6C;AAC7C,+CAA4C;AAM/B,QAAA,YAAY,GAAG,IAAA,aAAG,EAAoB,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,uBAAU,GAAE,CAAC;IAElC,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,IAAA,qBAAS,EAAC;QACjD,YAAY;QACZ,YAAY;QACZ,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAA,eAAO,EACzB,GAAG,EAAE,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAC5D,CAAC,QAAQ,EAAE,YAAY,CAAC,CACzB,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO;IAEtE,OAAO,CACL,uBAAC,eAAM,IAAC,IAAI,EAAE,uBAAC,yBAAW,IAAC,SAAS,EAAE,IAAI,KAAM,gBAAgB,GAAI,YAClE,uBAAC,iBAAO,IAAC,QAAQ,EAAE,WAAW,GAAI,GAC3B,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,8BAA8B,GAClC,CAAC,QAAwC,EAAE,EAAE,CAC7C,CAAC,YAA6C,EAAsB,EAAE,CACpE,QAAQ,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM;IACtC,CAAC,CAAC,IAAA,SAAG,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC;QACJ,KAAK,EAAE,kBAAkB,EAAE,GAAG,CAC5B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAA,cAAQ,EAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAC3E;KACF,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC;AAEX,OAAO;AACP,SAAS,gBAAgB,CAAC,QAA4B;IACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;QAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,EAAE,CAAC;KACpB;AACH,CAAC"}
+{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAiE;AAEjE,+DAA+E;AAE/E,kEAA+D;AAC/D,yCAA2C;AAC3C,yCAAsC;AACtC,oDAAiD;AACjD,gDAA6C;AAC7C,+CAA4C;AAM/B,QAAA,YAAY,GAAG,IAAA,aAAG,EAAoB,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,uBAAU,GAAE,CAAC;IAElC,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,IAAA,qBAAS,EAAC;QACjD,YAAY;QACZ,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAA,eAAO,EACzB,GAAG,EAAE,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAC5D,CAAC,QAAQ,EAAE,YAAY,CAAC,CACzB,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO;IAEtE,OAAO,CACL,uBAAC,eAAM,IAAC,IAAI,EAAE,uBAAC,yBAAW,IAAC,SAAS,EAAE,IAAI,KAAM,gBAAgB,GAAI,YAClE,uBAAC,iBAAO,IAAC,QAAQ,EAAE,WAAW,GAAI,GAC3B,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,8BAA8B,GAClC,CAAC,QAAwC,EAAE,EAAE,CAC7C,CAAC,YAA6C,EAAsB,EAAE,CACpE,QAAQ,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM;IACtC,CAAC,CAAC,IAAA,SAAG,EAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC;QACJ,KAAK,EAAE,kBAAkB,EAAE,GAAG,CAC5B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAA,cAAQ,EAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAC3E;KACF,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC;AAEX,OAAO;AACP,SAAS,gBAAgB,CAAC,QAA4B;IACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;QAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,EAAE,CAAC;KACpB;AACH,CAAC"}

package/mobile/dist/utils/Nullable.d.ts

@@ -0,0 +1 @@
+export declare type Nullable<T> = T | null | undefined;

package/mobile/dist/utils/Nullable.js

@@ -0,0 +1,2 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Nullable.js.map

package/mobile/dist/utils/Nullable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Nullable.js","sourceRoot":"","sources":["../../src/utils/Nullable.ts"],"names":[],"mappings":""}

package/mobile/lib/services/search/useSearch.d.ts

@@ -1,13 +1,13 @@
+import type { Nullable } from '../../utils/Nullable';
 import { CorpusItem } from './search';
 export declare type SearchResult = Array<CorpusItem[]>;
 interface SearchParams {
-    basePathList?: string[];
+    basePathList: Nullable<string[]>;
     initialQuery?: string;
-    wasOpened?: boolean;
 }
 export interface SearchInputProps {
     value: string;
     onChange: (query: string) => void;
 }
-export declare const useSearch: ({ basePathList, initialQuery, wasOpened, }: SearchParams) => [SearchResult | null, SearchInputProps];
+export declare const useSearch: ({ basePathList, initialQuery, }: SearchParams) => [SearchResult | null, SearchInputProps];
 export {};

package/mobile/lib/services/search/useSearch.js

@@ -1,21 +1,18 @@
-import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSON } from '../../utils/fetchJSON.js';
 import { joinPath } from '../../utils/url.js';
 import { useDebouncedEffect } from '../../utils/useDebouncedEffect.js';
 import { search } from './search.js';
 const SEARCH_INDEX_FILENAME = 'search.index.json';
-const DEFAULT_BASE_PATH = ['/'];
-export const useSearch = ({ basePathList = DEFAULT_BASE_PATH, initialQuery = '', wasOpened, }) => {
+export const useSearch = ({ basePathList, initialQuery = '', }) => {
     const [query, setQuery] = useState(initialQuery || '');
     useEffect(() => {
         if (initialQuery !== undefined && initialQuery !== null) {
             setQuery(initialQuery);
         }
     }, [initialQuery]);
-    const key = useMemo(() => basePathList.map((_) => (wasOpened ? _ : null)), // Load search index on very first search
-    [wasOpened, basePathList]);
-    const { data } = useAsyncData(key, fetchSearchIndex);
+    const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex);
     const [result, setResult] = useState(null);
     useDebouncedEffect(() => {
         if (data) {

package/mobile/lib/services/search/useSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAc,MAAM,EAAe,MAAM,UAAU,CAAC;AAE3D,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAClD,MAAM,iBAAiB,GAAG,CAAC,GAAG,CAAC,CAAC;AAehC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,YAAY,GAAG,iBAAiB,EAChC,YAAY,GAAG,EAAE,EACjB,SAAS,GACI,EAA2C,EAAE;IAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACvD,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,yCAAyC;IAChG,CAAC,SAAS,EAAE,YAAY,CAAC,CAC1B,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAErD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAsB,IAAI,CAAC,CAAC;IAEhE,kBAAkB,CAAC,GAAG,EAAE;QACtB,IAAI,IAAI,EAAE;YACR,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAG,YAA+B,EAA0B,EAAE,CAC5F,CACE,MAAM,OAAO,CAAC,UAAU,CACtB,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAC1F,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAgB,CAAC,CAAC"}
+{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAA2B,MAAM,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAclD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,YAAY,EACZ,YAAY,GAAG,EAAE,GACJ,EAA2C,EAAE;IAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACvD,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAE5F,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAsB,IAAI,CAAC,CAAC;IAEhE,kBAAkB,CAAC,GAAG,EAAE;QACtB,IAAI,IAAI,EAAE;YACR,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAG,YAA+B,EAA0B,EAAE,CAC5F,CACE,MAAM,OAAO,CAAC,UAAU,CACtB,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAC1F,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAgB,CAAC,CAAC"}

package/mobile/lib/ui-kit/SearchDialog/SearchDialog.js

@@ -14,7 +14,6 @@ export const SearchDialog = JSX(({ initialQuery }) => {
     const [searchResult, searchInputProps] = useSearch({
         basePathList,
         initialQuery,
-        wasOpened: false,
     });
     const searchItems = useMemo(() => combineTopItemsAndSearchResult(topItems)(searchResult), [topItems, searchResult]);
     useEffect(() => printSearchItems(searchItems), [searchItems]); // Temp

package/mobile/lib/ui-kit/SearchDialog/SearchDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAqB,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAoB,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAC;IAElC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;QACjD,YAAY;QACZ,YAAY;QACZ,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAC5D,CAAC,QAAQ,EAAE,YAAY,CAAC,CACzB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO;IAEtE,OAAO,CACL,KAAC,MAAM,IAAC,IAAI,EAAE,KAAC,WAAW,IAAC,SAAS,EAAE,IAAI,KAAM,gBAAgB,GAAI,YAClE,KAAC,OAAO,IAAC,QAAQ,EAAE,WAAW,GAAI,GAC3B,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,8BAA8B,GAClC,CAAC,QAAwC,EAAE,EAAE,CAC7C,CAAC,YAA6C,EAAsB,EAAE,CACpE,QAAQ,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM;IACtC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC;QACJ,KAAK,EAAE,kBAAkB,EAAE,GAAG,CAC5B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAC3E;KACF,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC;AAEX,OAAO;AACP,SAAS,gBAAgB,CAAC,QAA4B;IACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;QAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,EAAE,CAAC;KACpB;AACH,CAAC"}
+{"version":3,"file":"SearchDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchDialog/SearchDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAqB,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAoB,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;IACtE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAC;IAElC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,CAAC,YAAY,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;QACjD,YAAY;QACZ,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAC5D,CAAC,QAAQ,EAAE,YAAY,CAAC,CACzB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO;IAEtE,OAAO,CACL,KAAC,MAAM,IAAC,IAAI,EAAE,KAAC,WAAW,IAAC,SAAS,EAAE,IAAI,KAAM,gBAAgB,GAAI,YAClE,KAAC,OAAO,IAAC,QAAQ,EAAE,WAAW,GAAI,GAC3B,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,8BAA8B,GAClC,CAAC,QAAwC,EAAE,EAAE,CAC7C,CAAC,YAA6C,EAAsB,EAAE,CACpE,QAAQ,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM;IACtC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC;QACJ,KAAK,EAAE,kBAAkB,EAAE,GAAG,CAC5B,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAC3E;KACF,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC;AAEX,OAAO;AACP,SAAS,gBAAgB,CAAC,QAA4B;IACpD,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;QAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,EAAE,CAAC;KACpB;AACH,CAAC"}

package/mobile/lib/utils/Nullable.d.ts

@@ -0,0 +1 @@
+export declare type Nullable<T> = T | null | undefined;

package/mobile/lib/utils/Nullable.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Nullable.js.map

package/mobile/lib/utils/Nullable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Nullable.js","sourceRoot":"","sources":["../../src/utils/Nullable.ts"],"names":[],"mappings":""}

package/mobile/src/services/search/useSearch.ts

@@ -1,19 +1,18 @@
-import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import type { Nullable } from '../../utils/Nullable';
 import { fetchJSON } from '../../utils/fetchJSON';
 import { joinPath } from '../../utils/url';
 import { useDebouncedEffect } from '../../utils/useDebouncedEffect';
-import { CorpusItem, search, SearchIndex } from './search';
+import { CorpusItem, SearchIndex, search } from './search';
 
 const SEARCH_INDEX_FILENAME = 'search.index.json';
-const DEFAULT_BASE_PATH = ['/'];
 
 export type SearchResult = Array<CorpusItem[]>; // List of pages (CorpusItem) per base path from "basePathList"
 
 interface SearchParams {
-  basePathList?: string[];
+  basePathList: Nullable<string[]>;
   initialQuery?: string;
-  wasOpened?: boolean;
 }
 
 export interface SearchInputProps {
@@ -22,9 +21,8 @@ export interface SearchInputProps {
 }
 
 export const useSearch = ({
-  basePathList = DEFAULT_BASE_PATH,
+  basePathList,
   initialQuery = '',
-  wasOpened,
 }: SearchParams): [SearchResult | null, SearchInputProps] => {
   const [query, setQuery] = useState(initialQuery || '');
 
@@ -34,12 +32,7 @@ export const useSearch = ({
     }
   }, [initialQuery]);
 
-  const key = useMemo(
-    () => basePathList.map((_) => (wasOpened ? _ : null)), // Load search index on very first search
-    [wasOpened, basePathList],
-  );
-
-  const { data } = useAsyncData(key, fetchSearchIndex);
+  const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex);
 
   const [result, setResult] = useState<SearchResult | null>(null);
 

package/mobile/src/ui-kit/SearchDialog/SearchDialog.tsx

@@ -21,7 +21,6 @@ export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery }) => {
   const [searchResult, searchInputProps] = useSearch({
     basePathList,
     initialQuery,
-    wasOpened: false,
   });
 
   const searchItems = useMemo(

package/mobile/src/utils/Nullable.ts

@@ -0,0 +1 @@
+export type Nullable<T> = T | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.13.22",
+  "version": "0.13.23",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/services/search/useSearch.ts

@@ -1,19 +1,18 @@
-import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import type { Nullable } from '../../utils/Nullable';
 import { fetchJSON } from '../../utils/fetchJSON';
 import { joinPath } from '../../utils/url';
 import { useDebouncedEffect } from '../../utils/useDebouncedEffect';
-import { CorpusItem, search, SearchIndex } from './search';
+import { CorpusItem, SearchIndex, search } from './search';
 
 const SEARCH_INDEX_FILENAME = 'search.index.json';
-const DEFAULT_BASE_PATH = ['/'];
 
 export type SearchResult = Array<CorpusItem[]>; // List of pages (CorpusItem) per base path from "basePathList"
 
 interface SearchParams {
-  basePathList?: string[];
+  basePathList: Nullable<string[]>;
   initialQuery?: string;
-  wasOpened?: boolean;
 }
 
 export interface SearchInputProps {
@@ -22,9 +21,8 @@ export interface SearchInputProps {
 }
 
 export const useSearch = ({
-  basePathList = DEFAULT_BASE_PATH,
+  basePathList,
   initialQuery = '',
-  wasOpened,
 }: SearchParams): [SearchResult | null, SearchInputProps] => {
   const [query, setQuery] = useState(initialQuery || '');
 
@@ -34,12 +32,7 @@ export const useSearch = ({
     }
   }, [initialQuery]);
 
-  const key = useMemo(
-    () => basePathList.map((_) => (wasOpened ? _ : null)), // Load search index on very first search
-    [wasOpened, basePathList],
-  );
-
-  const { data } = useAsyncData(key, fetchSearchIndex);
+  const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex);
 
   const [result, setResult] = useState<SearchResult | null>(null);
 

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

@@ -21,7 +21,6 @@ export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery }) => {
   const [searchResult, searchInputProps] = useSearch({
     basePathList,
     initialQuery,
-    wasOpened: false,
   });
 
   const searchItems = useMemo(

package/src/utils/Nullable.ts

@@ -0,0 +1 @@
+export type Nullable<T> = T | null | undefined;