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

package/mobile/lib/components/ContentPage/ContentPage.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentPage.js","sourceRoot":"","sources":["../../../src/components/ContentPage/ContentPage.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAKxC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,MAAM,qBAAqB,GAAmB,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAClF,MAAM,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAmB,CAAC,KAAK,EAAE,EAAE;IACzD,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAErD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;IAEnF,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAEnD,OAAO,CACL,mBACE,SAAS,EAAE,YAAY,eAAe,CAAC,SAAS,CAAC,IAAI,SAAS,EAAE,gBACpD,YAAY,aAEvB,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAC/B,cAAK,SAAS,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,YACrD,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,GAChD,CACP,CAAC,CAAC,CAAC,IAAI,EAEP,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAChB,cAAK,SAAS,EAAC,mCAAmC,YAAE,kBAAkB,CAAC,MAAM,CAAC,GAAO,CACtF,CAAC,CAAC,CAAC,IAAI,EAEP,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IACxC,CACX,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,SAAS,gBAAgB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAoB;IAC3F,OAAO,CAAC,MAAkB,EAAE,SAA0B,EAAE,EAAE,CACxD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CACtB,WAAW,CACT,KAAK,EACL;QACE,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,GAAG,IAAI,CAAC,EAAE;QAChC,cAAc;QACd,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,cAAc,EAAE,cAAc,IAAI,qBAAqB;QACvD,OAAO;KACR,EACD,SAAS,CACV,CACF,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CAAC,OAA2B;IACpD,OAAO,CACL,cAAK,SAAS,EAAC,qEAAqE,YAClF,KAAC,WAAW,IAEV,SAAS,EAAC,mDAAmD,EAC7D,OAAO,EAAE,OAAO,IAFZ,aAAa,CAGjB,GACE,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ContentPage.js","sourceRoot":"","sources":["../../../src/components/ContentPage/ContentPage.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAKxC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,MAAM,qBAAqB,GAAmB,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAClF,MAAM,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,WAAW,GAA+B,GAAG,CAAmB,CAAC,KAAK,EAAE,EAAE;IACrF,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAErF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;IAEnF,MAAM,OAAO,GAAuB;QAClC,GAAG,EAAE,EAAE;QACP,cAAc;QACd,IAAI,EAAE,IAAI;QACV,cAAc,EAAE,cAAc,IAAI,qBAAqB;QACvD,OAAO;KACR,CAAC;IAEF,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAEhE,OAAO,CACL,mBACE,SAAS,EAAE,YAAY,eAAe,CAAC,SAAS,CAAC,IAAI,SAAS,EAAE,gBACpD,YAAY,aAEvB,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CACnB,cAAK,SAAS,EAAC,wCAAwC,YAAE,SAAS,CAAC,MAAM,GAAO,CACjF,CAAC,CAAC,CAAC,IAAI,EAEP,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAChB,cAAK,SAAS,EAAC,mCAAmC,YAC/C,gBAAgB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,GAChD,CACP,CAAC,CAAC,CAAC,IAAI,EAEP,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IACxC,CACX,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,WAAW,CAAC,aAAa,GAAG,EAAE,CAAC;AAC/B,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;AAErC,SAAS,iBAAiB,CAAC,OAA2B;IACpD,OAAO,CACL,cAAK,SAAS,EAAC,qEAAqE,YAClF,KAAC,WAAW,IAEV,SAAS,EAAC,mDAAmD,EAC7D,OAAO,EAAE,OAAO,IAFZ,aAAa,CAGjB,GACE,CACP,CAAC;AACJ,CAAC"}

package/mobile/lib/components/ContentPage/mapSlot.d.ts

@@ -0,0 +1,2 @@
+import type { BlockDef, Slot } from '../../model/ContentPageDef';
+export declare const mapSlot: (mapper: (blocks?: BlockDef[]) => BlockDef[]) => <S extends Slot>(slot: S) => S;

package/mobile/lib/components/ContentPage/mapSlot.js

@@ -0,0 +1,11 @@
+export const mapSlot = (mapper) => (slot) => ({
+    ...slot,
+    blocks: mapper(slot.blocks),
+    slots: slot.slots
+        ? Object.entries(slot.slots).reduce((res, [slotKey, slotBlocks]) => ({
+            ...res,
+            [slotKey]: mapper(slotBlocks),
+        }), {})
+        : {},
+});
+//# sourceMappingURL=mapSlot.js.map

package/mobile/lib/components/ContentPage/mapSlot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapSlot.js","sourceRoot":"","sources":["../../../src/components/ContentPage/mapSlot.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,OAAO,GAClB,CAAC,MAA2C,EAAE,EAAE,CAChD,CAAiB,IAAO,EAAK,EAAE,CAAC,CAAC;IAC/B,GAAG,IAAI;IACP,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;QACf,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAC/B,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,GAAG,GAAG;YACN,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;SAC9B,CAAC,EACF,EAAE,CACH;QACH,CAAC,CAAC,EAAE;CACP,CAAC,CAAC"}

package/mobile/lib/components/ContentPage/normalizeBlock.d.ts

@@ -1,2 +1,3 @@
-import { BlockDef } from '../../model/ContentPageDef';
-export declare function normalizeBlock(block: BlockDef): BlockDef;
+import type { BlocksRegistry } from '../../model/BlocksRegistry';
+import type { Slot } from '../../model/ContentPageDef';
+export declare function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S;

package/mobile/lib/components/ContentPage/normalizeBlock.js

@@ -1,5 +1,20 @@
-export function normalizeBlock(block) {
-    const { mobile, ...rest } = block;
-    return mobile ? { ...rest, ...mobile, content: { ...rest.content, ...mobile.content } } : block;
+import { mapSlot } from './mapSlot.js';
+export function normalizeBlock(block, blocksRegistry) {
+    const { mobile, ...rest } = (block || {});
+    const normalizedBlock = mobile
+        ? { ...rest, ...mobile, content: { ...rest.content, ...mobile.content } }
+        : block;
+    return {
+        ...mapSlot((blocks) => filterBlocks(blocks, blocksRegistry))(normalizedBlock || {}),
+    };
 }
+const filterBlocks = (blocks, blocksRegistry) => blocks
+    ? blocks
+        ?.filter((block) => blocksRegistry &&
+        (block?.type || block?.mobile?.type || '') in blocksRegistry &&
+        !block.mobile?.hidden)
+        .map((block) => ({
+        ...normalizeBlock(block, blocksRegistry),
+    }))
+    : [];
 //# sourceMappingURL=normalizeBlock.js.map

package/mobile/lib/components/ContentPage/normalizeBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeBlock.js","sourceRoot":"","sources":["../../../src/components/ContentPage/normalizeBlock.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,KAAe;IAC5C,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAElC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAClG,CAAC"}
+{"version":3,"file":"normalizeBlock.js","sourceRoot":"","sources":["../../../src/components/ContentPage/normalizeBlock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,UAAU,cAAc,CAAiB,KAAS,EAAE,cAA+B;IACvF,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAa,CAAC;IAEtD,MAAM,eAAe,GAAG,MAAM;QAC5B,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE;QACzE,CAAC,CAAC,KAAK,CAAC;IAEV,OAAO;QACL,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC;KAC/E,CAAC;AACT,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,MAAmB,EAAE,cAA+B,EAAE,EAAE,CAC5E,MAAM;IACJ,CAAC,CAAC,MAAM;QACJ,EAAE,MAAM,CACN,CAAC,KAAK,EAAE,EAAE,CACR,cAAc;QACd,CAAC,KAAK,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC,IAAI,cAAc;QAC5D,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CACxB;SACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC;KACzC,CAAC,CAAC;IACP,CAAC,CAAC,EAAE,CAAC"}

package/mobile/lib/components/ContentPage/normalizePage.js

@@ -1,20 +1,8 @@
-import { filterBlocks } from './filterBlocks.js';
+import { normalizeBlock } from './normalizeBlock.js';
 export const normalizePage = (blocksRegistry) => (contentPage) => {
     if (!contentPage) {
         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].blocks || [], blocksRegistry),
-                },
-            }), {}),
-    };
+    return normalizeBlock(contentPage, blocksRegistry);
 };
 //# sourceMappingURL=normalizePage.js.map

package/mobile/lib/components/ContentPage/normalizePage.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalizePage.js","sourceRoot":"","sources":["../../../src/components/ContentPage/normalizePage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,aAAa,GACxB,CAAC,cAA8B,EAAE,EAAE,CACnC,CAAC,WAA8C,EAA8B,EAAE;IAC7E,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC;IAE3C,OAAO;QACL,GAAG,WAAW;QACd,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC;QAC5C,KAAK,EACH,KAAK;YACL,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CACvB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBACb,GAAG,GAAG;gBACN,CAAC,GAAG,CAAC,EAAE;oBACL,GAAG,KAAK,CAAC,GAAG,CAAC;oBACb,MAAM,EAAE,YAAY,CAAE,KAAK,CAAC,GAAG,CAAU,CAAC,MAAM,IAAI,EAAE,EAAE,cAAc,CAAC;iBACxE;aACF,CAAC,EACF,EAAE,CACH;KACJ,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"normalizePage.js","sourceRoot":"","sources":["../../../src/components/ContentPage/normalizePage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GACxB,CAAC,cAA8B,EAAE,EAAE,CACnC,CAAC,WAA8C,EAA8B,EAAE;IAC7E,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,cAAc,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AACrD,CAAC,CAAC"}

package/mobile/lib/components/ContentPage/renderBlock.d.ts

@@ -2,12 +2,16 @@ import { BlockAncestors, BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { BlockDef, ContentPageDef } from '../../model/ContentPageDef';
 import type { ContentPageContext } from './ContentPageContext';
-interface RenderBlockOptions {
+export interface RenderBlockOptions {
     key: string;
     page: ContentPageDef;
     blockDecorator: BlockDecorator;
     blocksRegistry: BlocksRegistry;
     context: ContentPageContext;
 }
-export declare function renderBlock(block: BlockDef, options: RenderBlockOptions, ancestors?: BlockAncestors): any;
-export {};
+export interface RenderBlockProps {
+    block?: BlockDef;
+    options: RenderBlockOptions;
+    ancestors?: BlockAncestors;
+}
+export declare function renderBlock({ block, options, ancestors }: RenderBlockProps): any;

package/mobile/lib/components/ContentPage/renderBlock.js

@@ -1,17 +1,17 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
-import { DEFAULT_ANCESTORS } from '../../model/BlockDecorator.js';
 import { style2className } from '../../utils/style2className.js';
-const defaultChildRenderer = (_) => _;
-export function renderBlock(block, options, ancestors = DEFAULT_ANCESTORS) {
-    const { key, page, blockDecorator, blocksRegistry, context } = options;
-    const { type, blocks: childBlocks } = block;
+import { renderBlocksList } from './renderBlockList.js';
+import { renderSlots } from './renderSlots.js';
+export function renderBlock({ block = {}, options, ancestors = [] }) {
+    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`);
     }
     const BlockComponent = type && blocksRegistry[type];
-    const { renderChild = defaultChildRenderer } = BlockComponent || {};
-    const renderChildBlock = (_, j) => 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({
         blockClassName: `scroll-mt-12 ${style2className(block.style)}`,
         block,
@@ -19,7 +19,7 @@ export function renderBlock(block, options, ancestors = DEFAULT_ANCESTORS) {
         // Adjusted by decorator block and blockClassName
         render: ({ block: adjustedBlock, blockClassName: adjustedBlockClassName }) => {
             const { version, anchor, labels, content } = adjustedBlock;
-            return BlockComponent ? (_jsx(BlockComponent, { className: adjustedBlockClassName, context: context, page: page, ancestors: ancestors, version: version, anchor: anchor, labels: labels, ...content, children: children }, key)) : null;
+            return BlockComponent ? (_jsx(BlockComponent, { className: adjustedBlockClassName, context: context, page: page, ancestors: ancestors, version: version, anchor: anchor, labels: labels, slots: blockSlots, ...content, children: children }, key)) : null;
         },
     }, key);
 }

package/mobile/lib/components/ContentPage/renderBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderBlock.js","sourceRoot":"","sources":["../../../src/components/ContentPage/renderBlock.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAkC,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAI/F,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAW9D,MAAM,oBAAoB,GAAG,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAE7C,MAAM,UAAU,WAAW,CACzB,KAAe,EACf,OAA2B,EAC3B,YAA4B,iBAAiB;IAE7C,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACvE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE5C,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,cAAc,CAAC,EAAE;QACrC,OAAO,CAAC,IAAI,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,CAAC;KACvD;IAED,MAAM,cAAc,GAAG,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAEpD,MAAM,EAAE,WAAW,GAAG,oBAAoB,EAAE,GAAG,cAAc,IAAI,EAAE,CAAC;IACpE,MAAM,gBAAgB,GAAG,CAAC,CAAW,EAAE,CAAS,EAAE,EAAE,CAClD,WAAW,CACT,WAAW,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,EAAE,KAAK,CAAC,CAAC,EACjF,CAAC,CACF,CAAC;IACJ,MAAM,QAAQ,GAAG,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhF,OAAO,cAAc,CACnB;QACE,cAAc,EAAE,gBAAgB,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC9D,KAAK;QACL,SAAS;QACT,iDAAiD;QACjD,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,sBAAsB,EAAE,EAAE,EAAE;YAC3E,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;YAE3D,OAAO,cAAc,CAAC,CAAC,CAAC,CACtB,KAAC,cAAc,IAEb,SAAS,EAAE,sBAAsB,EACjC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,KACV,OAAO,YAEV,QAAQ,IAVJ,GAAG,CAWO,CAClB,CAAC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC"}
+{"version":3,"file":"renderBlock.js","sourceRoot":"","sources":["../../../src/components/ContentPage/renderBlock.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAgB5C,MAAM,UAAU,WAAW,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,OAAO,EAAE,SAAS,GAAG,EAAE,EAAoB;IACnF,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5E,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAEnD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,cAAc,CAAC,EAAE;QACrC,OAAO,CAAC,IAAI,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,CAAC;KACvD;IAED,MAAM,cAAc,GAAG,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IAEpD,MAAM,mBAAmB,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;IAClE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,GAAG,mBAAmB,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IACnF,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,mBAAmB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/E,OAAO,cAAc,CACnB;QACE,cAAc,EAAE,gBAAgB,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC9D,KAAK;QACL,SAAS;QACT,iDAAiD;QACjD,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,sBAAsB,EAAE,EAAE,EAAE;YAC3E,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;YAE3D,OAAO,cAAc,CAAC,CAAC,CAAC,CACtB,KAAC,cAAc,IAEb,SAAS,EAAE,sBAAsB,EACjC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,KACb,OAAO,YAEV,QAAQ,IAXJ,GAAG,CAYO,CAClB,CAAC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC"}

package/mobile/lib/components/ContentPage/renderBlockList.d.ts

@@ -0,0 +1,14 @@
+import type { SlotName } from '../../model/BlockDecorator';
+import { BlockAncestors } from '../../model/BlockDecorator';
+import type { BlockDef, Slot } from '../../model/ContentPageDef';
+import type { VNode } from '../../model/VNode';
+import { RenderBlockOptions } from './renderBlock';
+interface RenderBlockListProps {
+    blocks?: BlockDef[];
+    parent: Slot;
+    slotName?: SlotName;
+    options: RenderBlockOptions;
+    ancestors?: BlockAncestors;
+}
+export declare function renderBlocksList({ blocks, parent, slotName, options, ancestors, }: RenderBlockListProps): Record<string, VNode>;
+export {};

package/mobile/lib/components/ContentPage/renderBlockList.js

@@ -0,0 +1,15 @@
+import { DEFAULT_SLOT_NAME } from '../../model/BlockDecorator.js';
+import { renderBlock } from './renderBlock.js';
+const defaultChildRenderer = (_) => _;
+export function renderBlocksList({ blocks = [], parent, slotName = DEFAULT_SLOT_NAME, options, ancestors = [], }) {
+    const { blocksRegistry = {} } = options;
+    const { type } = parent;
+    const BlockComponent = type && blocksRegistry[type];
+    const { renderChild = defaultChildRenderer } = BlockComponent || {};
+    return blocks.map((_, j) => renderChild(renderBlock({
+        block: _,
+        options: { ...options, key: `${options.key ? options.key : _.type}-${j}` },
+        ancestors: [...ancestors, [parent, slotName]],
+    }), j));
+}
+//# sourceMappingURL=renderBlockList.js.map

package/mobile/lib/components/ContentPage/renderBlockList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderBlockList.js","sourceRoot":"","sources":["../../../src/components/ContentPage/renderBlockList.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG/E,OAAO,EAAE,WAAW,EAAsB,MAAM,eAAe,CAAC;AAUhE,MAAM,oBAAoB,GAAG,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;AAE7C,MAAM,UAAU,gBAAgB,CAAC,EAC/B,MAAM,GAAG,EAAE,EACX,MAAM,EACN,QAAQ,GAAG,iBAAiB,EAC5B,OAAO,EACP,SAAS,GAAG,EAAE,GACO;IACrB,MAAM,EAAE,cAAc,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAkB,CAAC;IACpC,MAAM,cAAc,GAAG,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,EAAE,WAAW,GAAG,oBAAoB,EAAE,GAAG,cAAc,IAAI,EAAE,CAAC;IAEpE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAW,EAAE,CAAS,EAAE,EAAE,CAC3C,WAAW,CACT,WAAW,CAAC;QACV,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE;QAC1E,SAAS,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;KAC9C,CAAC,EACF,CAAC,CACF,CACF,CAAC;AACJ,CAAC"}

package/mobile/lib/components/ContentPage/renderSlots.d.ts

@@ -0,0 +1,12 @@
+import { BlockAncestors } from '../../model/BlockDecorator';
+import type { BlockDef, Slot } from '../../model/ContentPageDef';
+import type { VNode } from '../../model/VNode';
+import type { RenderBlockOptions } from './renderBlock';
+interface RenderSlotsProps {
+    slots?: Record<string, BlockDef[]>;
+    parent: Slot;
+    options: RenderBlockOptions;
+    ancestors?: BlockAncestors;
+}
+export declare function renderSlots({ slots, parent, options, ancestors, }: RenderSlotsProps): Record<string, VNode>;
+export {};

package/mobile/lib/components/ContentPage/renderSlots.js

@@ -0,0 +1,14 @@
+import { renderBlocksList } from './renderBlockList.js';
+export function renderSlots({ slots = {}, parent, options, ancestors = [], }) {
+    return Object.entries(slots).reduce((res, [slotName, slotBlocks]) => ({
+        ...res,
+        [slotName]: renderBlocksList({
+            blocks: slotBlocks,
+            parent,
+            slotName,
+            options,
+            ancestors,
+        }),
+    }), {});
+}
+//# sourceMappingURL=renderSlots.js.map

package/mobile/lib/components/ContentPage/renderSlots.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderSlots.js","sourceRoot":"","sources":["../../../src/components/ContentPage/renderSlots.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AASrD,MAAM,UAAU,WAAW,CAAC,EAC1B,KAAK,GAAG,EAAE,EACV,MAAM,EACN,OAAO,EACP,SAAS,GAAG,EAAE,GACG;IACjB,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,GAAG,GAAG;QACN,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;YAC3B,MAAM,EAAE,UAAU;YAClB,MAAM;YACN,QAAQ;YACR,OAAO;YACP,SAAS;SACV,CAAC;KACH,CAAC,EACF,EAAE,CACH,CAAC;AACJ,CAAC"}

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

@@ -1,7 +1,8 @@
-import type { BlockDef, Slot, SlotsMap } from './ContentPageDef';
+import type { BlockDef, Slot } from './ContentPageDef';
 export declare const DEFAULT_SLOT_NAME: null;
-export declare type BlockAncestors = [keyof SlotsMap | typeof DEFAULT_SLOT_NAME, ...Slot[]];
-export declare const DEFAULT_ANCESTORS: BlockAncestors;
+export declare type SlotName = string | typeof DEFAULT_SLOT_NAME;
+export declare type BlockAncestorItem = [Slot, SlotName];
+export declare type BlockAncestors = BlockAncestorItem[];
 interface BlockDecoratorProps<VNode> {
     blockClassName: string;
     block: BlockDef;

package/mobile/lib/model/BlockDecorator.js

@@ -1,3 +1,2 @@
 export const DEFAULT_SLOT_NAME = null;
-export const DEFAULT_ANCESTORS = [DEFAULT_SLOT_NAME];
 //# sourceMappingURL=BlockDecorator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"BlockDecorator.js","sourceRoot":"","sources":["../../src/model/BlockDecorator.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAItC,MAAM,CAAC,MAAM,iBAAiB,GAAmB,CAAC,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"BlockDecorator.js","sourceRoot":"","sources":["../../src/model/BlockDecorator.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC"}

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

@@ -1,2 +1,2 @@
 import type { JSXBlock } from './JSXBlock';
-export declare type BlocksRegistry<BlockProps = Record<string, any>> = Record<string, JSXBlock<BlockProps>>;
+export declare type BlocksRegistry = Record<string, JSXBlock<any>>;

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/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/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}