@redneckz/wildless-cms-uni-blocks 0.6.18 → 0.6.20

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

@@ -18,9 +18,7 @@ export interface BlockDef extends BaseBlockDef {
 export interface Slot {
     style?: string[];
     blocks?: BlockDef[];
-}
-export interface SlotsMap {
-    header?: Slot;
+    slots?: Record<string, BlockDef[]>;
 }
 export interface ContentPageMeta {
     title?: string;
@@ -37,7 +35,6 @@ export interface ContentPageMeta {
 }
 export interface ContentPageDef extends ContentPageMeta, Slot {
     _customPageType?: string;
-    slots?: SlotsMap;
     fallback?: Record<string, unknown>;
     likeControl?: boolean;
     colorPalette?: ColorPalette;

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

@@ -1,6 +1,6 @@
 import type { UNIComponent } from '@redneckz/uni-jsx';
 import type { ContentPageContext } from '../components/ContentPage/ContentPageContext';
-import type { BlockAncestors } from './BlockDecorator';
+import type { BlockAncestors, SlotName } from './BlockDecorator';
 import type { ContentPageDef } from './ContentPageDef';
 import type { VNode } from './VNode';
 export interface UniBlockProps {
@@ -10,8 +10,10 @@ export interface UniBlockProps {
     ancestors?: BlockAncestors;
     labels?: string[];
     anchor?: string;
+    slots?: Record<string, VNode>;
 }
 export declare type JSXBlock<BlockProps = Record<string, any>> = UNIComponent<BlockProps & UniBlockProps, any, VNode | VNode[]> & {
     childrenTypes?: string[];
+    slots?: (props: BlockProps) => SlotName[];
     renderChild?: (child: VNode, i: number) => VNode;
 };

package/mobile/lib/model/getParentBlockDef.js

@@ -1,5 +1,8 @@
 export function getParentBlockDef(ancestors, type) {
-    const [, ...blocks] = ancestors || [];
-    return blocks.reverse().find((_) => !type || type === _?.type) || {};
+    const [block] = (ancestors || [])
+        .map((item) => item)
+        .reverse()
+        .find(([_]) => _ && 'type' in _ && (!type || type === _.type)) || [];
+    return block || {};
 }
 //# sourceMappingURL=getParentBlockDef.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getParentBlockDef.js","sourceRoot":"","sources":["../../src/model/getParentBlockDef.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,iBAAiB,CAAC,SAAqC,EAAE,IAAa;IACpF,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,SAAS,IAAI,EAAE,CAAC;IAEtC,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,KAAM,CAAc,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;AACrF,CAAC"}
+{"version":3,"file":"getParentBlockDef.js","sourceRoot":"","sources":["../../src/model/getParentBlockDef.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,iBAAiB,CAAC,SAAqC,EAAE,IAAa;IACpF,MAAM,CAAC,KAAK,CAAC,GACX,CAAC,SAAS,IAAI,EAAE,CAAC;SACd,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;SACnB,OAAO,EAAE;SACT,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,KAAM,CAAc,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAEvF,OAAO,KAAK,IAAI,EAAE,CAAC;AACrB,CAAC"}

package/mobile/lib/ui-kit/InnerTable/InnerTable.d.ts

@@ -1,5 +1,6 @@
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { TariffsTableInnerContent } from './InnerTableProps';
 export interface InnerTableProps extends TariffsTableInnerContent, UniBlockProps {
+    onClick: () => void;
 }
 export declare const InnerTable: import("@redneckz/uni-jsx").UNIComponent<InnerTableProps, any, any>;

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

@@ -5,11 +5,12 @@ import { useTariffsInnerTableData } from '../../hooks/useTariffsInnerTableData.j
 import { InnerTableBody } from './InnerTableBody.js';
 import { TableInnerButton } from './InnerTableButton.js';
 import { InnerTableHeader } from './InnerTableHeader.js';
-export const InnerTable = JSX(({ context, dataUrl, pdfUrl }) => {
+const EMPTY_DATA = 'Данных нет';
+export const InnerTable = JSX(({ context, dataUrl, pdfUrl, onClick }) => {
     const { tableData } = useTariffsInnerTableData(dataUrl);
     const [activeTabIndex, setActiveTabIndex] = useState(0);
     const items = tableData?.[activeTabIndex]?.items ?? [];
     const currencies = tableData?.map((item) => item.currency ?? '');
-    return tableData ? (_jsxs("div", { className: "bg-white z-10", children: [_jsx(InnerTableHeader, { currencies: currencies, activeTabIndex: activeTabIndex, setActiveTabIndex: setActiveTabIndex, linkToPDF: pdfUrl }), _jsx(InnerTableBody, { context: context, activeTabIndex: activeTabIndex, items: items }), _jsx(TableInnerButton, { context: context, isOpen: true })] })) : null;
+    return tableData ? (_jsxs("div", { className: "bg-white z-10", children: [_jsx(InnerTableHeader, { currencies: currencies, activeTabIndex: activeTabIndex, setActiveTabIndex: setActiveTabIndex, linkToPDF: pdfUrl }), _jsx(InnerTableBody, { context: context, activeTabIndex: activeTabIndex, items: items }), _jsx(TableInnerButton, { context: context, onClick: onClick, isOpen: true })] })) : (_jsxs("div", { className: "my-5 text-h6 text-center", children: [_jsx("p", { children: EMPTY_DATA }), _jsx(TableInnerButton, { context: context, onClick: onClick, isOpen: true })] }));
 });
 //# sourceMappingURL=InnerTable.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"InnerTable.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAKtD,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;IAC9E,MAAM,EAAE,SAAS,EAAE,GAAmB,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAExE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;IAEvD,MAAM,UAAU,GAAG,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAEjE,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,eAAK,SAAS,EAAC,eAAe,aAC5B,KAAC,gBAAgB,IACf,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,MAAM,GACjB,EACF,KAAC,cAAc,IAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,GAAI,EAClF,KAAC,gBAAgB,IAAC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAG,IACzC,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC"}
+{"version":3,"file":"InnerTable.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAOtD,MAAM,UAAU,GAAG,YAAY,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;IACvF,MAAM,EAAE,SAAS,EAAE,GAAmB,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAExE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;IAEvD,MAAM,UAAU,GAAG,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAEjE,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,eAAK,SAAS,EAAC,eAAe,aAC5B,KAAC,gBAAgB,IACf,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,MAAM,GACjB,EACF,KAAC,cAAc,IAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,GAAI,EAClF,KAAC,gBAAgB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAG,IAC3D,CACP,CAAC,CAAC,CAAC,CACF,eAAK,SAAS,EAAC,0BAA0B,aACvC,sBAAI,UAAU,GAAK,EACnB,KAAC,gBAAgB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAG,IAC3D,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/InnerTable/InnerTableButton.d.ts

@@ -1,6 +1,7 @@
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { TariffsTableInnerEvent } from './InnerTableProps';
 export interface TableInnerButtonProps extends TariffsTableInnerEvent, UniBlockProps {
+    onClick?: () => void;
     isOpen?: boolean;
 }
 export declare const TableInnerButton: import("@redneckz/uni-jsx").UNIComponent<TableInnerButtonProps, any, any>;

package/mobile/lib/ui-kit/InnerTable/InnerTableButton.js

@@ -1,12 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { EventBus } from '../../EventBus/EventBus.js';
 import { Button } from '../Button/Button.js';
 import { Icon } from '../Icon/Icon.js';
-export const TableInnerButton = JSX(({ isOpen, dataUrl, pdfUrl, rowIdx, cellIdx, fieldIdx }) => {
-    const handleClick = () => {
-        EventBus.inst.fire('tariffInnerTable', { dataUrl, pdfUrl, rowIdx, cellIdx, fieldIdx });
-    };
-    return (_jsxs(Button, { version: "primary", onClick: handleClick, className: "w-full flex items-center justify-center rounded-none py-5", children: [_jsx("div", { className: "text-h4", children: isOpen ? 'Скрыть' : 'Показать ставки по вкладу' }), _jsx(Icon, { name: isOpen ? 'ArrowUpIcon' : 'ArrowDownIcon', className: "ml-3", iconVersion: "white", width: "20", height: "20", asSVG: true })] }));
+export const TableInnerButton = JSX(({ isOpen, onClick }) => {
+    return (_jsxs(Button, { version: "primary", onClick: onClick, className: "w-full flex items-center justify-center rounded-none py-5", children: [_jsx("div", { className: "text-h4", children: isOpen ? 'Скрыть' : 'Показать ставки по вкладу' }), _jsx(Icon, { name: isOpen ? 'ArrowUpIcon' : 'ArrowDownIcon', className: "ml-3", iconVersion: "white", width: "20", height: "20", asSVG: true })] }));
 });
 //# sourceMappingURL=InnerTableButton.js.map

package/mobile/lib/ui-kit/InnerTable/InnerTableButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"InnerTableButton.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTableButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAOpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CACjC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzD,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzF,CAAC,CAAC;IAEF,OAAO,CACL,MAAC,MAAM,IACL,OAAO,EAAC,SAAS,EACjB,OAAO,EAAE,WAAW,EACpB,SAAS,EAAC,2DAA2D,aAErE,cAAK,SAAS,EAAC,SAAS,YAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,2BAA2B,GAAO,EAChF,KAAC,IAAI,IACH,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,EAC9C,SAAS,EAAC,MAAM,EAChB,WAAW,EAAC,OAAO,EACnB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,KAAK,SACL,IACK,CACV,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"InnerTableButton.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTableButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAQpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAwB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;IACjF,OAAO,CACL,MAAC,MAAM,IACL,OAAO,EAAC,SAAS,EACjB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAC,2DAA2D,aAErE,cAAK,SAAS,EAAC,SAAS,YAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,2BAA2B,GAAO,EAChF,KAAC,IAAI,IACH,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,EAC9C,SAAS,EAAC,MAAM,EAChB,WAAW,EAAC,OAAO,EACnB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,KAAK,SACL,IACK,CACV,CAAC;AACJ,CAAC,CAAC,CAAC"}

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

@@ -14,7 +14,7 @@ export const InputRange = JSX(({ className, title, items = [], min = 1, max = 10
     const inputStyle = {
         backgroundSize: `${(((value - min) * 100) / (max - min)).toFixed(2)}% 100%`,
     };
-    return (_jsxs("div", { className: className, children: [_jsxs("label", { className: "block relative", children: [title ? _jsx("span", { className: "text-m-light", children: title }) : null, _jsx("input", { className: `m-0 mt-2 font-sans text-h3 w-full h-14 border border-solid border-main-stroke rounded-md
+    return (_jsxs("div", { className: className, children: [_jsxs("label", { className: "block relative", children: [title ? _jsx("span", { className: "text-m-light text-primary-text", children: title }) : null, _jsx("input", { className: `m-0 mt-2 font-sans text-h3 w-full h-14 border border-solid border-main-stroke rounded-md
             outline-none p-0 pl-4 box-border text-primary-text hover:border-primary-hover focus:border-primary-focus ${DISABLED_INPUT_CLASSES}`, value: addSpacesBetweenNumbers(value), disabled: disabled, onChange: handleChange, onBlur: handleChange }), _jsx("div", { className: "absolute inset-x-0 -bottom-1 px-4 leading-[18px]", children: _jsx("input", { className: "box-border w-full m-0 cursor-pointer slider", type: "range", min: min, max: max, step: step, value: value, disabled: disabled, onChange: handleChange, style: inputStyle }) })] }), renderRangeCaption(items)] }));
 });
 function renderRangeCaption(items) {

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

@@ -1 +1 @@
-{"version":3,"file":"InputRange.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/InputRange.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,MAAM,sBAAsB,GAAG,sDAAsD,CAAC;AAEtF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,GAAG,GAAG,CAAC,EACP,GAAG,GAAG,GAAG,EACT,IAAI,GAAG,CAAC,EACR,KAAK,GAAG,GAAG,EACX,QAAQ,GAAG,KAAK,EAChB,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,YAAY,GAA+C,CAAC,CAAC,EAAE,EAAE;QACrE,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KAC5E,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,iBAAO,SAAS,EAAC,gBAAgB,aAC9B,KAAK,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,cAAc,YAAE,KAAK,GAAQ,CAAC,CAAC,CAAC,IAAI,EAC7D,gBACE,SAAS,EAAE;uHACgG,sBAAsB,EAAE,EACnI,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,YAAY,GACpB,EACF,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,6CAA6C,EACvD,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,UAAU,GACjB,GACE,IACA,EACP,kBAAkB,CAAC,KAAK,CAAC,IACtB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,kBAAkB,CAAC,KAAe;IACzC,OAAO,CACL,cAAK,SAAS,EAAC,2BAA2B,YACvC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,eAAsB,SAAS,EAAC,kCAAkC,YAC/D,IAAI,IADI,MAAM,CAAC,CAAC,CAAC,CAEb,CACR,CAAC,GACE,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"InputRange.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/InputRange.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,MAAM,sBAAsB,GAAG,sDAAsD,CAAC;AAEtF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,GAAG,GAAG,CAAC,EACP,GAAG,GAAG,GAAG,EACT,IAAI,GAAG,CAAC,EACR,KAAK,GAAG,GAAG,EACX,QAAQ,GAAG,KAAK,EAChB,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,YAAY,GAA+C,CAAC,CAAC,EAAE,EAAE;QACrE,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KAC5E,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,iBAAO,SAAS,EAAC,gBAAgB,aAC9B,KAAK,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,gCAAgC,YAAE,KAAK,GAAQ,CAAC,CAAC,CAAC,IAAI,EAC/E,gBACE,SAAS,EAAE;uHACgG,sBAAsB,EAAE,EACnI,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,YAAY,GACpB,EACF,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,6CAA6C,EACvD,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,UAAU,GACjB,GACE,IACA,EACP,kBAAkB,CAAC,KAAK,CAAC,IACtB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,kBAAkB,CAAC,KAAe;IACzC,OAAO,CACL,cAAK,SAAS,EAAC,2BAA2B,YACvC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,eAAsB,SAAS,EAAC,kCAAkC,YAC/D,IAAI,IADI,MAAM,CAAC,CAAC,CAAC,CAEb,CACR,CAAC,GACE,CACP,CAAC;AACJ,CAAC"}

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

@@ -1,4 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-export const Radio = JSX(({ name, text, value, checked, onChange, className }) => (_jsx("div", { className: className, children: _jsxs("label", { className: "flex items-center relative cursor-pointer", children: [_jsx("input", { className: "appearance-none flex justify-center items-center shrink-0 w-5 h-5 border border-gray hover:border-checkbox-hover\n        checked:border-2 checked:!border-primary-main focus:checked:border-primary-main focus:border-primary-text active:border-primary-text\n        after:block after:w-2.5 after:h-2.5 after:rounded-full checked:after:bg-primary-main outline-none rounded-full cursor-pointer", type: "radio", value: value, name: name, checked: checked, onChange: onChange }), text ? _jsx("span", { className: "font-sans ml-3 cursor-pointer", children: text }) : null] }) })));
+export const Radio = JSX(({ name, text, value, checked, onChange, className }) => (_jsx("div", { className: className, children: _jsxs("label", { className: "font-sans flex items-center relative cursor-pointer", children: [_jsx("input", { className: "appearance-none flex justify-center items-center shrink-0 w-5 h-5 border border-gray hover:border-checkbox-hover\n        checked:border-2 checked:!border-primary-main focus:checked:border-primary-main focus:border-primary-text active:border-primary-text\n        after:block after:w-2.5 after:h-2.5 after:rounded-full checked:after:bg-primary-main outline-none rounded-full cursor-pointer", type: "radio", value: value, name: name, checked: checked, onChange: onChange }), text ? _jsx("span", { className: "text-primary-text ml-3 cursor-pointer", children: text }) : null] }) })));
 //# sourceMappingURL=Radio.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Radio.js","sourceRoot":"","sources":["../../../src/ui-kit/Radio/Radio.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAC5F,cAAK,SAAS,EAAE,SAAS,YACvB,iBAAO,SAAS,EAAC,2CAA2C,aAC1D,gBACE,SAAS,EAAC,uYAEoH,EAC9H,IAAI,EAAC,OAAO,EACZ,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,GAClB,EACD,IAAI,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,+BAA+B,YAAE,IAAI,GAAQ,CAAC,CAAC,CAAC,IAAI,IACtE,GACJ,CACP,CAAC,CAAC"}
+{"version":3,"file":"Radio.js","sourceRoot":"","sources":["../../../src/ui-kit/Radio/Radio.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAC5F,cAAK,SAAS,EAAE,SAAS,YACvB,iBAAO,SAAS,EAAC,qDAAqD,aACpE,gBACE,SAAS,EAAC,uYAEoH,EAC9H,IAAI,EAAC,OAAO,EACZ,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,GAClB,EACD,IAAI,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,uCAAuC,YAAE,IAAI,GAAQ,CAAC,CAAC,CAAC,IAAI,IAC9E,GACJ,CACP,CAAC,CAAC"}

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

@@ -17,7 +17,7 @@ export const Select = JSX(({ className = '', isBorder = true, label, options = [
     useEffect(() => {
         setSelectedItem(value || { key: '', text: '' });
     }, [value]);
-    return (_jsxs("div", { className: `${className}`, ref: wrapperRef, children: [label ? _jsx("span", { className: "mb-2 flex", children: label }) : null, _jsxs("div", { className: `relative ${isOpen ? 'z-20' : 'z-10'}`, children: [_jsxs("div", { className: `text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer
+    return (_jsxs("div", { className: `${className}`, ref: wrapperRef, children: [label ? _jsx("span", { className: "mb-2 flex text-primary-text", children: label }) : null, _jsxs("div", { className: `relative ${isOpen ? 'z-20' : 'z-10'}`, children: [_jsxs("div", { className: `text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer
             ${getBorderStyle(isBorder)}`, onClick: () => setIsOpen(!isOpen), children: [_jsx("p", { className: "p-4 pr-8 h-[56px] overflow-hidden text-ellipsis whitespace-nowrap", children: selectedItem?.text || placeholder }), _jsx(Icon, { name: "ArrowUpIcon", width: "16", height: "16", className: `absolute right-3 ${isOpen ? '' : 'rotate-180'}` })] }), options?.length ? (_jsx("div", { className: `h-0 ${renderOptionsStyle(isOpen)}`, children: _jsx("div", { className: `bg-white text-l max-h-[256px] overflow-y-auto overflow-x-hidden rounded-md shadow-[0_4px_25px_rgba(0,0,0,0.07)]`, children: options.map(renderOption(choiceOption, isOpen, isSelected)) }) })) : null] })] }));
 });
 const renderOptionsStyle = (isOpen) => (isOpen ? '' : 'overflow-hidden');

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

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAiBpC,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CACvB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,GAAG,EAAE,EAAE,EAAE,EAAE;IAC9F,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IACtF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5C,MAAM,UAAU,GAAG,MAAM,CAA0B,IAAI,CAAC,CAAC;IAEzD,eAAe,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAEvC,MAAM,YAAY,GAAG,CAAC,MAAmB,EAAE,EAAE;QAC3C,eAAe,CAAC,MAAM,CAAC,CAAC;QACxB,SAAS,CAAC,KAAK,CAAC,CAAC;QACjB,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,CAAC;IAErF,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,KAAK,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAClD,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,OAAO,CACL,eAAK,SAAS,EAAE,GAAG,SAAS,EAAE,EAAE,GAAG,EAAE,UAAU,aAC5C,KAAK,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,6BAA6B,YAAE,KAAK,GAAQ,CAAC,CAAC,CAAC,IAAI,EAC5E,eAAK,SAAS,EAAE,YAAY,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,aACpD,eACE,SAAS,EAAE;cACT,cAAc,CAAC,QAAQ,CAAC,EAAE,EAC5B,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,aAEjC,YAAG,SAAS,EAAC,mEAAmE,YAC7E,YAAY,EAAE,IAAI,IAAI,WAAW,GAChC,EACJ,KAAC,IAAI,IACH,IAAI,EAAC,aAAa,EAClB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,SAAS,EAAE,oBAAoB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,GAC3D,IACE,EACL,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CACjB,cAAK,SAAS,EAAE,OAAO,kBAAkB,CAAC,MAAM,CAAC,EAAE,YACjD,cACE,SAAS,EAAE,iHAAiH,YAE3H,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,GACxD,GACF,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,IACF,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,MAAe,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;AAElF,MAAM,YAAY,GAChB,CACE,YAA2C,EAC3C,MAAe,EACf,UAA4C,EAC5C,EAAE,CACJ,CAAC,MAAmB,EAAE,CAAS,EAAE,EAAE;IACjC,OAAO,CACL,eAEE,OAAO,EAAE,GAAG,EAAE;YACZ,YAAY,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC,EACD,SAAS,EAAC,oEAAoE,aAE9E,eAAM,SAAS,EAAC,SAAS,YAAE,MAAM,CAAC,IAAI,GAAQ,EAC9C,KAAC,IAAI,IACH,IAAI,EAAC,gBAAgB,EACrB,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,SAAS,EAAE,CAAC,yBAAyB,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvF,GAAG,CACJ,GACD,KAdG,MAAM,CAAC,CAAC,CAAC,CAeV,CACP,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,cAAc,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC3C,QAAQ,CAAC,CAAC,CAAC,iEAAiE,CAAC,CAAC,CAAC,EAAE,CAAC"}

package/mobile/src/components/Blocks.ts

@@ -1,3 +1,4 @@
+import type { BlocksRegistry } from '../model/BlocksRegistry';
 import { Accordion } from './Accordion/Accordion';
 import { AccordionItem } from './AccordionItem/AccordionItem';
 import { ComparisonTable } from './ComparisonTable/ComparisonTable';
@@ -15,7 +16,7 @@ import { StepsBlock } from './StepsBlock/StepsBlock';
 import { TariffsTable } from './TariffsTable/TariffsTable';
 import { TextBlock } from './TextBlock/TextBlock';
 
-export const Blocks = {
+export const Blocks: BlocksRegistry = {
   Accordion,
   AccordionItem,
   ComparisonTable,

package/mobile/src/components/Bonus/Bonus.tsx

@@ -32,7 +32,7 @@ export const Bonus = JSX<BonusProps>((props) => {
                 return (
                   <div
                     key={String(i)}
-                    className="flex-grow w-[49%] border border-gray pl-9 pt-9 pr-6 pb-6 mb-3 mx-2 even:mr-0 odd:ml-0 last:odd:mx-0"
+                    className="flex-grow w-[49%] border border-gray p-9 mb-3 mx-2 even:mr-0 odd:ml-0 last:odd:mx-0"
                   >
                     <div className="flex justify-between w-full">
                       <div className="flex flex-col justify-between mr-4">

package/mobile/src/components/ContentPage/ContentPage.page.json

@@ -19,17 +19,14 @@
   "style": ["bg-main-divider"],
   "likeControl": true,
   "slots": {
-    "header": {
-      "style": ["mb-5", "shadow-[0_8px_32px_0px_#00000014]"],
-      "blocks": [
-        {
-          "type": "Header",
-          "content": {
-            "defaultLocation": "Москва"
-          }
+    "header": [
+      {
+        "type": "Header",
+        "content": {
+          "defaultLocation": "Москва"
         }
-      ]
-    }
+      }
+    ]
   },
   "blocks": [
     {

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

@@ -1,12 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockAncestors, BlockDecorator } from '../../model/BlockDecorator';
+import type { BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
-import type { BlockDef, ContentPageDef } from '../../model/ContentPageDef';
-import type { UniBlockProps } from '../../model/JSXBlock';
+import type { ContentPageDef } from '../../model/ContentPageDef';
+import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { style2className } from '../../utils/style2className';
 import { LikeControl } from '../LikeControl/LikeControl';
 import type { ContentPageContext } from './ContentPageContext';
-import { renderBlock } from './renderBlock';
+import { RenderBlockOptions } from './renderBlock';
+import { renderBlocksList } from './renderBlockList';
+import { renderSlots } from './renderSlots';
 
 interface ContentPageProps extends UniBlockProps {
   blocksRegistry: BlocksRegistry;
@@ -17,26 +19,34 @@ interface ContentPageProps extends UniBlockProps {
 const defaultBlockDecorator: BlockDecorator = ({ blockClassName, block, render }) =>
   render({ blockClassName, block });
 
-export const ContentPage = JSX<ContentPageProps>((props) => {
-  const { className = '', context, data = {} } = props;
+export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((props) => {
+  const { className = '', blocksRegistry, blockDecorator, context, data = {} } = props;
 
   const { style: pageStyle, blocks, slots, likeControl, colorPalette = 'pc' } = data;
 
-  const blocksListRenderer = renderBlocksList(props);
+  const options: RenderBlockOptions = {
+    key: '',
+    blocksRegistry,
+    page: data,
+    blockDecorator: blockDecorator || defaultBlockDecorator,
+    context,
+  };
+
+  const pageSlots = renderSlots({ slots, parent: data, options });
 
   return (
     <section
       className={`relative ${style2className(pageStyle)} ${className}`}
       data-theme={colorPalette}
     >
-      {slots?.header?.blocks?.length ? (
-        <div className={`${style2className(slots.header.style)}`}>
-          {blocksListRenderer(slots.header.blocks, ['header'])}
-        </div>
+      {pageSlots?.header ? (
+        <div className="mb-5 shadow-[0_8px_32px_0px_#00000014]">{pageSlots.header}</div>
       ) : null}
 
       {blocks?.length ? (
-        <div className="container grid grid-cols-12 gap-1">{blocksListRenderer(blocks)}</div>
+        <div className="container grid grid-cols-12 gap-1">
+          {renderBlocksList({ blocks, parent: data, options })}
+        </div>
       ) : null}
 
       {likeControl ? renderLikeControl(context) : null}
@@ -44,22 +54,8 @@ export const ContentPage = JSX<ContentPageProps>((props) => {
   );
 });
 
-function renderBlocksList({ blocksRegistry, data, blockDecorator, context }: ContentPageProps) {
-  return (blocks: BlockDef[], ancestors?: BlockAncestors) =>
-    blocks.map((block, i) =>
-      renderBlock(
-        block,
-        {
-          key: `${block.type || '#'}-${i}`,
-          blocksRegistry,
-          page: data || {},
-          blockDecorator: blockDecorator || defaultBlockDecorator,
-          context,
-        },
-        ancestors,
-      ),
-    );
-}
+ContentPage.childrenTypes = [];
+ContentPage.slots = () => ['header'];
 
 function renderLikeControl(context: ContentPageContext) {
   return (

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

@@ -0,0 +1,17 @@
+import type { BlockDef, Slot } from '../../model/ContentPageDef';
+
+export const mapSlot =
+  (mapper: (blocks?: BlockDef[]) => BlockDef[]) =>
+  <S extends Slot>(slot: S): S => ({
+    ...slot,
+    blocks: mapper(slot.blocks),
+    slots: slot.slots
+      ? Object.entries(slot.slots).reduce(
+          (res, [slotKey, slotBlocks]) => ({
+            ...res,
+            [slotKey]: mapper(slotBlocks),
+          }),
+          {},
+        )
+      : {},
+  });

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

@@ -1,7 +1,29 @@
-import { BlockDef } from '../../model/ContentPageDef';
+import type { BlocksRegistry } from '../../model/BlocksRegistry';
+import type { BlockDef, Slot } from '../../model/ContentPageDef';
+import { mapSlot } from './mapSlot';
 
-export function normalizeBlock(block: BlockDef) {
-  const { mobile, ...rest } = block;
+export function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S {
+  const { mobile, ...rest } = (block || {}) as BlockDef;
 
-  return mobile ? { ...rest, ...mobile, content: { ...rest.content, ...mobile.content } } : block;
+  const normalizedBlock = mobile
+    ? { ...rest, ...mobile, content: { ...rest.content, ...mobile.content } }
+    : block;
+
+  return {
+    ...mapSlot((blocks) => filterBlocks(blocks, blocksRegistry))(normalizedBlock || {}),
+  } 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),
+        }))
+    : [];

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

@@ -1,6 +1,6 @@
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
-import type { ContentPageDef, Slot } from '../../model/ContentPageDef';
-import { filterBlocks } from './filterBlocks';
+import type { ContentPageDef } from '../../model/ContentPageDef';
+import { normalizeBlock } from './normalizeBlock';
 
 export const normalizePage =
   (blocksRegistry: BlocksRegistry) =>
@@ -9,22 +9,5 @@ export const normalizePage =
       return undefined;
     }
 
-    const { blocks = [], slots } = contentPage;
-
-    return {
-      ...contentPage,
-      blocks: filterBlocks(blocks, blocksRegistry),
-      slots:
-        slots &&
-        Object.keys(slots).reduce(
-          (res, key) => ({
-            ...res,
-            [key]: {
-              ...slots[key],
-              blocks: filterBlocks((slots[key] as Slot).blocks || [], blocksRegistry),
-            },
-          }),
-          {},
-        ),
-    };
+    return normalizeBlock(contentPage, blocksRegistry);
   };

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

@@ -1,11 +1,12 @@
-import { BlockAncestors, BlockDecorator, DEFAULT_ANCESTORS } from '../../model/BlockDecorator';
+import { BlockAncestors, BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { BlockDef, ContentPageDef } from '../../model/ContentPageDef';
-import type { VNode } from '../../model/VNode';
 import { style2className } from '../../utils/style2className';
 import type { ContentPageContext } from './ContentPageContext';
+import { renderBlocksList } from './renderBlockList';
+import { renderSlots } from './renderSlots';
 
-interface RenderBlockOptions {
+export interface RenderBlockOptions {
   key: string;
   page: ContentPageDef;
   blockDecorator: BlockDecorator;
@@ -13,15 +14,15 @@ interface RenderBlockOptions {
   context: ContentPageContext;
 }
 
-const defaultChildRenderer = (_: VNode) => _;
+export interface RenderBlockProps {
+  block?: BlockDef;
+  options: RenderBlockOptions;
+  ancestors?: BlockAncestors; // Recursion context
+}
 
-export function renderBlock(
-  block: BlockDef,
-  options: RenderBlockOptions,
-  ancestors: BlockAncestors = DEFAULT_ANCESTORS, // Recursion context
-) {
-  const { key, page, blockDecorator, blocksRegistry, context } = options;
-  const { type, blocks: childBlocks } = block;
+export function renderBlock({ block = {}, options, ancestors = [] }: RenderBlockProps) {
+  const { key, page, blockDecorator, blocksRegistry = {}, context } = options;
+  const { type, slots, blocks: childBlocks } = block;
 
   if (!(type && type in blocksRegistry)) {
     console.warn(`No block with "${type}" is registered`);
@@ -29,13 +30,9 @@ export function renderBlock(
 
   const BlockComponent = type && blocksRegistry[type];
 
-  const { renderChild = defaultChildRenderer } = BlockComponent || {};
-  const renderChildBlock = (_: BlockDef, j: number) =>
-    renderChild(
-      renderBlock(_, { ...options, key: `${options.key}-${j}` }, [...ancestors, block]),
-      j,
-    );
-  const children = childBlocks?.length ? childBlocks.map(renderChildBlock) : null;
+  const subBlockRenderProps = { parent: block, options, ancestors };
+  const children = renderBlocksList({ ...subBlockRenderProps, blocks: childBlocks });
+  const blockSlots = slots ? renderSlots({ ...subBlockRenderProps, slots }) : {};
 
   return blockDecorator(
     {
@@ -56,6 +53,7 @@ export function renderBlock(
             version={version}
             anchor={anchor}
             labels={labels}
+            slots={blockSlots}
             {...content}
           >
             {children}

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

@@ -0,0 +1,39 @@
+import type { SlotName } from '../../model/BlockDecorator';
+import { BlockAncestors, DEFAULT_SLOT_NAME } from '../../model/BlockDecorator';
+import type { BlockDef, Slot } from '../../model/ContentPageDef';
+import type { VNode } from '../../model/VNode';
+import { renderBlock, RenderBlockOptions } from './renderBlock';
+
+interface RenderBlockListProps {
+  blocks?: BlockDef[];
+  parent: Slot;
+  slotName?: SlotName;
+  options: RenderBlockOptions;
+  ancestors?: BlockAncestors; // Recursion context
+}
+
+const defaultChildRenderer = (_: VNode) => _;
+
+export function renderBlocksList({
+  blocks = [],
+  parent,
+  slotName = DEFAULT_SLOT_NAME,
+  options,
+  ancestors = [],
+}: RenderBlockListProps): Record<string, VNode> {
+  const { blocksRegistry = {} } = options;
+  const { type } = parent as BlockDef;
+  const BlockComponent = type && blocksRegistry[type];
+  const { renderChild = defaultChildRenderer } = BlockComponent || {};
+
+  return blocks.map((_: BlockDef, j: number) =>
+    renderChild(
+      renderBlock({
+        block: _,
+        options: { ...options, key: `${options.key ? options.key : _.type}-${j}` },
+        ancestors: [...ancestors, [parent, slotName]],
+      }),
+      j,
+    ),
+  );
+}

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

@@ -0,0 +1,33 @@
+import { BlockAncestors } from '../../model/BlockDecorator';
+import type { BlockDef, Slot } from '../../model/ContentPageDef';
+import type { VNode } from '../../model/VNode';
+import type { RenderBlockOptions } from './renderBlock';
+import { renderBlocksList } from './renderBlockList';
+
+interface RenderSlotsProps {
+  slots?: Record<string, BlockDef[]>;
+  parent: Slot;
+  options: RenderBlockOptions;
+  ancestors?: BlockAncestors;
+}
+
+export function renderSlots({
+  slots = {},
+  parent,
+  options,
+  ancestors = [],
+}: RenderSlotsProps): Record<string, VNode> {
+  return Object.entries(slots).reduce(
+    (res, [slotName, slotBlocks]) => ({
+      ...res,
+      [slotName]: renderBlocksList({
+        blocks: slotBlocks,
+        parent,
+        slotName,
+        options,
+        ancestors,
+      }),
+    }),
+    {},
+  );
+}

package/mobile/src/components/ProductBlock/renderBackwardButton.tsx

@@ -22,7 +22,11 @@ export function renderBackwardButton(
         href={href}
         target={target}
       >
-        <Img className="w-4 h-4" image={{ ...backwardIcon, iconVersion }} asSVG />
+        <Img
+          className="w-4 h-4"
+          image={{ ...backwardIcon, iconVersion: backwardIcon.iconVersion || iconVersion }}
+          asSVG
+        />
       </Button>
       {text ? <span className="text-m">{text}</span> : null}
     </div>

package/mobile/src/components/SafeDepositRental/SafeDepositRental.tsx

@@ -47,7 +47,12 @@ export const SafeDepositRental = JSX<SafeDepositRentalProps>(
       <BlockWrapper context={context} className={className} {...rest}>
         <div className="font-sans bg-white px-8 py-12">
           {title ? (
-            <Heading title={title} headingType="h3" as="h2" className="mb-2.5 text-center" />
+            <Heading
+              title={title}
+              headingType="h3"
+              as="h2"
+              className="text-primary-text mb-2.5 text-center"
+            />
           ) : null}
           <SafeDepositRentalForm
             regions={regions}

package/mobile/src/components/StepsBlock/renderItems.tsx

@@ -11,16 +11,13 @@ export const renderItems = ({
   isDotted?: boolean;
   version?: BlockVersion;
   className?: string;
-}) => {
-  const listVersion = version === 'primary' ? 'gray' : version;
-
-  return items ? (
+}) =>
+  items ? (
     <List
-      className={`mt-4 ${className}`}
-      version={listVersion}
+      className={className}
+      version={version}
       items={items}
-      listItemSize="S"
+      listItemSize="M"
       isDotted={isDotted}
     />
   ) : null;
-};