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

package/mobile/src/components/InvestmentGallery/InvestmentGalleryCard.tsx

@@ -0,0 +1,91 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { BlockVersion } from '../../model/BlockVersion';
+import { BorderVersionStyleMap } from '../../model/BorderVersion';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import { Description } from '../../ui-kit/Description/Description';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { Img } from '../../ui-kit/Img/Img';
+import { BaseTile } from '../BaseTile/BaseTile';
+import type {
+  CardColumnsMode,
+  CardListItem,
+  InvestmentGalleryCardTypes,
+} from './InvestmentGalleryContent';
+
+export interface RecommendationCardProps extends InvestmentGalleryCardTypes, UniBlockProps {
+  version?: BlockVersion;
+}
+const getItemListFontSize = (colValue?: string) => (colValue === 'single' ? 'text-h6' : 'text-l');
+
+const cardColumnsModeStyleMap: Record<CardColumnsMode, string> = {
+  double: 'flex gap-y-2 gap-x-10 flex-wrap',
+  single: 'flex gap-y-2 flex-col',
+};
+
+export const InvestmentGalleryCard = JSX<RecommendationCardProps>(
+  ({
+    className = '',
+    columnsMode = 'double',
+    context,
+    description,
+    additionalDescription,
+    image,
+    cardList,
+    title,
+    version = 'primary',
+  }) => {
+    const tileTitle = title ? (
+      <Heading headingType="h4" as="h3" className="mb-3.5 z-10" title={title} />
+    ) : null;
+    const tileImage = image?.src ? (
+      <Img className="absolute bottom-0 right-0 m-0" image={image} />
+    ) : null;
+
+    return (
+      <section
+        className={`relative overflow-hidden text-left border border-solid box-border
+          p-9 min-w-[697px] min-h-[319px]
+          ${BorderVersionStyleMap[version]}
+          ${className}`}
+        role="listitem"
+      >
+        <BaseTile
+          context={context}
+          className="flex justify-between"
+          title={tileTitle}
+          image={tileImage}
+        >
+          <div className="flex flex-col justify-between">
+            <div className="flex itens-center justify-between mb-4">
+              {description ? <Description className="text-h6" description={description} /> : null}
+              {additionalDescription ? (
+                <div className="text-m-light text-secondary-text"> {additionalDescription} </div>
+              ) : null}
+            </div>
+            {cardList?.length ? (
+              <div className={`${cardColumnsModeStyleMap[columnsMode]}`} role="list">
+                {renderCardList(cardList, columnsMode)}
+              </div>
+            ) : null}
+          </div>
+        </BaseTile>
+      </section>
+    );
+  },
+);
+
+const renderCardList = (cardList: CardListItem[], columnsMode: string) =>
+  cardList.map((item, i) => (
+    <div
+      key={String(i)}
+      className={columnsMode === 'double' ? 'basis-[calc(50%-20px)]' : ''}
+      role="listitem"
+    >
+      {item?.parameter ? (
+        <span className={`pr-2.5 ${getItemListFontSize(columnsMode)}`}>{item.parameter}</span>
+      ) : null}
+      {item?.parameterDesccription ? (
+        <span className="text-m-light text-secondary-text">{item.parameterDesccription}</span>
+      ) : null}
+    </div>
+  ));

package/mobile/src/components/InvestmentGallery/InvestmentGalleryContent.ts

@@ -0,0 +1,54 @@
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { Picture } from '../../model/Picture';
+import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
+
+/**
+ * @title Количество колонок в списке
+ * @enumNames [
+ *   "1 колонка",
+ *   "2 колонки",
+ *  ]
+ */
+export type CardColumnsMode = 'single' | 'double';
+
+/**
+ * @title Карточка
+ */
+export interface InvestmentGalleryCardTypes extends HeadlineCommonProps {
+  /** @title Доп. описание карточки  */
+  additionalDescription?: string;
+  /**
+   * @default {
+   *   "format": "webp",
+   *   "size": {
+   *       "width": 290
+   *   },
+   *   "sources": [{
+   *       "media": 1279,
+   *       "width": 174,
+   *       "format": "webp",
+   *       "alignment": "southeast"
+   *   }]
+   * }
+   */
+  image?: Picture;
+  columnsMode?: CardColumnsMode;
+  /** @title Описание пункта */
+  cardList?: CardListItem[];
+}
+
+export interface CardListItem {
+  /** @title Параметр */
+  parameter?: string;
+  /** @title Описание */
+  parameterDesccription?: string;
+}
+
+/**
+ * @title Карточка
+ */
+export interface InvestmentGalleryContent extends TitleProps {
+  /** @title Карточки */
+  cards?: InvestmentGalleryCardTypes[];
+  version?: BlockVersion;
+}

package/mobile/src/components/PictureText/PictureText.tsx

@@ -69,8 +69,8 @@ const renderBenefit = (version: BlockVersion) => (benefit: BenefitItemProps, i:
 function renderInsuranceSumMonth(sum?: number, monthLimit?: number) {
   return sum || monthLimit ? (
     <div className="bg-main-divider rounded-md flex mt-7 gap-6 px-5 py-4">
-      {Number.isFinite(sum) ? renderValueBlock('Страховая сумма:', sum, Boolean(monthLimit)) : null}
-      {Number.isFinite(monthLimit)
+      {Number(sum) > 0 ? renderValueBlock('Страховая сумма:', sum, Boolean(monthLimit)) : null}
+      {Number(monthLimit) > 0
         ? renderValueBlock('Ежемесячный лимит:', monthLimit, Boolean(sum))
         : null}
     </div>
@@ -81,7 +81,7 @@ function renderValueBlock(title: string, sum = 0, isAnotherBlock = false) {
   const widthStyle = isAnotherBlock ? 'w-fit' : 'w-full';
 
   return (
-    <div className={`flex justify-between items-center gap-2 w-full ${widthStyle}`}>
+    <div className={`flex justify-between items-center gap-2 w-full whitespace-pre ${widthStyle}`}>
       <span className="text-secondary-text text-l-light">{title}</span>
       <span className="text-primary-main text-h6">{addSpacesBetweenNumbers(sum)} ₽</span>
     </div>

package/mobile/src/components/Recommendation/Recommendation.tsx

@@ -1,7 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { BlockVersion } from '../../model/BlockVersion';
+import { BorderVersionStyleMap } from '../../model/BorderVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
+import { VersionStyleMap } from '../../model/BlockVersion';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -16,17 +18,15 @@ const CARD_SHIFT = 525;
 export interface RecommendationProps extends RecommendationContent, UniBlockProps {}
 
 export const Recommendation = JSX<RecommendationProps>(
-  ({ context, recommendations = [], className = '', title, version, ...rest }) => {
+  ({ context, recommendations = [], className = '', title, version = 'primary', ...rest }) => {
     const [activeCardIndex, setActiveCardIndex] = useState(0);
 
-    const blockClassName =
-      version === 'secondary' ? 'bg-primary-main text-white' : 'bg-white text-primary-text';
-    const cardClassName = version === 'secondary' ? 'border-white/50' : 'border-main-stroke';
-
     return (
       <BlockWrapper
         context={context}
-        className={`relative font-sans p-9 overflow-hidden text-center ${blockClassName} ${className}`}
+        className={`relative font-sans p-9 overflow-hidden text-center 
+          ${VersionStyleMap[version]} 
+          ${className}`}
         {...rest}
       >
         {title ? <Heading headingType="h3" className="mb-6" title={title} /> : null}
@@ -37,7 +37,9 @@ export const Recommendation = JSX<RecommendationProps>(
             role="list"
           >
             {recommendations?.length
-              ? recommendations.map(renderRecommendationCard(context, cardClassName, version))
+              ? recommendations.map(
+                  renderRecommendationCard(context, BorderVersionStyleMap[version], version),
+                )
               : null}
           </div>
           {renderNavButtons({

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

@@ -1,14 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import { IconVersion } from '../../model/IconVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { SizeVersion } from '../../model/SizeVersion';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import type { Step, StepsBlockContent } from './StepsBlockContent';
 import { STEPS_BLOCK_STYLE_MAPS } from './StepsBlockStyleMaps';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
@@ -22,11 +21,6 @@ const STEPS_TILE_DESCRIPTION_HEIGHT_MAP: Record<SizeVersion, string> = {
   small: 'min-h-[50px]',
 };
 
-const STEPS_SVG_VERSION_MAP: Record<BlockVersion, IconVersion> = {
-  primary: 'normal',
-  secondary: 'white',
-};
-
 export const StepsBlock = JSX<StepsBlockProps>(
   ({
     className,

package/mobile/src/content-page-repository/ContentPageRepository.ts

@@ -16,67 +16,49 @@ const not =
   (_: Arg) =>
     !predicate(_);
 
-export function ContentPageRepository({
-  contentDir = 'content',
-  publicDir = 'public',
-}: Partial<TransformationOptions> = {}) {
-  function listAllContentPages(): Promise<string[]> {
-    return find(`${contentDir}/**/*.page.json`);
-  }
+export class ContentPageRepository {
+  public static readonly inst = new ContentPageRepository();
+
+  private cache: Record<string, ContentPageDef> = {};
+
+  constructor(
+    private readonly options: TransformationOptions = {
+      contentDir: 'content',
+      publicDir: 'public',
+    },
+  ) {}
 
-  async function getAllContentPagesMap(): Promise<Record<string, ContentPageDef>> {
-    const pagePaths = await listAllContentPages();
-    const pages = await Promise.all(pagePaths.map(readPage));
-
-    return pagePaths.reduce(
-      (result, path, i) => ({
-        ...result,
-        [path]: pages[i],
-      }),
-      {},
-    );
+  async listAllContentPages(): Promise<string[]> {
+    return find(`${this.options.contentDir}/**/*.page.json`);
   }
 
-  async function getAllContentPages(): Promise<ContentPageDef[]> {
-    return Object.values(await getAllContentPagesMap());
+  async getAllContentPages(): Promise<ContentPageDef[]> {
+    const pagePaths = await this.listAllContentPages();
+
+    return Promise.all(pagePaths.map((_) => this.readPage(_)));
   }
 
-  async function getSecondaryContentPages(customPageType?: string) {
-    const pages = await getAllContentPages();
+  async getSecondaryContentPages(customPageType?: string): Promise<ContentPageDef[]> {
+    const pages = await this.getAllContentPages();
 
     return pages.filter(not(bySlug(INDEX_PAGE_SLUG))).filter(byCustomPageType(customPageType));
   }
 
-  async function getContentPageBySlug(slug: string): Promise<ContentPageDef | undefined> {
-    const pages = await getAllContentPages();
+  async getContentPageBySlug(slug: string): Promise<ContentPageDef | undefined> {
+    const pages = await this.getAllContentPages();
 
     return pages.find(bySlug(slug));
   }
 
-  async function getIndexPage() {
-    return await getContentPageBySlug(INDEX_PAGE_SLUG);
+  async getIndexPage(): Promise<ContentPageDef | undefined> {
+    return this.getContentPageBySlug(INDEX_PAGE_SLUG);
   }
 
-  const cache: Record<string, ContentPageDef> = {};
-
-  async function readPage(filePath: string): Promise<ContentPageDef> {
-    if (!(filePath in cache)) {
-      cache[filePath] = await transformContentPage(filePath, {
-        contentDir,
-        publicDir,
-      });
+  async readPage(filePath: string): Promise<ContentPageDef> {
+    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,
-  };
 }

package/mobile/src/model/BorderVersion.ts

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

package/mobile/src/services/sitemap/useSitemap.ts

@@ -1,11 +1,11 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import type { HeaderContent } from '../../components/Header/HeaderContent';
-import { projectSettings } from '../../ProjectSettings';
 import type { Fallback } from '../../model/Fallback';
+import { projectSettings } from '../../ProjectSettings';
 import { fetchJSONUnsafe } from '../../utils/fetchJSON';
+import type { SitemapProps } from './SitemapProps';
 
-export function useSitemap(fallback: Fallback = {}): HeaderContent {
-  const { data } = useAsyncData<HeaderContent>(
+export function useSitemap(fallback: Fallback = {}): SitemapProps {
+  const { data } = useAsyncData<SitemapProps>(
     `/wcms-resources/${projectSettings.SITEMAP || 'sitemap'}.json`,
     fetchJSONUnsafe,
     { fallback },

package/mobile/src/ui-kit/BenefitItem/BenefitItem.tsx

@@ -1,21 +1,22 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { IconVersion } from '../../model/IconVersion';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { Img } from '../Img/Img';
 import type { BenefitItemCommonProps, BenefitItemProps } from './BenefitItemProps';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
-
-export interface BenefitGeneralProps extends BenefitItemProps, BenefitItemCommonProps {}
 
 const titleStyleMap: Record<BlockVersion, string> = {
   primary: 'text-primary-text',
   secondary: 'text-white',
 };
+
 const descStyleMap: Record<BlockVersion, string> = {
   primary: 'text-secondary-text',
   secondary: 'text-white',
 };
 
+export interface BenefitGeneralProps extends BenefitItemProps, BenefitItemCommonProps {}
+
 export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
   const {
     className = '',
@@ -31,7 +32,7 @@ export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
   return (
     <div className={`flex gap-5 ${listItemAlign} ${className}`}>
       {icon ? (
-        <div className={renderBenefitIconBgStyle(version, benefitsVersion)}>
+        <div className={getBenefitIconBgStyle(version, benefitsVersion)}>
           <Img className="w-6 h-6" image={getIconWithVersion(icon, calcVersion)} asSVG />
         </div>
       ) : null}
@@ -45,7 +46,7 @@ export const BenefitItem = JSX<BenefitGeneralProps>((props) => {
   );
 });
 
-function renderBenefitIconBgStyle(version: BlockVersion, benefitsVersion: IconVersion) {
+function getBenefitIconBgStyle(version: BlockVersion, benefitsVersion: IconVersion) {
   let bgColorStyle = 'bg-primary-main text-black';
 
   if (version === 'secondary') {

package/mobile/src/ui-kit/Breadcrumb.tsx

@@ -7,15 +7,12 @@ export interface BreadcrumbProps extends LinkProps {
 }
 
 export const Breadcrumb = JSX<BreadcrumbProps>(
-  ({ text, href, target, onClick, className = '', children }) => {
-    if (href) {
-      return (
-        <a className={`no-underline ${className}`} href={href} target={target} onClick={onClick}>
-          <span className={className}>{text || children}</span>
-        </a>
-      );
-    } else {
-      return <span className={className}>{text || children}</span>;
-    }
-  },
+  ({ text, href, target, onClick, className = '', children }) =>
+    href ? (
+      <a className={`no-underline ${className}`} href={href} target={target} onClick={onClick}>
+        <span className={className}>{text || children}</span>
+      </a>
+    ) : (
+      <span className={className}>{text || children}</span>
+    ),
 );

package/mobile/src/ui-kit/CurrencyInput/CurrencyInput.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { clamp } from '../../utils/clamp';
-import { adjustValue, localNumberFormat } from './adjustValue ';
+import { adjustValue, localNumberFormat } from './adjustValue';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { Input } from '../Input/Input';
 import type { CurrencyInputProps } from './CurrencyInputProps';

package/mobile/src/ui-kit/Tags/Tags.tsx

@@ -10,15 +10,13 @@ export const Tags = JSX<TagsProps>((props) => {
   const { tags, className = '' } = props;
 
   return tags?.length ? (
-    <div className={`flex flex-wrap gap-2 ${className}`}>
-      {tags.map((_, i) => renderTag(_, String(i)))}
-    </div>
+    <div className={`flex flex-wrap gap-2 ${className}`}>{tags.map(renderTag)}</div>
   ) : null;
 });
 
-const renderTag = (tag: string, key: string) => (
+const renderTag = (tag: string, key: number) => (
   <span
-    key={key}
+    key={String(key)}
     className="text-m-light py-2 px-2.5 border-solid border rounded-md border-color-stroke"
   >
     {tag}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.6.24",
+  "version": "0.6.25",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/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/src/components/Blocks.ts

@@ -38,6 +38,7 @@ import { Tabs } from './Tabs/Tabs';
 import { TariffsTable } from './TariffsTable/TariffsTable';
 import { TextBlock } from './TextBlock/TextBlock';
 import { Tile } from './Tile/Tile';
+import { InvestmentGallery } from './InvestmentGallery/InvestmentGallery';
 
 export const Blocks: BlocksRegistry = {
   Accordion,
@@ -79,4 +80,5 @@ export const Blocks: BlocksRegistry = {
   SafeDepositRental,
   Tabs,
   ErrorBlock,
+  InvestmentGallery,
 };

package/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/src/components/ContentPage/normalizeBlock.mobile.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/src/components/ContentPage/normalizeBlock.ts

@@ -4,18 +4,16 @@ import { mapSlot } from './mapSlot';
 
 export function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { mobile, ...rest } = (block || {}) as BlockDef;
+  const { mobile, ...result } = (block || {}) as BlockDef;
 
-  return {
-    ...mapSlot((blocks) => filterBlocks(blocks, blocksRegistry))({ ...rest }),
-  } as S;
+  return mapSlot(filterBlocks(blocksRegistry))({ ...result }) as S;
 }
 
-const filterBlocks = (blocks?: BlockDef[], blocksRegistry?: BlocksRegistry) =>
-  blocks
-    ? blocks
-        .filter((block) => blocksRegistry && (block?.type || '') in blocksRegistry)
-        .map((block) => ({
-          ...normalizeBlock(block, blocksRegistry),
-        }))
-    : [];
+const filterBlocks =
+  (blocksRegistry?: BlocksRegistry) =>
+  (blocks?: BlockDef[]): BlockDef[] =>
+    blocks
+      ? blocks
+          .filter((block) => blocksRegistry && (block?.type || '') in blocksRegistry)
+          .map((block) => normalizeBlock(block, blocksRegistry))
+      : [];