@redneckz/wildless-cms-uni-blocks 0.6.24 → 0.6.26

package/mobile/lib/content-page-repository/ContentPageRepository.js

@@ -6,50 +6,39 @@ const find = util.promisify(glob);
 const bySlug = (slug) => (content) => content.slug === slug;
 const byCustomPageType = (type) => (content) => type ? content._customPageType === type : !content._customPageType;
 const not = (predicate) => (_) => !predicate(_);
-export function ContentPageRepository({ contentDir = 'content', publicDir = 'public', } = {}) {
-    function listAllContentPages() {
-        return find(`${contentDir}/**/*.page.json`);
+export class ContentPageRepository {
+    options;
+    static inst = new ContentPageRepository();
+    cache = {};
+    constructor(options = {
+        contentDir: 'content',
+        publicDir: 'public',
+    }) {
+        this.options = options;
     }
-    async function getAllContentPagesMap() {
-        const pagePaths = await listAllContentPages();
-        const pages = await Promise.all(pagePaths.map(readPage));
-        return pagePaths.reduce((result, path, i) => ({
-            ...result,
-            [path]: pages[i],
-        }), {});
+    async listAllContentPages() {
+        return find(`${this.options.contentDir}/**/*.page.json`);
     }
-    async function getAllContentPages() {
-        return Object.values(await getAllContentPagesMap());
+    async getAllContentPages() {
+        const pagePaths = await this.listAllContentPages();
+        return Promise.all(pagePaths.map((_) => this.readPage(_)));
     }
-    async function getSecondaryContentPages(customPageType) {
-        const pages = await getAllContentPages();
+    async getSecondaryContentPages(customPageType) {
+        const pages = await this.getAllContentPages();
         return pages.filter(not(bySlug(INDEX_PAGE_SLUG))).filter(byCustomPageType(customPageType));
     }
-    async function getContentPageBySlug(slug) {
-        const pages = await getAllContentPages();
+    async getContentPageBySlug(slug) {
+        const pages = await this.getAllContentPages();
         return pages.find(bySlug(slug));
     }
-    async function getIndexPage() {
-        return await getContentPageBySlug(INDEX_PAGE_SLUG);
+    async getIndexPage() {
+        return this.getContentPageBySlug(INDEX_PAGE_SLUG);
     }
-    const cache = {};
-    async function readPage(filePath) {
-        if (!(filePath in cache)) {
-            cache[filePath] = await transformContentPage(filePath, {
-                contentDir,
-                publicDir,
-            });
+    async readPage(filePath) {
+        if (!(filePath in this.cache)) {
+            this.cache[filePath] = await transformContentPage(filePath, this.options);
         }
-        return cache[filePath];
+        return this.cache[filePath];
     }
-    return {
-        listAllContentPages,
-        getAllContentPagesMap,
-        getAllContentPages,
-        getContentPageBySlug,
-        getSecondaryContentPages,
-        getIndexPage,
-        readPage,
-    };
 }
 //# sourceMappingURL=ContentPageRepository.js.map

package/mobile/lib/content-page-repository/ContentPageRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentPageRepository.js","sourceRoot":"","sources":["../../src/content-page-repository/ContentPageRepository.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,eAAe,GAAG,OAAO,CAAC;AAChC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,OAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;AACpF,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,OAAuB,EAAE,EAAE,CACtE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;AAErE,MAAM,GAAG,GACP,CAAM,SAA8B,EAAE,EAAE,CACxC,CAAC,CAAM,EAAE,EAAE,CACT,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAElB,MAAM,UAAU,qBAAqB,CAAC,EACpC,UAAU,GAAG,SAAS,EACtB,SAAS,GAAG,QAAQ,MACc,EAAE;IACpC,SAAS,mBAAmB;QAC1B,OAAO,IAAI,CAAC,GAAG,UAAU,iBAAiB,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,UAAU,qBAAqB;QAClC,MAAM,SAAS,GAAG,MAAM,mBAAmB,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEzD,OAAO,SAAS,CAAC,MAAM,CACrB,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,GAAG,MAAM;YACT,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;SACjB,CAAC,EACF,EAAE,CACH,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,kBAAkB;QAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,qBAAqB,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,UAAU,wBAAwB,CAAC,cAAuB;QAC7D,MAAM,KAAK,GAAG,MAAM,kBAAkB,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,UAAU,oBAAoB,CAAC,IAAY;QAC9C,MAAM,KAAK,GAAG,MAAM,kBAAkB,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,UAAU,YAAY;QACzB,OAAO,MAAM,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,KAAK,GAAmC,EAAE,CAAC;IAEjD,KAAK,UAAU,QAAQ,CAAC,QAAgB;QACtC,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,EAAE;YACxB,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE;gBACrD,UAAU;gBACV,SAAS;aACV,CAAC,CAAC;SACJ;QAED,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,OAAO;QACL,mBAAmB;QACnB,qBAAqB;QACrB,kBAAkB;QAClB,oBAAoB;QACpB,wBAAwB;QACxB,YAAY;QACZ,QAAQ;KACT,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ContentPageRepository.js","sourceRoot":"","sources":["../../src/content-page-repository/ContentPageRepository.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,eAAe,GAAG,OAAO,CAAC;AAChC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,OAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;AACpF,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,OAAuB,EAAE,EAAE,CACtE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC;AAErE,MAAM,GAAG,GACP,CAAM,SAA8B,EAAE,EAAE,CACxC,CAAC,CAAM,EAAE,EAAE,CACT,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAElB,MAAM,OAAO,qBAAqB;IAMb;IALZ,MAAM,CAAU,IAAI,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAElD,KAAK,GAAmC,EAAE,CAAC;IAEnD,YACmB,UAAiC;QAChD,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,QAAQ;KACpB;QAHgB,YAAO,GAAP,OAAO,CAGvB;IACA,CAAC;IAEJ,KAAK,CAAC,mBAAmB;QACvB,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAEnD,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,cAAuB;QACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE9C,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAY;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE9C,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,IAAI,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3E;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC"}

package/mobile/lib/model/BorderVersion.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @title Цвет бордера
+ * @enumNames ["Основной", "Второстепенный"]
+ */
+export declare type BorderVersion = 'primary' | 'secondary';
+export declare const BorderVersionStyleMap: Record<BorderVersion, string>;

package/mobile/lib/model/BorderVersion.js

@@ -0,0 +1,5 @@
+export const BorderVersionStyleMap = {
+    primary: 'border-main-stroke',
+    secondary: 'border-white/50',
+};
+//# sourceMappingURL=BorderVersion.js.map

package/mobile/lib/model/BorderVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BorderVersion.js","sourceRoot":"","sources":["../../src/model/BorderVersion.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,qBAAqB,GAAkC;IAClE,OAAO,EAAE,oBAAoB;IAC7B,SAAS,EAAE,iBAAiB;CAC7B,CAAC"}

package/mobile/lib/services/sitemap/useSitemap.d.ts

@@ -1,3 +1,3 @@
-import type { HeaderContent } from '../../components/Header/HeaderContent';
 import type { Fallback } from '../../model/Fallback';
-export declare function useSitemap(fallback?: Fallback): HeaderContent;
+import type { SitemapProps } from './SitemapProps';
+export declare function useSitemap(fallback?: Fallback): SitemapProps;

package/mobile/lib/services/sitemap/useSitemap.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSitemap.js","sourceRoot":"","sources":["../../../src/services/sitemap/useSitemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,UAAU,CAAC,WAAqB,EAAE;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAC3B,mBAAmB,eAAe,CAAC,OAAO,IAAI,SAAS,OAAO,EAC9D,eAAe,EACf,EAAE,QAAQ,EAAE,CACb,CAAC;IAEF,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC"}
+{"version":3,"file":"useSitemap.js","sourceRoot":"","sources":["../../../src/services/sitemap/useSitemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,UAAU,UAAU,CAAC,WAAqB,EAAE;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAC3B,mBAAmB,eAAe,CAAC,OAAO,IAAI,SAAS,OAAO,EAC9D,eAAe,EACf,EAAE,QAAQ,EAAE,CACb,CAAC;IAEF,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC"}

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { Img } from '../Img/Img.js';
 import { getIconWithVersion } from '../../utils/getIconWithVersion.js';
+import { Img } from '../Img/Img.js';
 const titleStyleMap = {
     primary: 'text-primary-text',
     secondary: 'text-white',
@@ -14,9 +14,9 @@ export const BenefitItem = JSX((props) => {
     const { className = '', icon, label, description, version = 'primary', benefitsVersion = 'normal', } = props;
     const listItemAlign = description ? 'items-start' : 'items-center';
     const calcVersion = benefitsVersion === 'white' ? 'secondary' : 'primary';
-    return (_jsxs("div", { className: `flex gap-5 ${listItemAlign} ${className}`, children: [icon ? (_jsx("div", { className: renderBenefitIconBgStyle(version, benefitsVersion), children: _jsx(Img, { className: "w-6 h-6", image: getIconWithVersion(icon, calcVersion), asSVG: true }) })) : null, _jsxs("div", { className: "gap-0.5", children: [label ? _jsx("div", { className: `text-h6 ${titleStyleMap[version]}`, children: label }) : null, description ? (_jsx("div", { className: `text-m-light ${descStyleMap[version]}`, children: description })) : null] })] }));
+    return (_jsxs("div", { className: `flex gap-5 ${listItemAlign} ${className}`, children: [icon ? (_jsx("div", { className: getBenefitIconBgStyle(version, benefitsVersion), children: _jsx(Img, { className: "w-6 h-6", image: getIconWithVersion(icon, calcVersion), asSVG: true }) })) : null, _jsxs("div", { className: "gap-0.5", children: [label ? _jsx("div", { className: `text-h6 ${titleStyleMap[version]}`, children: label }) : null, description ? (_jsx("div", { className: `text-m-light ${descStyleMap[version]}`, children: description })) : null] })] }));
 });
-function renderBenefitIconBgStyle(version, benefitsVersion) {
+function getBenefitIconBgStyle(version, benefitsVersion) {
     let bgColorStyle = 'bg-primary-main text-black';
     if (version === 'secondary') {
         bgColorStyle = 'bg-white/30 text-black';

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

@@ -1 +1 @@
-{"version":3,"file":"BenefitItem.js","sourceRoot":"","sources":["../../../src/ui-kit/BenefitItem/BenefitItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAIpE,MAAM,aAAa,GAAiC;IAClD,OAAO,EAAE,mBAAmB;IAC5B,SAAS,EAAE,YAAY;CACxB,CAAC;AACF,MAAM,YAAY,GAAiC;IACjD,OAAO,EAAE,qBAAqB;IAC9B,SAAS,EAAE,YAAY;CACxB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAsB,CAAC,KAAK,EAAE,EAAE;IAC5D,MAAM,EACJ,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,KAAK,EACL,WAAW,EACX,OAAO,GAAG,SAAS,EACnB,eAAe,GAAG,QAAQ,GAC3B,GAAG,KAAK,CAAC;IACV,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,WAAW,GAAG,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IAE1E,OAAO,CACL,eAAK,SAAS,EAAE,cAAc,aAAa,IAAI,SAAS,EAAE,aACvD,IAAI,CAAC,CAAC,CAAC,CACN,cAAK,SAAS,EAAE,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,YAChE,KAAC,GAAG,IAAC,SAAS,EAAC,SAAS,EAAC,KAAK,EAAE,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,KAAK,SAAG,GAC3E,CACP,CAAC,CAAC,CAAC,IAAI,EACR,eAAK,SAAS,EAAC,SAAS,aACrB,KAAK,CAAC,CAAC,CAAC,cAAK,SAAS,EAAE,WAAW,aAAa,CAAC,OAAO,CAAC,EAAE,YAAG,KAAK,GAAO,CAAC,CAAC,CAAC,IAAI,EACjF,WAAW,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAE,gBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,YAAG,WAAW,GAAO,CAC7E,CAAC,CAAC,CAAC,IAAI,IACJ,IACF,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,SAAS,wBAAwB,CAAC,OAAqB,EAAE,eAA4B;IACnF,IAAI,YAAY,GAAG,4BAA4B,CAAC;IAEhD,IAAI,OAAO,KAAK,WAAW,EAAE;QAC3B,YAAY,GAAG,wBAAwB,CAAC;KACzC;SAAM,IAAI,eAAe,KAAK,QAAQ,EAAE;QACvC,YAAY,GAAG,sCAAsC,CAAC;KACvD;IAED,OAAO,iGAAiG,YAAY,EAAE,CAAC;AACzH,CAAC"}
+{"version":3,"file":"BenefitItem.js","sourceRoot":"","sources":["../../../src/ui-kit/BenefitItem/BenefitItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAGjC,MAAM,aAAa,GAAiC;IAClD,OAAO,EAAE,mBAAmB;IAC5B,SAAS,EAAE,YAAY;CACxB,CAAC;AAEF,MAAM,YAAY,GAAiC;IACjD,OAAO,EAAE,qBAAqB;IAC9B,SAAS,EAAE,YAAY;CACxB,CAAC;AAIF,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAsB,CAAC,KAAK,EAAE,EAAE;IAC5D,MAAM,EACJ,SAAS,GAAG,EAAE,EACd,IAAI,EACJ,KAAK,EACL,WAAW,EACX,OAAO,GAAG,SAAS,EACnB,eAAe,GAAG,QAAQ,GAC3B,GAAG,KAAK,CAAC;IACV,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,WAAW,GAAG,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IAE1E,OAAO,CACL,eAAK,SAAS,EAAE,cAAc,aAAa,IAAI,SAAS,EAAE,aACvD,IAAI,CAAC,CAAC,CAAC,CACN,cAAK,SAAS,EAAE,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC,YAC7D,KAAC,GAAG,IAAC,SAAS,EAAC,SAAS,EAAC,KAAK,EAAE,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,KAAK,SAAG,GAC3E,CACP,CAAC,CAAC,CAAC,IAAI,EACR,eAAK,SAAS,EAAC,SAAS,aACrB,KAAK,CAAC,CAAC,CAAC,cAAK,SAAS,EAAE,WAAW,aAAa,CAAC,OAAO,CAAC,EAAE,YAAG,KAAK,GAAO,CAAC,CAAC,CAAC,IAAI,EACjF,WAAW,CAAC,CAAC,CAAC,CACb,cAAK,SAAS,EAAE,gBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,YAAG,WAAW,GAAO,CAC7E,CAAC,CAAC,CAAC,IAAI,IACJ,IACF,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,SAAS,qBAAqB,CAAC,OAAqB,EAAE,eAA4B;IAChF,IAAI,YAAY,GAAG,4BAA4B,CAAC;IAEhD,IAAI,OAAO,KAAK,WAAW,EAAE;QAC3B,YAAY,GAAG,wBAAwB,CAAC;KACzC;SAAM,IAAI,eAAe,KAAK,QAAQ,EAAE;QACvC,YAAY,GAAG,sCAAsC,CAAC;KACvD;IAED,OAAO,iGAAiG,YAAY,EAAE,CAAC;AACzH,CAAC"}

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

@@ -1,11 +1,4 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-export const Breadcrumb = JSX(({ text, href, target, onClick, className = '', children }) => {
-    if (href) {
-        return (_jsx("a", { className: `no-underline ${className}`, href: href, target: target, onClick: onClick, children: _jsx("span", { className: className, children: text || children }) }));
-    }
-    else {
-        return _jsx("span", { className: className, children: text || children });
-    }
-});
+export const Breadcrumb = JSX(({ text, href, target, onClick, className = '', children }) => href ? (_jsx("a", { className: `no-underline ${className}`, href: href, target: target, onClick: onClick, children: _jsx("span", { className: className, children: text || children }) })) : (_jsx("span", { className: className, children: text || children })));
 //# sourceMappingURL=Breadcrumb.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Breadcrumb.js","sourceRoot":"","sources":["../../src/ui-kit/Breadcrumb.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5D,IAAI,IAAI,EAAE;QACR,OAAO,CACL,YAAG,SAAS,EAAE,gBAAgB,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,YACrF,eAAM,SAAS,EAAE,SAAS,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACnD,CACL,CAAC;KACH;SAAM;QACL,OAAO,eAAM,SAAS,EAAE,SAAS,YAAG,IAAI,IAAI,QAAQ,GAAQ,CAAC;KAC9D;AACH,CAAC,CACF,CAAC"}
+{"version":3,"file":"Breadcrumb.js","sourceRoot":"","sources":["../../src/ui-kit/Breadcrumb.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAC5D,IAAI,CAAC,CAAC,CAAC,CACL,YAAG,SAAS,EAAE,gBAAgB,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,YACrF,eAAM,SAAS,EAAE,SAAS,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACnD,CACL,CAAC,CAAC,CAAC,CACF,eAAM,SAAS,EAAE,SAAS,YAAG,IAAI,IAAI,QAAQ,GAAQ,CACtD,CACJ,CAAC"}

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { clamp } from '../../utils/clamp.js';
-import { adjustValue, localNumberFormat } from './adjustValue .js';
+import { adjustValue, localNumberFormat } from './adjustValue.js';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { Input } from '../Input/Input.js';
 export const CurrencyInput = JSX(({ className = '', onChange, minValue = 0, maxValue = 300000, ...inputProps }) => {

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

@@ -1 +1 @@
-{"version":3,"file":"CurrencyInput.js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/CurrencyInput.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAC9B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAC/E,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,UAAkB,EAAE,EAAE;QACrB,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5F,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7B,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC5B,CAAC,UAAkB,EAAE,EAAE;QACrB,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1C,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,OAAO,CACL,KAAC,KAAK,IACJ,SAAS,EAAE,SAAS,EACpB,cAAc,EAAC,QAAQ,EACvB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,UAAU,KACd,UAAU,YAEd,eAAM,SAAS,EAAC,yCAAyC,uBAAS,GAC5D,CACT,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,QAAgB,EAAU,EAAE,CAC9D,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"CurrencyInput.js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/CurrencyInput.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAC9B,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAC/E,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,UAAkB,EAAE,EAAE;QACrB,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5F,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7B,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAC5B,CAAC,UAAkB,EAAE,EAAE;QACrB,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QACD,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1C,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,OAAO,CACL,KAAC,KAAK,IACJ,SAAS,EAAE,SAAS,EACpB,cAAc,EAAC,QAAQ,EACvB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,UAAU,KACd,UAAU,YAEd,eAAM,SAAS,EAAC,yCAAyC,uBAAS,GAC5D,CACT,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,QAAgB,EAAU,EAAE,CAC9D,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC"}

package/mobile/lib/ui-kit/CurrencyInput/{adjustValue .js → adjustValue.js}

@@ -16,4 +16,4 @@ const setZeroStart = (val) => {
     return newVal.startsWith('.') ? newVal.replace('.', '0.') : newVal;
 };
 const replaceCommaToDot = (val) => String(val.replace(',', '.').replace(/[^.\d]/g, ''));
-//# sourceMappingURL=adjustValue%20.js.map
+//# sourceMappingURL=adjustValue.js.map

package/mobile/lib/ui-kit/CurrencyInput/adjustValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adjustValue.js","sourceRoot":"","sources":["../../../src/ui-kit/CurrencyInput/adjustValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE,CACzC,UAAU,CAAC,YAAY,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CACvD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC7B,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAC;KACC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;KACtC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;IAChD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEvC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAE1D,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC"}

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

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 export const Tags = JSX((props) => {
     const { tags, className = '' } = props;
-    return tags?.length ? (_jsx("div", { className: `flex flex-wrap gap-2 ${className}`, children: tags.map((_, i) => renderTag(_, String(i))) })) : null;
+    return tags?.length ? (_jsx("div", { className: `flex flex-wrap gap-2 ${className}`, children: tags.map(renderTag) })) : null;
 });
-const renderTag = (tag, key) => (_jsx("span", { className: "text-m-light py-2 px-2.5 border-solid border rounded-md border-color-stroke", children: tag }, key));
+const renderTag = (tag, key) => (_jsx("span", { className: "text-m-light py-2 px-2.5 border-solid border rounded-md border-color-stroke", children: tag }, String(key)));
 //# sourceMappingURL=Tags.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Tags.js","sourceRoot":"","sources":["../../../src/ui-kit/Tags/Tags.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAY,CAAC,KAAK,EAAE,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAEvC,OAAO,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CACpB,cAAK,SAAS,EAAE,wBAAwB,SAAS,EAAE,YAChD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GACxC,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE,CAAC,CAC9C,eAEE,SAAS,EAAC,6EAA6E,YAEtF,GAAG,IAHC,GAAG,CAIH,CACR,CAAC"}
+{"version":3,"file":"Tags.js","sourceRoot":"","sources":["../../../src/ui-kit/Tags/Tags.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAY,CAAC,KAAK,EAAE,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAEvC,OAAO,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CACpB,cAAK,SAAS,EAAE,wBAAwB,SAAS,EAAE,YAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAO,CACjF,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE,CAAC,CAC9C,eAEE,SAAS,EAAC,6EAA6E,YAEtF,GAAG,IAHC,MAAM,CAAC,GAAG,CAAC,CAIX,CACR,CAAC"}

package/mobile/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -1,19 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion } from '../../model/BlockVersion';
+import { BlockVersion, VersionStyleMap } from '../../model/BlockVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import type { BenefitsBlockContent, ListBenefitDef, TextBenefitDef } from './BenefitsBlockContent';
 import { BenefitBlockItemProps, DescriptionDef } from './BenefitsBlockContent';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
-
-export interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
-
-const benefitsBlockStyleMap = {
-  primary: 'bg-white',
-  secondary: 'bg-primary-main',
-};
 
 const benefitsTextStyleMap = {
   primary: '',
@@ -30,10 +23,12 @@ const benefitsIconStyleMap = {
   secondary: 'bg-white/30 text-black',
 };
 
+interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
+
 export const BenefitsBlock = JSX<BenefitsBlockProps>(
   ({ className = '', title, benefitList, version = 'primary', ...rest }) => (
     <BlockWrapper
-      className={`font-sans text-primary-text p-12 flex flex-col items-center ${className} ${benefitsBlockStyleMap[version]}`}
+      className={`font-sans text-primary-text p-12 flex flex-col items-center ${className} ${VersionStyleMap[version]}`}
       {...rest}
     >
       {title ? (
@@ -44,19 +39,17 @@ export const BenefitsBlock = JSX<BenefitsBlockProps>(
           title={title}
         />
       ) : null}
-      {benefitList?.length ? renderBenefits(benefitList, version) : null}
+      {benefitList?.length ? (
+        <div className="flex flex-wrap w-full justify-center gap-x-20 mt-8">
+          {benefitList.map(renderStep(version))}
+        </div>
+      ) : null}
     </BlockWrapper>
   ),
 );
 
-const renderBenefits = (benefitList: BenefitBlockItemProps[], version: BlockVersion) => (
-  <div className="flex flex-wrap w-full justify-center gap-x-20 mt-8">
-    {benefitList.map(renderStep(version))}
-  </div>
-);
-
 const renderStep = (version: BlockVersion) => (benefit: BenefitBlockItemProps, i: number) => {
-  const description = (benefit?.description || undefined) as DescriptionDef;
+  const description = benefit.description;
 
   return (
     <div key={String(i)} className="flex items-center basis-1/2 max-w-[500px] mb-14">
@@ -78,8 +71,8 @@ const renderStep = (version: BlockVersion) => (benefit: BenefitBlockItemProps, i
   );
 };
 
-const renderDescription = (description: DescriptionDef, version: BlockVersion) => {
-  const benefitType = description ? description?.benefitType : null;
+const renderDescription = (description: DescriptionDef | undefined, version: BlockVersion) => {
+  const benefitType = description?.benefitType || null;
 
   return description && benefitType ? (
     <div className={`text-l-light mt-2 ${benefitsDescriptionStyleMap[version]}`}>
@@ -90,7 +83,7 @@ const renderDescription = (description: DescriptionDef, version: BlockVersion) =
   ) : null;
 };
 
-const renderTextBenefit = (description?: TextBenefitDef) => (description ? description.name : null);
+const renderTextBenefit = (description?: TextBenefitDef) => description?.name || null;
 
 const renderListBenefit = (description?: ListBenefitDef) => {
   const listStyleType = description?.bullets ? 'list-disc pl-6' : '';

package/mobile/src/components/Catalog/CatalogContent.ts

@@ -2,6 +2,7 @@ import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
+import type { BlockVersion } from '../../model/BlockVersion';
 
 export interface CatalogCardType extends HeadlineCommonProps, ImageContent {
   /** @title Цена в рублях */
@@ -24,4 +25,5 @@ export interface CatalogCardType extends HeadlineCommonProps, ImageContent {
 export type CatalogContent = HeadlineCommonProps & {
   /** @title Список карточек */
   cards?: CatalogCardType[];
+  version?: BlockVersion;
 };

package/mobile/src/components/ContentPage/computeAPIFallback.ts

@@ -6,27 +6,26 @@ interface FallbackData {
   data: unknown;
 }
 
-export const computeAPIFallback =
-  (blocksRegistry: BlocksRegistry) => async (): Promise<Fallback> => {
-    const blocksFallbackMap = await Promise.all(Object.keys(blocksRegistry).map(loadBlockFallback));
-    const pageFallbackMap = getPageFallbackMap(blocksFallbackMap);
-    const fallbackData = await Promise.allSettled(
-      Object.entries(pageFallbackMap).map(async ([key, fetcher]) => {
-        const data = await fetcher();
-
-        return { key, data };
-      }),
-    );
-
-    return fallbackData
-      .filter((d): d is PromiseFulfilledResult<FallbackData> => d.status === 'fulfilled')
-      .reduce((res, item) => {
-        return {
-          ...res,
-          [item.value.key]: item.value.data,
-        };
-      }, {});
-  };
+export const computeAPIFallback = async (blocksRegistry: BlocksRegistry): Promise<Fallback> => {
+  const blocksFallbackMap = await Promise.all(Object.keys(blocksRegistry).map(loadBlockFallback));
+  const pageFallbackMap = getPageFallbackMap(blocksFallbackMap);
+  const fallbackData = await Promise.allSettled(
+    Object.entries(pageFallbackMap).map(async ([key, fetcher]) => {
+      const data = await fetcher();
+
+      return { key, data };
+    }),
+  );
+
+  return fallbackData
+    .filter((d): d is PromiseFulfilledResult<FallbackData> => d.status === 'fulfilled')
+    .reduce((res, item) => {
+      return {
+        ...res,
+        [item.value.key]: item.value.data,
+      };
+    }, {});
+};
 
 export async function loadBlockFallback(blockName: string): Promise<FallbackMap | undefined> {
   try {

package/mobile/src/components/ContentPage/normalizeBlock.ts

@@ -4,26 +4,23 @@ import { mapSlot } from './mapSlot';
 
 export function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S {
   const { mobile, ...rest } = (block || {}) as BlockDef;
-
-  const normalizedBlock = mobile
+  const result = mobile
     ? { ...rest, ...mobile, content: { ...rest.content, ...mobile.content } }
     : block;
 
-  return {
-    ...mapSlot((blocks) => filterBlocks(blocks, blocksRegistry))(normalizedBlock || {}),
-  } as S;
+  return mapSlot(filterBlocks(blocksRegistry))(result || {}) as S;
 }
 
-const filterBlocks = (blocks?: BlockDef[], blocksRegistry?: BlocksRegistry) =>
-  blocks
-    ? blocks
-        ?.filter(
-          (block) =>
-            blocksRegistry &&
-            (block?.type || block?.mobile?.type || '') in blocksRegistry &&
-            !block.mobile?.hidden,
-        )
-        .map((block) => ({
-          ...normalizeBlock(block, blocksRegistry),
-        }))
-    : [];
+const filterBlocks =
+  (blocksRegistry?: BlocksRegistry) =>
+  (blocks?: BlockDef[]): BlockDef[] =>
+    blocks
+      ? blocks
+          ?.filter(
+            (block) =>
+              blocksRegistry &&
+              (block?.type || block?.mobile?.type || '') in blocksRegistry &&
+              !block.mobile?.hidden,
+          )
+          .map((block) => normalizeBlock(block, blocksRegistry))
+      : [];

package/mobile/src/components/ContentPage/normalizePage.ts

@@ -4,10 +4,5 @@ import { normalizeBlock } from './normalizeBlock';
 
 export const normalizePage =
   (blocksRegistry: BlocksRegistry) =>
-  (contentPage: ContentPageDef | undefined | null): ContentPageDef | undefined => {
-    if (!contentPage) {
-      return undefined;
-    }
-
-    return normalizeBlock(contentPage, blocksRegistry);
-  };
+  (contentPage: ContentPageDef | undefined | null): ContentPageDef =>
+    contentPage ? normalizeBlock(contentPage, blocksRegistry) : {};

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

@@ -5,7 +5,6 @@ import type { Fallback } from '../../model/Fallback';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { findActiveSubItem } from '../../services/sitemap/findActiveSubItem';
 import { isTopItemActive } from '../../services/sitemap/isTopItemActive';
-import { mergeTopItems } from '../../services/sitemap/mergeTopItems';
 import { useSitemap } from '../../services/sitemap/useSitemap';
 import { HeaderItem } from '../../ui-kit/HeaderItem/HeaderItem';
 import type { TopItemProps } from '../../ui-kit/TopItem/TopItem';
@@ -19,15 +18,14 @@ import { HeaderTop } from './HeaderTop';
 export interface HeaderProps extends HeaderContent, UniBlockProps {}
 
 export const Header = JSX<HeaderProps>(
-  ({ className = '', defaultLocation, bgColor = 'bg-white', context, topItems, page }) => {
+  ({ className = '', defaultLocation, bgColor = 'bg-white', context, page }) => {
     const { handlerDecorator } = context;
     const router = context.useRouter();
 
     const fallback: Fallback | undefined = page?.fallback;
-    const sitemap = useSitemap(fallback);
+    const { topItems, dispositions } = useSitemap(fallback);
 
-    const mergedItems = mergeTopItems(sitemap.topItems, topItems);
-    const activeTopItem = mergedItems.find(isTopItemActive(router));
+    const activeTopItem = topItems?.find(isTopItemActive(router));
     const subItems = activeTopItem?.items;
     const activeSubItem = findActiveSubItem(router)(subItems);
 
@@ -58,15 +56,17 @@ export const Header = JSX<HeaderProps>(
           <HeaderBurger
             context={context}
             onClick={toggleBurgerMenu}
-            burgerSubMenu={sitemap?.dispositions}
+            burgerSubMenu={dispositions}
             defaultLocation={defaultLocation}
           >
             <AccordionItemsList>
-              {sitemap.topItems?.map((item, i) => (
-                <AccordionItem key={String(i)} context={context} label={item.text}>
-                  <LinkList context={context} documents={item.items} />
-                </AccordionItem>
-              ))}
+              {topItems?.map((item, i) => {
+                item?.text ? (
+                  <AccordionItem key={String(i)} context={context} label={item.text}>
+                    <LinkList context={context} documents={item.items} />
+                  </AccordionItem>
+                ) : null;
+              })}
             </AccordionItemsList>
           </HeaderBurger>
         ) : null}

package/mobile/src/components/Header/HeaderContent.ts

@@ -1,7 +1,6 @@
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { LinkProps } from '../../model/LinkProps';
 import type { IconProps, Picture } from '../../model/Picture';
-import type { SitemapProps } from '../../services/sitemap/SitemapProps';
 
 /**
  * @title Пункт подменю
@@ -31,7 +30,7 @@ export interface Logo {
  * @title Шапка (для мобильных горизонтальная прокрутка shift+mouseScroll)
  * @required ["defaultLocation", "topItems"]
  */
-export interface HeaderContent extends SitemapProps {
+export interface HeaderContent {
   logo?: Logo;
   /**
    * @title Город по-умолчанию

package/mobile/src/components/InvestmentGallery/InvestmentGallery.example.json

@@ -0,0 +1,64 @@
+{
+  "title": "Заголовок блока",
+  "cards": [
+    {
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 180,
+          "height": 180
+        }
+      },
+      "title": "Заголовок карточки",
+      "description": "Описание",
+      "additionalDescription": "Дополнительное описание",
+      "cardList":[
+        {
+          "parametr": "Параметр",
+          "parametrDesccription": "Описание"
+        },
+        {
+          "parametr": "Параметр",
+          "parametrDesccription": "Описание"
+        },
+        {
+          "parametr": "Параметр",
+          "parametrDesccription": "Описание"
+        }
+      ]
+    },
+    {
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 180,
+          "height": 180
+        }
+      },
+      "title": "Заголовок 2",
+      "description": "Описание 2",
+      "socialMedia": [
+        { "href": "https://t.me" },
+        { "href": "https://vk.com" },
+        { "href": "https://ok.ru" }
+      ]
+    },
+    {
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 180,
+          "height": 180
+        }
+      },
+      "title": "Заголовок 3",
+      "description": "Описание 3",
+      "socialMedia": [
+        { "href": "https://t.me" },
+        { "href": "https://vk.com" },
+        { "href": "https://ok.ru" }
+      ]
+    }
+  ],
+  "version": "primary"
+}