@redneckz/wildless-cms-uni-blocks 0.14.486 → 0.15.0-beta

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

@@ -1,4 +1,4 @@
-export declare function zip<A>(a: A[]): [A][];
-export declare function zip<A, B>(a: A[], b: B[]): [A, B][];
-export declare function zip<A, B, C>(a: A[], b: B[], c: C[]): [A, B, C][];
-export declare function zip<A, B, C, D>(a: A[], b: B[], c: C[], d: D[]): [A, B, C, D][];
+export declare function zip<A>(a: A[]): [A][];
+export declare function zip<A, B>(a: A[], b: B[]): [A, B][];
+export declare function zip<A, B, C>(a: A[], b: B[], c: C[]): [A, B, C][];
+export declare function zip<A, B, C, D>(a: A[], b: B[], c: C[], d: D[]): [A, B, C, D][];

package/mobile/lib/utils/zip.js

@@ -1,4 +1,4 @@
-export function zip(firstCol, ...restCols) {
-    return firstCol.map((firstEl, rowIndex) => [firstEl, ...restCols.map((col) => col[rowIndex])]);
-}
+export function zip(firstCol, ...restCols) {
+    return firstCol.map((firstEl, rowIndex) => [firstEl, ...restCols.map((col) => col[rowIndex])]);
+}
 //# sourceMappingURL=zip.js.map

package/mobile/lib/validation/and.d.ts

@@ -1,2 +1,2 @@
-import { type Validator } from './validator';
-export declare const and: (...validators: Validator[]) => Validator;
+import { type Validator } from './validator';
+export declare const and: (...validators: Validator[]) => Validator;

package/mobile/lib/validation/and.js

@@ -1,2 +1,2 @@
-export const and = (...validators) => (data) => validators.flatMap((_) => _(data));
+export const and = (...validators) => (data) => validators.flatMap((_) => _(data));
 //# sourceMappingURL=and.js.map

package/mobile/lib/validation/objectValidator.d.ts

@@ -1,2 +1,2 @@
-import { type ValidationInfo, type Validator } from './validator';
-export declare const objectValidator: <VMap extends Record<string, Validator<any>>>(validatorsMap: VMap) => <O extends Partial<{ [P in keyof VMap]: Parameters<VMap[P]>[0]; }>>(o: O) => ValidationInfo;
+import { type ValidationInfo, type Validator } from './validator';
+export declare const objectValidator: <VMap extends Record<string, Validator<any>>>(validatorsMap: VMap) => <O extends Partial<{ [P in keyof VMap]: Parameters<VMap[P]>[0]; }>>(o: O) => ValidationInfo;

package/mobile/lib/validation/objectValidator.js

@@ -1,4 +1,4 @@
-export const objectValidator = (validatorsMap) => (o) => (o &&
-    Object.entries(validatorsMap).flatMap(([key, validator]) => validator(o[key]))) ||
-    [];
+export const objectValidator = (validatorsMap) => (o) => (o &&
+    Object.entries(validatorsMap).flatMap(([key, validator]) => validator(o[key]))) ||
+    [];
 //# sourceMappingURL=objectValidator.js.map

package/mobile/lib/validation/pattern.d.ts

@@ -1 +1 @@
-export declare const pattern: (regexp: RegExp) => (message: string) => import("./validator").Validator<any>;
+export declare const pattern: (regexp: RegExp) => (message: string) => import("./validator").Validator<any>;

package/mobile/lib/validation/pattern.js

@@ -1,3 +1,3 @@
-import { validator } from './validator.js';
-export const pattern = (regexp) => validator((_) => typeof _ === 'string' && regexp.test(_));
+import { validator } from './validator.js';
+export const pattern = (regexp) => validator((_) => typeof _ === 'string' && regexp.test(_));
 //# sourceMappingURL=pattern.js.map

package/mobile/lib/validation/required.d.ts

@@ -1 +1 @@
-export declare const required: (message: string) => import("./validator").Validator<any>;
+export declare const required: (message: string) => import("./validator").Validator<any>;

package/mobile/lib/validation/required.js

@@ -1,3 +1,3 @@
-import { validator } from './validator.js';
-export const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
+import { validator } from './validator.js';
+export const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
 //# sourceMappingURL=required.js.map

package/mobile/lib/validation/validator.d.ts

@@ -1,10 +1,10 @@
-declare type ValidationMessage = string;
-declare type ValidationSuccess = [];
-declare type ValidationErr = [ValidationMessage, ...ValidationMessage[]];
-export declare type ValidationInfo = ValidationSuccess | ValidationErr;
-export declare type Validator<T = any> = (_: T) => ValidationInfo;
-export declare const isValidationSuccess: (info: ValidationInfo) => info is [];
-export declare const isValidationErr: (info: ValidationInfo) => info is ValidationErr;
-declare type Predicate<T = any> = (_: T) => boolean;
-export declare const validator: <T = any>(predicate: Predicate<T>) => (message: string) => Validator<T>;
-export {};
+declare type ValidationMessage = string;
+declare type ValidationSuccess = [];
+declare type ValidationErr = [ValidationMessage, ...ValidationMessage[]];
+export declare type ValidationInfo = ValidationSuccess | ValidationErr;
+export declare type Validator<T = any> = (_: T) => ValidationInfo;
+export declare const isValidationSuccess: (info: ValidationInfo) => info is [];
+export declare const isValidationErr: (info: ValidationInfo) => info is ValidationErr;
+declare type Predicate<T = any> = (_: T) => boolean;
+export declare const validator: <T = any>(predicate: Predicate<T>) => (message: string) => Validator<T>;
+export {};

package/mobile/lib/validation/validator.js

@@ -1,4 +1,4 @@
-export const isValidationSuccess = (info) => !info?.length;
-export const isValidationErr = (info) => Boolean(info?.length);
-export const validator = (predicate) => (message) => (_) => predicate(_) ? [] : [message];
+export const isValidationSuccess = (info) => !info?.length;
+export const isValidationErr = (info) => Boolean(info?.length);
+export const validator = (predicate) => (message) => (_) => predicate(_) ? [] : [message];
 //# sourceMappingURL=validator.js.map

package/mobile/lib/validation/withValidator.d.ts

@@ -1,10 +1,10 @@
-import { type ValidationInfo, type Validator } from './validator';
-interface FieldProps<V> {
-    value?: V;
-    isDirty?: boolean;
-}
-export declare const withValidator: <V, P extends FieldProps<V> = FieldProps<V>>(props: P, validator: Validator<V | undefined>) => P & {
-    errors?: ValidationInfo | undefined;
-    error?: ValidationInfo[0];
-};
-export {};
+import { type ValidationInfo, type Validator } from './validator';
+interface FieldProps<V> {
+    value?: V;
+    isDirty?: boolean;
+}
+export declare const withValidator: <V, P extends FieldProps<V> = FieldProps<V>>(props: P, validator: Validator<V | undefined>) => P & {
+    errors?: ValidationInfo | undefined;
+    error?: ValidationInfo[0];
+};
+export {};

package/mobile/lib/validation/withValidator.js

@@ -1,10 +1,10 @@
-export const withValidator = (props, validator) => {
-    const { value, isDirty } = props;
-    const errors = isDirty ? validator(value) : [];
-    return {
-        ...props,
-        errors,
-        error: errors[0],
-    };
-};
+export const withValidator = (props, validator) => {
+    const { value, isDirty } = props;
+    const errors = isDirty ? validator(value) : [];
+    return {
+        ...props,
+        errors,
+        error: errors[0],
+    };
+};
 //# sourceMappingURL=withValidator.js.map

package/mobile/lib/wlc.json

@@ -1,5 +1,5 @@
-{
-    "PROD_BRANCH": "master",
-    "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
-    "CHAT_BOT": "personal"
-}
+{
+    "PROD_BRANCH": "master",
+    "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
+    "CHAT_BOT": "personal"
+}

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 { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
 import { useSearchDialog } from '../../ui-kit/SearchDialog/useSearchDialog';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
@@ -39,15 +40,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/Header/InternetBankButton.tsx

@@ -15,7 +15,7 @@ export const InternetBankButton = JSX<InternetButtonProps>(({ version, ...rest }
   return text ? (
     <LinkButton
       className={style(
-        'py-s font-light whitespace-nowrap text-primary-main',
+        'py-s font-light whitespace-nowrap',
         BUTTON_STYLE[version === 'transparent' ? 'transparent' : 'default'],
       )}
       {...rest}

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';
@@ -24,15 +24,17 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
     const locationDialog = useLocationDialog(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/Tabs/Tabs.tsx

@@ -16,7 +16,6 @@ const TAB_QUERY_PARAM_KEY = 'tab';
 export const Tabs = JSX<TabsBlockProps>(
   ({ className = '', isSticky, tabs = [], tabsMode, ...rest }) => {
     const router = useRouter();
-    const { isReady } = router;
     const tabsControlItems: TabItemBase[] = useMemo(() => tabs.map(normalizeTab), [tabs]);
 
     const [activeTabIndex, setActiveTabIndex] = useState(0);
@@ -26,15 +25,15 @@ export const Tabs = JSX<TabsBlockProps>(
         return;
       }
 
-      const defaultTabIndex = router.query[TAB_QUERY_PARAM_KEY]
-        ? tabs.findIndex(
-            (_) => _.type === 'group' && _.ref === router.query[TAB_QUERY_PARAM_KEY],
-          ) || 0
+      const query = new URLSearchParams(globalThis?.location?.search || '');
+
+      const defaultTabIndex = query.get(TAB_QUERY_PARAM_KEY)
+        ? tabs.findIndex((_) => _.type === 'group' && _.ref === query.get(TAB_QUERY_PARAM_KEY)) || 0
         : 0;
       const defaultTab = tabs[defaultTabIndex] || tabs[0];
       setActiveTabIndex(defaultTabIndex);
       fireTabEvent(defaultTab);
-    }, [isReady]);
+    }, []);
 
     useEffect(() => {
       const activeTab = tabs[activeTabIndex];
@@ -49,13 +48,13 @@ export const Tabs = JSX<TabsBlockProps>(
     }, [tabs, activeTabIndex]);
 
     const updateUrlSearchTabParam = (_: TabItemBase) => {
-      const searchParams = new URLSearchParams(router.query as Record<string, string>);
+      const searchParams = new URLSearchParams(globalThis?.location?.search || '');
       if (_.name) {
         searchParams.set(TAB_QUERY_PARAM_KEY, _.name);
       } else {
         searchParams.delete(TAB_QUERY_PARAM_KEY);
       }
-      router.replace(`${router.pathname}?${searchParams}`, '', { scroll: false });
+      router.replace(`${router.pathname}?${searchParams}`, { scroll: false });
     };
 
     const handleChange = useCallback(

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

@@ -10,6 +10,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;
 };
@@ -17,10 +19,19 @@ export interface TabsLayoutProps extends TabsLayoutContent, UniBlockProps {}
 
 export const TabsLayout = UniBlock<TabsLayoutProps>(
   // eslint-disable-next-line max-lines-per-function
-  ({ className = '', tabs = [], block, tabsType, showCounter = false, isSticky = false, ...rest }) => {
-    const id = getId(block?.__id, block?.anchor);
+  ({
+    className = '',
+    tabs = [],
+    block,
+    tabsType,
+    showCounter = false,
+    isSticky = false,
+    ...rest
+  }) => {
+    const id = block?.__id ? `tabs-${block.__id}` : 'tabs';
     const router = useRouter();
     const isEveryLink = tabs.every((_) => _?.type === 'link');
+    const query = new URLSearchParams(globalThis?.location?.search || '');
 
     const tabsCounted: Tab[] = showCounter
       ? tabs.map((_) => ({
@@ -29,7 +40,6 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
         }))
       : tabs;
 
-    const { isReady } = router;
     const [activeTabIndex, setActiveTabIndex] = useState(
       getInitSelectedIndex(tabsCounted, getUrlParams(id)),
     );
@@ -38,25 +48,23 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
 
     //TODO: Вынести в отдельный хук
     useEffect(() => {
-      const defaultTabIndex = router.query[id]
-        ? tabsCounted.findIndex(
-            (_, i) => _.type === 'group' && (_?.tabName ?? String(i)) === router.query[id],
-          )
+      const defaultTabIndex = query.get[id]
+        ? tabsCounted.findIndex((_, index) => _.type === 'group' && String(index) === query.get[id])
         : defaultSelectedTab;
 
       setActiveTabIndex(defaultTabIndex === -1 ? 0 : defaultTabIndex);
-    }, [isReady, defaultSelectedTab, id]);
+    }, [defaultSelectedTab, id]);
 
     const slotName = getSlotName(tabsCounted[activeTabIndex] as TabCountedProps, activeTabIndex);
 
-    const updateUrlSearchTabParam = (_: TabItemBase, i: number) => {
-      const searchParams = new URLSearchParams(router.query as Record<string, string>);
+    const updateUrlSearchTabParam = (_: TabItemBase, index: number) => {
+      const searchParams = new URLSearchParams(globalThis?.location?.search || '');
       if (_.text) {
-        searchParams.set(id, _?.tabName ?? String(i));
+        searchParams.set(id, String(index));
       } else {
         searchParams.delete(id);
       }
-      router.replace(`${router.pathname}?${searchParams}`, '', { scroll: false });
+      router.replace(`${router.pathname}?${searchParams}`, { scroll: false });
     };
 
     const handleChange = useCallback(
@@ -75,15 +83,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': Boolean(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,
@@ -109,8 +117,6 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
   },
 );
 
-const getId = (id?: string, seoName?: string) => seoName ?? id ?? 'tabs';
-
 const getItems = (tabs: Tab[], tabsCounted: Tab[]) => (tabsCounted?.length ? tabsCounted : tabs);
 
 const getSlotName = (tab: GroupTab, index: number): string => tab?.tabName || `Слот №${index}`;

package/mobile/src/hooks/useActiveRoute.ts

@@ -34,5 +34,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/hooks/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/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/setup-fixture.ts

@@ -24,10 +24,7 @@ useRouter.setup(() => {
   }, []);
 
   return {
-    href,
-    isReady: true,
     pathname: new URL(href).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.486",
+  "version": "0.15.0-beta",
   "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",
@@ -136,19 +116,11 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@redneckz/json-op": "^0.0.7",
-    "@redneckz/json-ref": "^0.0.7",
+    "@redneckz/json-op": "^0.0.12",
+    "@redneckz/json-ref": "^0.0.14",
     "@redneckz/uni-jsx": "^2.6.2",
     "@tailwindcss/container-queries": "^0.1.0",
-    "@types/json-schema": "^7.0.11",
-    "glob": "^8.0.3",
-    "rehype-parse": "^8.0.4",
-    "rehype-sanitize": "^5.0.1",
-    "rehype-stringify": "^9.0.3",
-    "remark-html": "^15.0.1",
-    "remark-parse": "^10.0.1",
-    "sharp": "^0.30.6",
-    "unified": "^10.1.2"
+    "@types/json-schema": "^7.0.11"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.19.4",
@@ -159,9 +131,7 @@
     "@rollup/plugin-typescript": "^8.3.3",
     "@size-limit/file": "^7.0.8",
     "@testing-library/react": "^12.1.5",
-    "@types/glob": "^8.0.0",
     "@types/jest": "^28.1.5",
-    "@types/sharp": "^0.31.0",
     "@types/yandex-maps": "^2.1.27",
     "@typescript-eslint/eslint-plugin": "^5.59.6",
     "@typescript-eslint/experimental-utils": "^5.59.6",
@@ -258,4 +228,4 @@
       "optional": true
     }
   }
-}
+}

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/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 { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
 import { useSearchDialog } from '../../ui-kit/SearchDialog/useSearchDialog';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
@@ -39,15 +40,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/Header/InternetBankButton.tsx

@@ -15,7 +15,7 @@ export const InternetBankButton = JSX<InternetButtonProps>(({ version, ...rest }
   return text ? (
     <LinkButton
       className={style(
-        'py-s font-light whitespace-nowrap text-primary-main',
+        'py-s font-light whitespace-nowrap',
         BUTTON_STYLE[version === 'transparent' ? 'transparent' : 'default'],
       )}
       {...rest}