@redneckz/wildless-cms-uni-blocks 0.14.831 → 0.14.832

package/bundle/bundle.umd.js

@@ -192,10 +192,7 @@
         return useRouter._impl();
     }
     useRouter._impl = () => ({
-        isReady: false,
-        href: globalThis.location?.href || '/',
         pathname: globalThis.location?.pathname || '/',
-        query: {},
         push: () => {
             // Do nothing
         },
@@ -9933,7 +9930,24 @@
         }, [data, query]);
         return [result, { value: query, onChange: setQuery }];
     };
-    const fetchSearchIndex = async (...basePathList) => (await Promise.allSettled(basePathList.map((basePath) => fetchJSON(joinPath(basePath, '/', SEARCH_INDEX_FILENAME))))).map((_) => (_.status === 'fulfilled' ? _.value : {}));
+    const fetchSearchIndex = async (...basePathList) => (await Promise.allSettled(basePathList.map(async (basePath) => [
+        basePath,
+        await fetchJSON(joinPath(basePath, SEARCH_INDEX_FILENAME)),
+    ])))
+        .map((_) => (_.status === 'fulfilled' ? _.value : []))
+        .map(getSearchIndex);
+    const getSearchIndex = ([basePath, result]) => {
+        if (!result) {
+            return {};
+        }
+        return {
+            ...result,
+            corpus: result.corpus?.map((_) => ({
+                ..._,
+                uri: _.uri === 'index' ? basePath : joinPath(basePath, _.uri),
+            })),
+        };
+    };
 
     const SearchDialog = JSX(({ initialQuery, navigationItems, onClose }) => {
         const basePathList = useMemo(() => navigationItems?.map((_) => _.href || '/'), [navigationItems]);
@@ -10000,6 +10014,22 @@
         '': '',
     };
 
+    const useSortProductBlocks = (parentBlock = {}) => {
+        const [blocks, setBlocks] = useState(parentBlock.blocks ?? []);
+        const sessionStore = useSessionStore();
+        const offerIds = sessionStore?.offerIds || [];
+        const sortedBlocks = useMemo(() => {
+            const blocksMap = new Map(parentBlock.blocks?.map((block) => [block?.__id, block]) ?? []);
+            const blocksByOfferIds = offerIds
+                .map((id) => blocksMap.get(id))
+                .filter((block) => Boolean(block));
+            const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
+            return [...blocksByOfferIds, ...tailBlocks];
+        }, [blocks, offerIds]);
+        useEffect(() => setBlocks(sortedBlocks), []);
+        return blocks;
+    };
+
     const MIN_LENGTH_CHILD = 5;
     const SHORT_TILE_INDEXES = [1, 2, 3, 4];
     const LINK_SCHEMA = {
@@ -10021,10 +10051,14 @@
             required: ['href'],
         },
     };
-    const GalleryLayout = UniBlock(({ className = '', padding = 'p-0', gap = '', isInnerPadding = true, version = 'transparent', isTheme = false, isCardBorder = false, ...rest }) => (jsx(BlockWrapper, { className: style('grid grid-cols-1 sm:grid-cols-1 lg:grid-cols-4 lg:auto-rows-fr', gapStyles[gap], className), padding: padding, version: version, isTheme: isTheme, ...rest, children: renderChildren({
-            ...rest,
-            renderProps: getRenderProps({ isInnerPadding, isCardBorder }),
-        }) })), {
+    const GalleryLayout = UniBlock(({ className = '', padding = 'p-0', gap = '', isInnerPadding = true, version = 'transparent', isTheme = false, isCardBorder = false, block = {}, ...rest }) => {
+        const blocks = useSortProductBlocks(block);
+        return (jsx(BlockWrapper, { className: style('grid grid-cols-1 sm:grid-cols-1 lg:grid-cols-4 lg:auto-rows-fr', gapStyles[gap], className), padding: padding, version: version, isTheme: isTheme, ...rest, children: renderChildren({
+                ...rest,
+                block: { ...block, blocks },
+                renderProps: getRenderProps({ isInnerPadding, isCardBorder }),
+            }) }));
+    }, {
         childrenTypes: ['ProductBlock'],
         childSchema: () => LINK_SCHEMA,
         allowRemoveChild: (slot) => (slot?.blocks ?? []).length > MIN_LENGTH_CHILD,
@@ -10040,9 +10074,10 @@
         ...props,
         render: (renderProps) => productBlockDecorator(idx)({ ...props, ...renderProps }, i),
     }, `wrap_${i}`) ?? productBlockDecorator(idx)(props, i);
+    const visibilityByIdx = (i) => (Number(i) < 5 ? '' : 'hidden');
     const productBlockDecorator = (idx) => ({ blockClassName, block, render }, i) => {
         const modifiedBlock = modifyBlock(block, idx);
-        return (jsx(LinkWrapper, { ...modifiedBlock.content?.link, className: getChildStyle(idx), children: render({
+        return (jsx(LinkWrapper, { ...modifiedBlock.content?.link, className: style(visibilityByIdx(idx), getChildStyle(idx)), children: render({
                 blockClassName: style(blockClassName, 'h-full'),
                 block: modifiedBlock,
             }) }, String(i)));
@@ -10092,7 +10127,7 @@
     };
     const getRouterHref = (router) => (href) => {
         const basePath = getBasePath(env.SITE_URL);
-        return isURL(href) ? router.href : joinPath(basePath, router.pathname);
+        return isURL(href) ? globalThis?.location?.href : joinPath(basePath, router.pathname);
     };
 
     const DropdownMenu = JSX(({ className = '', items, activeItem, ariaLabel = 'Меню' }) => {
@@ -10335,7 +10370,7 @@
         const locationDialog = useDialog(LocationDialog, rest);
         const openSearchDialog = useCallback(() => searchDialog.open({}), [searchDialog]);
         const openLocationDialog = useCallback(() => locationDialog.open({}), [locationDialog]);
-        return (jsxs("div", { className: style('flex items-center ml-5 md:max-w-[300px] xl:max-w-full gap-lg', className), role: "navigation", children: [rest?.branches?.visible ? (jsx(TopItem, { className: "whitespace-nowrap text-ellipsis overflow-hidden", flat: true, href: "#", text: currentLocation?.name, data: getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? ''), onClick: openLocationDialog })) : null, rest?.officesAtms?.href ? (jsx(TopItem, { className: "whitespace-nowrap", flat: true, ...rest.officesAtms })) : null, jsx(HeaderSecondaryMenuButton, { image: { icon: 'LoupeIcon', iconVersion }, ariaLabel: rest?.search?.ariaLabel ?? 'Поиск', onClick: openSearchDialog, data: rest?.search?.data })] }));
+        return (jsxs("div", { className: style('flex items-center ml-5 md:max-w-[300px] xl:max-w-full gap-lg', className), role: "navigation", children: [currentLocation?.name && rest?.branches?.visible ? (jsx(ClientOnly, { children: jsx(TopItem, { className: "whitespace-nowrap text-ellipsis overflow-hidden", flat: true, href: "#", text: currentLocation?.name, data: getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? ''), onClick: openLocationDialog }) })) : null, rest?.officesAtms?.href ? (jsx(TopItem, { className: "whitespace-nowrap", flat: true, ...rest.officesAtms })) : null, jsx(HeaderSecondaryMenuButton, { image: { icon: 'LoupeIcon', iconVersion }, ariaLabel: rest?.search?.ariaLabel ?? 'Поиск', onClick: openSearchDialog, data: rest?.search?.data })] }));
     });
 
     const HeaderTopMenuItem = JSX(({ observerOptions, onVisibilityChange, children, className, ...rest }) => {
@@ -10992,39 +11027,40 @@
     };
     const renderTabsLayout = ({ className = '', tabsType = 'animated', ...props }) => tabsType ? (jsx("div", { className: style(tabsStyle[tabsType].wrapper, className), children: jsx(ScrollableTabsControl, { className: tabsStyle[tabsType].component, tabsType: tabsType, ...props }) })) : null;
 
+    const STICKY_STYLE = 'sticky top-1 z-20';
     const TabsLayout = UniBlock(
     // eslint-disable-next-line max-lines-per-function
     ({ className = '', tabs = [], block, tabsType, showCounter = false, isSticky = false, ...rest }) => {
-        const id = getId(block ?? {});
+        const id = getId(block || {});
         const router = useRouter();
         const isEveryLink = tabs.every((_) => _?.type === 'link');
+        const query = new URLSearchParams(globalThis?.location?.search || '');
+        const currentQueryParam = query.get[id];
         const tabsCounted = showCounter
             ? tabs.map((_) => ({
                 ..._,
                 count: _?.type === 'group' ? block?.slots?.[_?.tabName ?? '']?.length ?? 0 : 0,
             }))
             : tabs;
-        const { isReady } = router;
         const [activeTabIndex, setActiveTabIndex] = useState(getInitSelectedIndex(tabsCounted, getUrlParams(id)));
         const activeItem = tabsCounted[activeTabIndex];
         const defaultSelectedTab = tabsCounted.findIndex((_) => Boolean(_.selected));
         //TODO: Вынести в отдельный хук
         useEffect(() => {
-            const defaultTabIndex = router.query[id]
-                ? tabsCounted.findIndex((_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === router.query[id])
+            const defaultTabIndex = currentQueryParam
+                ? tabsCounted.findIndex((_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === currentQueryParam)
                 : defaultSelectedTab;
             setActiveTabIndex(defaultTabIndex === -1 ? 0 : defaultTabIndex);
-        }, [isReady, defaultSelectedTab, id]);
+        }, [defaultSelectedTab, currentQueryParam]);
         const slotName = getSlotName(tabsCounted[activeTabIndex], activeTabIndex);
         const updateUrlSearchTabParam = (_, i) => {
-            const searchParams = new URLSearchParams(router.query);
             if (_.text) {
-                searchParams.set(id, _?.tabName ?? String(i));
+                query.set(id, _?.tabName ?? String(i));
             }
             else {
-                searchParams.delete(id);
+                query.delete(id);
             }
-            router.replace(`${router.pathname}?${searchParams}`, '', { scroll: false });
+            router.replace(`${router.pathname}?${query}`, { scroll: false });
         };
         const handleChange = useCallback((_) => {
             const index = tabsCounted.indexOf(_);
@@ -11034,10 +11070,10 @@
                 updateUrlSearchTabParam(_, index);
             }
         }, [tabsCounted]);
-        return (jsxs(BlockWrapper, { className: style({ 'sticky top-1 z-20': isSticky && isEveryLink }, className), defaultPadding: "p-0", block: block, ...rest, children: [renderTabsLayout({
+        return (jsxs(BlockWrapper, { className: style({ [STICKY_STYLE]: [isSticky, isEveryLink].every(Boolean) }, className), defaultPadding: "p-0", block: block, ...rest, children: [renderTabsLayout({
                     className: style({
-                        'pb-1': block?.slots && tabsType === 'default',
-                        'sticky top-1 z-20': isSticky && !isEveryLink,
+                        'pb-1': [block?.slots, tabsType === 'default'].every(Boolean),
+                        [STICKY_STYLE]: [isSticky, !isEveryLink].every(Boolean),
                     }),
                     items: getItems(tabs, tabsCounted),
                     activeItem,
@@ -11451,7 +11487,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.830";
+    const packageVersion = "0.14.831";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;