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

package/mobile/lib/setup-fixture.js

@@ -20,10 +20,7 @@ useRouter.setup(() => {
         };
     }, []);
     return {
-        href,
-        isReady: true,
         pathname: new URL(href).pathname,
-        query: Object.fromEntries(new URLSearchParams(globalThis.location.search)),
         push: (url) => {
             globalThis.history.pushState(null, '', url);
         },

package/mobile/lib/setup-fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAS,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/E,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI,GAAG,CAAC,IAAc,CAAC,CAAC,QAAQ;QAC1C,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1E,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC9C,MAAM,gBAAgB,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,KAAK,QAAQ,CAAC;IAEvD,IAAI,CAAC,gBAAgB,EAAE;QACrB,EAAE,EAAE,cAAc,EAAE,CAAC;KACtB;IAED,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC;AAEH,iBAAiB,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7B,MAAM,EAAE,IAAI;IACZ,IAAI,IAAI;QACN,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;IAClC,CAAC;IACD,IAAI,MAAM;QACR,OAAO,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;IACpC,CAAC;CACF,CAAC,CAAC,CAAC"}
+{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAS,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/E,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,QAAQ,EAAE,IAAI,GAAG,CAAC,IAAc,CAAC,CAAC,QAAQ;QAC1C,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC9C,MAAM,gBAAgB,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,KAAK,QAAQ,CAAC;IAEvD,IAAI,CAAC,gBAAgB,EAAE;QACrB,EAAE,EAAE,cAAc,EAAE,CAAC;KACtB;IAED,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC;AAEH,iBAAiB,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7B,MAAM,EAAE,IAAI;IACZ,IAAI,IAAI;QACN,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;IAClC,CAAC;IACD,IAAI,MAAM;QACR,OAAO,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;IACpC,CAAC;CACF,CAAC,CAAC,CAAC"}

package/mobile/src/components/GalleryLayout/GalleryLayout.tsx

@@ -15,6 +15,7 @@ import { style } from '../../utils/style';
 import { gapStyles } from '../HorizontalLayout/gapStyles';
 import { type ProductBlockContent } from '../ProductBlock/ProductBlockContent';
 import { type GalleryLayoutContent } from './GalleryLayoutContent';
+import { useSortProductBlocks } from './useSortProductBlocks';
 
 const MIN_LENGTH_CHILD = 5;
 const SHORT_TILE_INDEXES = [1, 2, 3, 4];
@@ -49,25 +50,31 @@ export const GalleryLayout = UniBlock<GalleryLayoutProps>(
     version = 'transparent',
     isTheme = false,
     isCardBorder = false,
+    block = {},
     ...rest
-  }) => (
-    <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}
-    >
-      {renderChildren({
-        ...rest,
-        renderProps: getRenderProps({ isInnerPadding, isCardBorder }),
-      })}
-    </BlockWrapper>
-  ),
+  }) => {
+    const blocks = useSortProductBlocks(block);
+
+    return (
+      <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}
+      >
+        {renderChildren({
+          ...rest,
+          block: { ...block, blocks },
+          renderProps: getRenderProps({ isInnerPadding, isCardBorder }),
+        })}
+      </BlockWrapper>
+    );
+  },
   {
     childrenTypes: ['ProductBlock'],
     childSchema: () => LINK_SCHEMA,
@@ -107,13 +114,19 @@ const blockDecoratorWrapper =
       `wrap_${i}`,
     ) ?? productBlockDecorator(idx)(props, i);
 
+const visibilityByIdx = (i?: number) => (Number(i) < 5 ? '' : 'hidden');
+
 const productBlockDecorator =
   (idx: number): BlockDecorator =>
   ({ blockClassName, block, render }, i) => {
     const modifiedBlock = modifyBlock(block, idx);
 
     return (
-      <LinkWrapper key={String(i)} {...modifiedBlock.content?.link} className={getChildStyle(idx)}>
+      <LinkWrapper
+        key={String(i)}
+        {...modifiedBlock.content?.link}
+        className={style(visibilityByIdx(idx), getChildStyle(idx))}
+      >
         {render({
           blockClassName: style(blockClassName, 'h-full'),
           block: modifiedBlock,

package/mobile/src/components/GalleryLayout/useSortProductBlocks.ts

@@ -0,0 +1,25 @@
+import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { type BlockDef } from '../../model/ContentPageDef';
+
+export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] => {
+  const [blocks, setBlocks] = useState(parentBlock.blocks ?? []);
+  const sessionStore = useSessionStore();
+  const offerIds: string[] = 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): block is BlockDef => Boolean(block));
+
+    const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
+
+    return [...blocksByOfferIds, ...tailBlocks];
+  }, [blocks, offerIds]);
+
+  useEffect(() => setBlocks(sortedBlocks), []);
+
+  return blocks;
+};

package/mobile/src/components/Header/HeaderSecondaryMenu.tsx

@@ -7,6 +7,7 @@ import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspects
 import { useLocation } from '../../hooks/useLocation';
 import { type BlockVersion } from '../../model/BlockVersion';
 import { type IconVersion } from '../../model/IconVersion';
+import { ClientOnly } from '../../ui-kit/ClientOnly';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
 import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
@@ -36,15 +37,17 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
         className={style('flex items-center ml-5 md:max-w-[300px] xl:max-w-full gap-lg', className)}
         role="navigation"
       >
-        {rest?.branches?.visible ? (
-          <TopItem
-            className="whitespace-nowrap text-ellipsis overflow-hidden"
-            flat={true}
-            href="#"
-            text={currentLocation?.name}
-            data={getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? '')}
-            onClick={openLocationDialog}
-          />
+        {currentLocation?.name && rest?.branches?.visible ? (
+          <ClientOnly>
+            <TopItem
+              className="whitespace-nowrap text-ellipsis overflow-hidden"
+              flat={true}
+              href="#"
+              text={currentLocation?.name}
+              data={getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? '')}
+              onClick={openLocationDialog}
+            />
+          </ClientOnly>
         ) : null}
         {rest?.officesAtms?.href ? (
           <TopItem className="whitespace-nowrap" flat={true} {...rest.officesAtms} />

package/mobile/src/components/StickyBottomMenu/BurgerMenuDialog.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type HeaderData } from '../../data/HeaderData';
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type StickyMenuItem } from '../../data/StickyMobileData';
@@ -23,15 +23,17 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
     const locationDialog = useDialog(LocationDialog, locationDialogProps);
     const { name: location } = useLocation();
     const menuDimensions = menuRef?.current?.getBoundingClientRect();
-    const basePath = getBasePath(env.SITE_URL);
 
-    const handleIframeLoad = () => {
-      const iframeWindow: Window = globalThis.frames['burger-menu-iframe'];
+    const handleIframeLoad = useCallback(() => {
+      const iframeWindow: Window = globalThis?.frames['burger-menu-iframe'];
       const ifDoc: HTMLIFrameElement = document.getElementsByTagName('iframe')['iframe-dialog'];
+
       ifDoc.style.height = String(ifDoc?.contentWindow?.document.body.offsetHeight) + 'px';
+
+      const basePath = getBasePath(env.SITE_URL);
       iframeWindow.postMessage({ type: 'currentTab', data: basePath?.slice(1) }, '*');
       iframeWindow.postMessage({ type: 'currentLocation', data: location }, '*');
-    };
+    }, [env.SITE_URL]);
 
     useEffect(() => {
       const iframeWindow: Window = globalThis.frames['burger-menu-iframe'];
@@ -74,7 +76,7 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
           <iframe
             id="iframe-dialog"
             name="burger-menu-iframe"
-            onLoad={() => handleIframeLoad()}
+            onLoad={handleIframeLoad}
             src={menuItem?.src}
             width={menuDimensions?.width || 0}
           />

package/mobile/src/components/TabsLayout/TabsLayout.tsx

@@ -11,6 +11,8 @@ import { style } from '../../utils/style';
 import { renderTabsLayout } from './renderTabsLayout';
 import { type GroupTab, type Tab, type TabsLayoutContent } from './TabsLayoutContent';
 
+const STICKY_STYLE = 'sticky top-1 z-20';
+
 type TabCountedProps = GroupTab & {
   count?: number;
 };
@@ -27,9 +29,11 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
     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: Tab[] = showCounter
       ? tabs.map((_) => ({
@@ -38,7 +42,6 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
         }))
       : tabs;
 
-    const { isReady } = router;
     const [activeTabIndex, setActiveTabIndex] = useState(
       getInitSelectedIndex(tabsCounted, getUrlParams(id)),
     );
@@ -47,25 +50,24 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
 
     //TODO: Вынести в отдельный хук
     useEffect(() => {
-      const defaultTabIndex = router.query[id]
+      const defaultTabIndex = currentQueryParam
         ? tabsCounted.findIndex(
-            (_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === router.query[id],
+            (_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === currentQueryParam,
           )
         : defaultSelectedTab;
 
       setActiveTabIndex(defaultTabIndex === -1 ? 0 : defaultTabIndex);
-    }, [isReady, defaultSelectedTab, id]);
+    }, [defaultSelectedTab, currentQueryParam]);
 
     const slotName = getSlotName(tabsCounted[activeTabIndex] as TabCountedProps, activeTabIndex);
 
     const updateUrlSearchTabParam = (_: TabItemBase, i: number) => {
-      const searchParams = new URLSearchParams(router.query as Record<string, string>);
       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(
@@ -84,15 +86,15 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
 
     return (
       <BlockWrapper
-        className={style({ 'sticky top-1 z-20': isSticky && isEveryLink }, className)} // Sticky is only used for type links
+        className={style({ [STICKY_STYLE]: [isSticky, isEveryLink].every(Boolean) }, className)} // Sticky is only used for type links
         defaultPadding="p-0"
         block={block}
         {...rest}
       >
         {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,

package/mobile/src/external/useRouter.ts

@@ -4,13 +4,9 @@ interface RouterOptions {
 
 export interface Router {
   pathname: string;
-  query: Record<string, string | string[] | undefined>;
-  href?: string;
-  basePath?: string;
-  push: (url: string, as?: string, options?: RouterOptions) => void;
-  replace: (url: string, as?: string, options?: RouterOptions) => void;
+  push: (url: string, options?: RouterOptions) => void;
+  replace: (url: string, options?: RouterOptions) => void;
   back: () => void;
-  isReady: boolean;
 }
 
 export function useRouter(): Router {
@@ -18,10 +14,7 @@ export function useRouter(): Router {
 }
 
 useRouter._impl = (): Router => ({
-  isReady: false,
-  href: globalThis.location?.href || '/',
   pathname: globalThis.location?.pathname || '/',
-  query: {},
   push: () => {
     // Do nothing
   },

package/mobile/src/hooks/useActiveRoute.ts

@@ -33,5 +33,5 @@ const isHrefActive =
 const getRouterHref = (router: Router) => (href?: string) => {
   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);
 };

package/mobile/src/model/Fallback.ts

@@ -1,5 +1,4 @@
 type Key = string;
 type Data = any;
 
-export type FallbackMap = Record<Key, () => Promise<Data>>;
 export type Fallback = Record<Key, Data>;

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

@@ -10,6 +10,8 @@ const SEARCH_INDEX_FILENAME = 'search.index.json';
 
 export type SearchResult = Array<CorpusItem[]>; // List of pages (CorpusItem) per base path from "basePathList"
 
+type FetchSearchIndexResult = [string, SearchIndex | null];
+
 interface SearchParams {
   basePathList: Nullable<string[]>;
   initialQuery?: string;
@@ -47,7 +49,26 @@ export const useSearch = ({
 
 const fetchSearchIndex = async (...basePathList: (string | null)[]): Promise<SearchIndex[]> =>
   (
-    await Promise.allSettled<SearchIndex | null>(
-      basePathList.map((basePath) => fetchJSON(joinPath(basePath, '/', SEARCH_INDEX_FILENAME))),
+    await Promise.allSettled(
+      basePathList.map(async (basePath) => [
+        basePath,
+        await fetchJSON(joinPath(basePath, SEARCH_INDEX_FILENAME)),
+      ]),
     )
-  ).map((_) => (_.status === 'fulfilled' ? _.value : {}) as SearchIndex);
+  )
+    .map((_) => (_.status === 'fulfilled' ? _.value : []) as FetchSearchIndexResult)
+    .map(getSearchIndex);
+
+const getSearchIndex = ([basePath, result]: FetchSearchIndexResult): SearchIndex => {
+  if (!result) {
+    return {};
+  }
+
+  return {
+    ...result,
+    corpus: result.corpus?.map((_) => ({
+      ..._,
+      uri: _.uri === 'index' ? basePath : joinPath(basePath, _.uri),
+    })),
+  };
+};

package/mobile/src/setup-fixture.ts

@@ -26,10 +26,7 @@ useRouter.setup(() => {
   }, []);
 
   return {
-    href,
-    isReady: true,
     pathname: new URL(href as string).pathname,
-    query: Object.fromEntries(new URLSearchParams(globalThis.location.search)),
     push: (url: string) => {
       globalThis.history.pushState(null, '', url);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.831",
+  "version": "0.14.832",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -39,26 +39,6 @@
     "./lib/common.css": "./lib/common.css",
     "./mobile/lib/common.css": "./mobile/lib/common.css",
     "./fonts/ubuntu/*": "./fonts/ubuntu/*",
-    "./lib/content-page-repository": {
-      "import": "./lib/content-page-repository/index.js",
-      "require": "./dist/content-page-repository/index.js",
-      "types": "./lib/content-page-repository/index.d.ts"
-    },
-    "./lib/content-page-repository/*": {
-      "import": "./lib/content-page-repository/*.js",
-      "require": "./dist/content-page-repository/*.js",
-      "types": "./lib/content-page-repository/*.d.ts"
-    },
-    "./mobile/lib/content-page-repository": {
-      "import": "./mobile/lib/content-page-repository/index.js",
-      "require": "./mobile/dist/content-page-repository/index.js",
-      "types": "./mobile/lib/content-page-repository/index.d.ts"
-    },
-    "./mobile/lib/content-page-repository/*": {
-      "import": "./mobile/lib/content-page-repository/*.js",
-      "require": "./mobile/dist/content-page-repository/*.js",
-      "types": "./mobile/lib/content-page-repository/*.d.ts"
-    },
     "./bundle/*.js": "./bundle/*.js",
     "./bundle/*.json": "./bundle/*.json",
     "./*.json": "./*.json",

package/src/components/ContentPage/ContentPage.fixture.mobile.tsx

@@ -4,15 +4,12 @@ import '../../setup-fixture';
 import { type ContentPageDef } from '../../model/ContentPageDef';
 import { Blocks } from '../Blocks';
 import { ContentPage } from './ContentPage';
-import { normalizePage } from './normalizePage';
 import { useContentPageData } from './useContentPageData';
 
 export default {
   default: () => {
     const data = useContentPageData(Blocks);
 
-    return (
-      <ContentPage blocksRegistry={Blocks} data={normalizePage(Blocks)(data as ContentPageDef)} />
-    );
+    return <ContentPage blocksRegistry={Blocks} data={data as ContentPageDef} />;
   },
 };

package/src/components/ContentPage/ContentPage.fixture.tsx

@@ -5,7 +5,6 @@ import { type BlockDecorator } from '../../model/BlockDecorator';
 import { type ContentPageDef } from '../../model/ContentPageDef';
 import { Blocks } from '../Blocks';
 import { ContentPage } from './ContentPage';
-import { normalizePage } from './normalizePage';
 import { useContentPageData } from './useContentPageData';
 
 const blockDecorator: BlockDecorator = ({ blockClassName, block, render }, i) => (
@@ -33,11 +32,7 @@ export default {
     const data = useContentPageData(Blocks);
 
     return (
-      <ContentPage
-        className="bg-main"
-        blocksRegistry={Blocks}
-        data={normalizePage(Blocks)(data as ContentPageDef)}
-      />
+      <ContentPage className="bg-main" blocksRegistry={Blocks} data={data as ContentPageDef} />
     );
   },
   editor: () => {
@@ -48,7 +43,7 @@ export default {
         <ContentPage
           className="bg-transparent"
           blocksRegistry={Blocks}
-          data={normalizePage(Blocks)(data as ContentPageDef)}
+          data={data as ContentPageDef}
           blockDecorator={blockDecorator}
         />
       </div>

package/src/components/GalleryLayout/GalleryLayout.tsx

@@ -15,6 +15,7 @@ import { style } from '../../utils/style';
 import { gapStyles } from '../HorizontalLayout/gapStyles';
 import { type ProductBlockContent } from '../ProductBlock/ProductBlockContent';
 import { type GalleryLayoutContent } from './GalleryLayoutContent';
+import { useSortProductBlocks } from './useSortProductBlocks';
 
 const MIN_LENGTH_CHILD = 5;
 const SHORT_TILE_INDEXES = [1, 2, 3, 4];
@@ -49,25 +50,31 @@ export const GalleryLayout = UniBlock<GalleryLayoutProps>(
     version = 'transparent',
     isTheme = false,
     isCardBorder = false,
+    block = {},
     ...rest
-  }) => (
-    <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}
-    >
-      {renderChildren({
-        ...rest,
-        renderProps: getRenderProps({ isInnerPadding, isCardBorder }),
-      })}
-    </BlockWrapper>
-  ),
+  }) => {
+    const blocks = useSortProductBlocks(block);
+
+    return (
+      <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}
+      >
+        {renderChildren({
+          ...rest,
+          block: { ...block, blocks },
+          renderProps: getRenderProps({ isInnerPadding, isCardBorder }),
+        })}
+      </BlockWrapper>
+    );
+  },
   {
     childrenTypes: ['ProductBlock'],
     childSchema: () => LINK_SCHEMA,
@@ -107,13 +114,19 @@ const blockDecoratorWrapper =
       `wrap_${i}`,
     ) ?? productBlockDecorator(idx)(props, i);
 
+const visibilityByIdx = (i?: number) => (Number(i) < 5 ? '' : 'hidden');
+
 const productBlockDecorator =
   (idx: number): BlockDecorator =>
   ({ blockClassName, block, render }, i) => {
     const modifiedBlock = modifyBlock(block, idx);
 
     return (
-      <LinkWrapper key={String(i)} {...modifiedBlock.content?.link} className={getChildStyle(idx)}>
+      <LinkWrapper
+        key={String(i)}
+        {...modifiedBlock.content?.link}
+        className={style(visibilityByIdx(idx), getChildStyle(idx))}
+      >
         {render({
           blockClassName: style(blockClassName, 'h-full'),
           block: modifiedBlock,

package/src/components/GalleryLayout/useSortProductBlocks.ts

@@ -0,0 +1,25 @@
+import { useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { type BlockDef } from '../../model/ContentPageDef';
+
+export const useSortProductBlocks = (parentBlock: BlockDef = {}): BlockDef[] => {
+  const [blocks, setBlocks] = useState(parentBlock.blocks ?? []);
+  const sessionStore = useSessionStore();
+  const offerIds: string[] = 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): block is BlockDef => Boolean(block));
+
+    const tailBlocks = blocks.filter(({ __id = '' }) => !offerIds.includes(__id));
+
+    return [...blocksByOfferIds, ...tailBlocks];
+  }, [blocks, offerIds]);
+
+  useEffect(() => setBlocks(sortedBlocks), []);
+
+  return blocks;
+};

package/src/components/Header/HeaderSecondaryMenu.tsx

@@ -7,6 +7,7 @@ import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspects
 import { useLocation } from '../../hooks/useLocation';
 import { type BlockVersion } from '../../model/BlockVersion';
 import { type IconVersion } from '../../model/IconVersion';
+import { ClientOnly } from '../../ui-kit/ClientOnly';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
 import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
@@ -36,15 +37,17 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
         className={style('flex items-center ml-5 md:max-w-[300px] xl:max-w-full gap-lg', className)}
         role="navigation"
       >
-        {rest?.branches?.visible ? (
-          <TopItem
-            className="whitespace-nowrap text-ellipsis overflow-hidden"
-            flat={true}
-            href="#"
-            text={currentLocation?.name}
-            data={getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? '')}
-            onClick={openLocationDialog}
-          />
+        {currentLocation?.name && rest?.branches?.visible ? (
+          <ClientOnly>
+            <TopItem
+              className="whitespace-nowrap text-ellipsis overflow-hidden"
+              flat={true}
+              href="#"
+              text={currentLocation?.name}
+              data={getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? '')}
+              onClick={openLocationDialog}
+            />
+          </ClientOnly>
         ) : null}
         {rest?.officesAtms?.href ? (
           <TopItem className="whitespace-nowrap" flat={true} {...rest.officesAtms} />

package/src/components/StickyBottomMenu/BurgerMenuDialog.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type HeaderData } from '../../data/HeaderData';
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type StickyMenuItem } from '../../data/StickyMobileData';
@@ -23,15 +23,17 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
     const locationDialog = useDialog(LocationDialog, locationDialogProps);
     const { name: location } = useLocation();
     const menuDimensions = menuRef?.current?.getBoundingClientRect();
-    const basePath = getBasePath(env.SITE_URL);
 
-    const handleIframeLoad = () => {
-      const iframeWindow: Window = globalThis.frames['burger-menu-iframe'];
+    const handleIframeLoad = useCallback(() => {
+      const iframeWindow: Window = globalThis?.frames['burger-menu-iframe'];
       const ifDoc: HTMLIFrameElement = document.getElementsByTagName('iframe')['iframe-dialog'];
+
       ifDoc.style.height = String(ifDoc?.contentWindow?.document.body.offsetHeight) + 'px';
+
+      const basePath = getBasePath(env.SITE_URL);
       iframeWindow.postMessage({ type: 'currentTab', data: basePath?.slice(1) }, '*');
       iframeWindow.postMessage({ type: 'currentLocation', data: location }, '*');
-    };
+    }, [env.SITE_URL]);
 
     useEffect(() => {
       const iframeWindow: Window = globalThis.frames['burger-menu-iframe'];
@@ -74,7 +76,7 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
           <iframe
             id="iframe-dialog"
             name="burger-menu-iframe"
-            onLoad={() => handleIframeLoad()}
+            onLoad={handleIframeLoad}
             src={menuItem?.src}
             width={menuDimensions?.width || 0}
           />