@redneckz/wildless-cms-uni-blocks 0.3.18 → 0.3.21

package/mobile/src/ui-kit/BlocksList/BlocksListProps.ts

@@ -0,0 +1,106 @@
+import type { GalleryContent } from '../../components/Gallery/GalleryContent';
+import type { HeadlineContent } from '../../components/Headline/HeadlineContent';
+import type { LinkDocsContent } from '../../components/LinkDocs/LinkDocsContent';
+import type { MiniGalleryContent } from '../../components/MiniGallery/MiniGalleryContent';
+import type { PictureTextContent } from '../../components/PictureText/PictureTextContent';
+import type { ProductBlockContent } from '../../components/ProductBlock/ProductBlockContent';
+import type { ProductTileContent } from '../../components/ProductTile/ProductTileContent';
+import type { TextBlockContent } from '../../components/TextBlock/TextBlockContent';
+import type { TileContent } from '../../components/Tile/TileContent';
+import type { LinkListContent } from '../../components/LinkList/LinkListContent';
+
+/**
+ * @title Количество колонок
+ * @enumNames ["1 колонка", "2 колонки"]
+ */
+export type ColumnsCount = 1 | 2;
+
+/**
+ * @title Тип блока
+ */
+export type BlockDefType =
+  | 'Headline'
+  | 'LinkDocs'
+  | 'TextBlock'
+  | 'PictureText'
+  | 'Tile'
+  | 'ProductTile'
+  | 'ProductBlock'
+  | 'Gallery'
+  | 'MiniGallery'
+  | 'LinkList';
+
+interface BaseBlockDef {
+  blockListType: BlockDefType;
+}
+
+/**
+ * @title Заголовок
+ */
+export type HeadlineBlockListDef = HeadlineContent & BaseBlockDef;
+
+/**
+ * @title Список документов
+ */
+export type LinkDocsBlockListDef = LinkDocsContent & BaseBlockDef;
+
+/**
+ * @title Текстовый блок
+ */
+export type TextBlockBlockListDef = TextBlockContent & BaseBlockDef;
+
+/**
+ * @title Картинка с текстом
+ */
+export type PictureTextBlockListDef = PictureTextContent & BaseBlockDef;
+
+/**
+ * @title Продуктовый блок
+ */
+export type ProductBlockBlockListDef = ProductBlockContent & BaseBlockDef;
+
+/**
+ * @title Плитка
+ */
+export type TileBlockListDef = TileContent & BaseBlockDef;
+
+/**
+ * @title Продуктовая плитка
+ */
+export type ProductTileBlockListDef = ProductTileContent & BaseBlockDef;
+
+/**
+ * @title Галлерея
+ */
+export type GalleryBlockListDef = GalleryContent & BaseBlockDef;
+
+/**
+ * @title Мини-галлерея
+ */
+export type MiniGalleryBlockListDef = MiniGalleryContent & BaseBlockDef;
+
+/**
+ * @title Список ссылок
+ */
+export type LinkListBlockListDef = LinkListContent & BaseBlockDef;
+
+/**
+ * @title Выберите блок
+ */
+export type EmptyOption = null;
+
+/**
+ * @title Содержимое блока
+ */
+export type BlockDef =
+  | EmptyOption
+  | HeadlineBlockListDef
+  | LinkDocsBlockListDef
+  | TextBlockBlockListDef
+  | PictureTextBlockListDef
+  | ProductBlockBlockListDef
+  | TileBlockListDef
+  | ProductTileBlockListDef
+  | GalleryBlockListDef
+  | MiniGalleryBlockListDef
+  | LinkListBlockListDef;

package/mobile/src/ui-kit/BlocksList/EmbeddableBlocks.tsx

@@ -0,0 +1,23 @@
+import { Headline } from '../../components/Headline/Headline';
+import { LinkDocs } from '../../components/LinkDocs/LinkDocs';
+import { PictureText } from '../../components/PictureText/PictureText';
+import { ProductBlock } from '../../components/ProductBlock/ProductBlock';
+import { TextBlock } from '../../components/TextBlock/TextBlock';
+import { Tile } from '../../components/Tile/Tile';
+import { ProductTile } from '../../components/ProductTile/ProductTile';
+import { Gallery } from '../../components/Gallery/Gallery';
+import { MiniGallery } from '../../components/MiniGallery/MiniGallery';
+import { LinkList } from '../../components/LinkList/LinkList';
+
+export const EmbeddableBlocks = {
+  Headline,
+  LinkDocs,
+  TextBlock,
+  PictureText,
+  ProductBlock,
+  Tile,
+  ProductTile,
+  Gallery,
+  MiniGallery,
+  LinkList,
+};

package/mobile/src/ui-kit/BlocksList/renderBlocksList.tsx

@@ -0,0 +1,30 @@
+import type { JSXBlock } from '../../components/ContentPage/ContentPage';
+import type { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
+import type { BlockDef, ColumnsCount } from './BlocksListProps';
+import { EmbeddableBlocks } from './EmbeddableBlocks';
+
+type EmbeddableBlocksProps = {
+  blocks?: BlockDef[];
+  context: ContentPageContext;
+  columns?: ColumnsCount;
+  className?: string;
+};
+
+export const renderBlocksList = ({ blocks, context, className, columns }: EmbeddableBlocksProps) =>
+  blocks?.length ? blocks.map(renderBlock({ context, className, columns })) : null;
+
+export const renderBlock =
+  ({ context, columns, className }: EmbeddableBlocksProps) =>
+  (block: BlockDef, i: number) => {
+    const type = block?.blockListType;
+    if (!type || !(type in EmbeddableBlocks)) {
+      return null;
+    }
+    const columnsCountClass = columns === 2 ? 'w-1/2' : '';
+    const EmbeddedBlock: JSXBlock = EmbeddableBlocks[type];
+    return (
+      <div className={`${className} ${columnsCountClass}`} key={`block_${i}`}>
+        <EmbeddedBlock context={context} {...block} className="!p-0" />
+      </div>
+    );
+  };

package/package.json

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

package/src/common.css

@@ -22,26 +22,6 @@
 }
 /* Ecosystem own | Yellow */
 [data-theme='eo'] {
-  --color-primary-main: 221, 182, 61;
-  --color-primary-hover: 187, 151, 39;
-  --color-primary-active: 126, 99, 12;
-  --color-secondary-hover: 241, 236, 221;
-  --color-secondary-active: 229, 222, 199;
-  --color-gradient-from: 141, 189, 76; /* TODO: change color to theme eo */
-  --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
-}
-
-[data-theme='eo2'] {
-  --color-primary-main: 255, 204, 0;
-  --color-primary-hover: 187, 151, 39;
-  --color-primary-active: 126, 99, 12;
-  --color-secondary-hover: 241, 236, 221;
-  --color-secondary-active: 229, 222, 199;
-  --color-gradient-from: 141, 189, 76; /* TODO: change color to theme eo */
-  --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
-}
-
-[data-theme='eo3'] {
   --color-primary-main: 225, 186, 30;
   --color-primary-hover: 187, 151, 39;
   --color-primary-active: 126, 99, 12;
@@ -51,16 +31,6 @@
   --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
 }
 
-[data-theme='eo4'] {
-  --color-primary-main: 233, 191, 23;
-  --color-primary-hover: 187, 151, 39;
-  --color-primary-active: 126, 99, 12;
-  --color-secondary-hover: 241, 236, 221;
-  --color-secondary-active: 229, 222, 199;
-  --color-gradient-from: 141, 189, 76; /* TODO: change color to theme eo */
-  --color-gradient-to: 69, 172, 69; /* TODO: change color to theme eo */
-}
-
 @tailwind components;
 @tailwind utilities;
 

package/src/components/Accordion/Accordion.example.json

@@ -5,12 +5,12 @@
       "label": "Аккордеон 1",
       "blocks": [
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок",
           "description": "Описание текстового блока"
         },
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
           "description": "Описание текстового блока №2"
         }
@@ -20,12 +20,12 @@
       "label": "Аккордеон 2",
       "blocks": [
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок",
           "description": "Описание текстового блока"
         },
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
           "description": "Описание текстового блока №2"
         }
@@ -35,12 +35,12 @@
       "label": "Аккордеон 3",
       "blocks": [
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок",
           "description": "Описание текстового блока"
         },
         {
-          "accordionBlockType": "TextBlock",
+          "blockListType": "TextBlock",
           "title": "Текстовый блок №2",
           "description": "Описание текстового блока №2"
         }

package/src/components/Accordion/Accordion.fixture.mobile.tsx

@@ -6,29 +6,29 @@ import { TEXT_BLOCK } from '../TextBlock/TextBlock.fixture';
 import type { AccordionProps } from './Accordion';
 import { Accordion } from './Accordion';
 import type {
-  HeadlineAccordionBlockDef,
-  LinkDocsAccordionBlockDef,
-  PictureTextAccordionBlockDef,
-  TextBlockAccordionBlockDef,
-} from './AccordionContent';
+  HeadlineBlockListDef,
+  LinkDocsBlockListDef,
+  PictureTextBlockListDef,
+  TextBlockBlockListDef,
+} from '../../ui-kit/BlocksList/BlocksListProps';
 
-const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockAccordionBlockDef = {
-  accordionBlockType: 'TextBlock',
+const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockBlockListDef = {
+  blockListType: 'TextBlock',
   ...TEXT_BLOCK,
 };
 
-const HEADLINE_ACCORDION_BLOCK: HeadlineAccordionBlockDef = {
-  accordionBlockType: 'Headline',
+const HEADLINE_ACCORDION_BLOCK: HeadlineBlockListDef = {
+  blockListType: 'Headline',
   ...HEADLINE,
 };
 
-const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextAccordionBlockDef = {
-  accordionBlockType: 'PictureText',
+const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextBlockListDef = {
+  blockListType: 'PictureText',
   ...PICTURE_TEXT,
 };
 
-const LINK_DOCS_ACCORDION_BLOCK: LinkDocsAccordionBlockDef = {
-  accordionBlockType: 'LinkDocs',
+const LINK_DOCS_ACCORDION_BLOCK: LinkDocsBlockListDef = {
+  blockListType: 'LinkDocs',
   ...linkDocsContentExample,
   title: '',
 };

package/src/components/Accordion/Accordion.fixture.tsx

@@ -4,77 +4,60 @@ import { HEADLINE } from '../Headline/Headline.fixture';
 import { linkDocsContentExample } from '../LinkDocs/linkDocsContentExample';
 import { defaultProps as MINI_GALLERY } from '../MiniGallery/MiniGallery.fixture';
 import { PICTURE_TEXT } from '../PictureText/PictureText.fixture';
-import { PRODUCT_BLOCK } from '../ProductBlock/ProductBlock.fixture';
-import { PRODUCT_TILE, PRODUCT_PENSION_TILE } from '../ProductTile/ProductTile.fixture';
+import { PRODUCT_TILE } from '../ProductTile/ProductTile.fixture';
 import { TEXT_BLOCK } from '../TextBlock/TextBlock.fixture';
-import { TILE, TILE_PREMIUM } from '../Tile/Tile.fixture';
+import { TILE } from '../Tile/Tile.fixture';
 import type { AccordionProps } from './Accordion';
 import { Accordion } from './Accordion';
 import type {
-  GalleryAccordionBlockDef,
-  HeadlineAccordionBlockDef,
-  LinkDocsAccordionBlockDef,
-  MiniGalleryAccordionBlockDef,
-  PictureTextAccordionBlockDef,
-  ProductBlockAccordionBlockDef,
-  ProductTileAccordionBlockDef,
-  TextBlockAccordionBlockDef,
-  TileAccordionBlockDef,
-} from './AccordionContent';
-
-const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockAccordionBlockDef = {
-  accordionBlockType: 'TextBlock',
+  GalleryBlockListDef,
+  HeadlineBlockListDef,
+  LinkDocsBlockListDef,
+  MiniGalleryBlockListDef,
+  PictureTextBlockListDef,
+  ProductTileBlockListDef,
+  TextBlockBlockListDef,
+  TileBlockListDef,
+} from '../../ui-kit/BlocksList/BlocksListProps';
+
+const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockBlockListDef = {
+  blockListType: 'TextBlock',
   ...TEXT_BLOCK,
 };
 
-const HEADLINE_ACCORDION_BLOCK: HeadlineAccordionBlockDef = {
-  accordionBlockType: 'Headline',
+const HEADLINE_ACCORDION_BLOCK: HeadlineBlockListDef = {
+  blockListType: 'Headline',
   ...HEADLINE,
 };
 
-const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextAccordionBlockDef = {
-  accordionBlockType: 'PictureText',
+const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextBlockListDef = {
+  blockListType: 'PictureText',
   ...PICTURE_TEXT,
 };
 
-const PRODUCT_BLOCK_ACCORDION_BLOCK: ProductBlockAccordionBlockDef = {
-  accordionBlockType: 'ProductBlock',
-  ...PRODUCT_BLOCK,
-};
-
-const LINK_DOCS_ACCORDION_BLOCK: LinkDocsAccordionBlockDef = {
-  accordionBlockType: 'LinkDocs',
+const LINK_DOCS_ACCORDION_BLOCK: LinkDocsBlockListDef = {
+  blockListType: 'LinkDocs',
   ...linkDocsContentExample,
   title: '',
 };
 
-const TILES_ACCORDION_BLOCK: TileAccordionBlockDef = {
-  accordionBlockType: 'Tile',
+const TILES_ACCORDION_BLOCK: TileBlockListDef = {
+  blockListType: 'Tile',
   ...TILE,
 };
 
-const TILES_PREMIUM_ACCORDION_BLOCK: TileAccordionBlockDef = {
-  accordionBlockType: 'Tile',
-  ...TILE_PREMIUM,
-};
-
-const PRODUCT_TILES_ACCORDION_BLOCK: ProductTileAccordionBlockDef = {
-  accordionBlockType: 'ProductTile',
+const PRODUCT_TILES_ACCORDION_BLOCK: ProductTileBlockListDef = {
+  blockListType: 'ProductTile',
   ...PRODUCT_TILE,
 };
 
-const PRODUCT_PENSION_TILES__ACCORDION_BLOCK: ProductTileAccordionBlockDef = {
-  accordionBlockType: 'ProductTile',
-  ...PRODUCT_PENSION_TILE,
-};
-
-const GALLERY_ACCORDION_BLOCK: GalleryAccordionBlockDef = {
-  accordionBlockType: 'Gallery',
+const GALLERY_ACCORDION_BLOCK: GalleryBlockListDef = {
+  blockListType: 'Gallery',
   ...GALLERY,
 };
 
-const MINI_GALLERY_ACCORDION_BLOCK: MiniGalleryAccordionBlockDef = {
-  accordionBlockType: 'MiniGallery',
+const MINI_GALLERY_ACCORDION_BLOCK: MiniGalleryBlockListDef = {
+  blockListType: 'MiniGallery',
   ...MINI_GALLERY,
 };
 
@@ -116,58 +99,10 @@ const propsBlock: AccordionProps = {
   ],
 };
 
-const propsTwoColumns: AccordionProps = {
-  context,
-  accordionItems: [
-    {
-      label: 'Другие продукты Россельхозбанка 1',
-      blocks: [
-        TILES_PREMIUM_ACCORDION_BLOCK,
-        TILES_PREMIUM_ACCORDION_BLOCK,
-        TILES_ACCORDION_BLOCK,
-        TILES_ACCORDION_BLOCK,
-      ],
-      columns: 2,
-    },
-    {
-      label: 'Другие продукты Россельхозбанка 2',
-      blocks: [
-        PRODUCT_TILES_ACCORDION_BLOCK,
-        PRODUCT_TILES_ACCORDION_BLOCK,
-        PRODUCT_PENSION_TILES__ACCORDION_BLOCK,
-        PRODUCT_PENSION_TILES__ACCORDION_BLOCK,
-      ],
-      columns: 2,
-    },
-    {
-      label: 'Другие продукты Россельхозбанка 3',
-      blocks: [PRODUCT_BLOCK_ACCORDION_BLOCK, PRODUCT_BLOCK_ACCORDION_BLOCK],
-      columns: 2,
-    },
-
-    {
-      label: 'Другие продукты Россельхозбанка 4',
-      blocks: [
-        TEXT_BLOCK_ACCORDION_BLOCK,
-        TEXT_BLOCK_ACCORDION_BLOCK,
-        TEXT_BLOCK_ACCORDION_BLOCK,
-        TEXT_BLOCK_ACCORDION_BLOCK,
-      ],
-      columns: 2,
-    },
-  ],
-};
-
 export default {
   default: (
     <div className="container grid grid-cols-12">
       <Accordion className="col-span-12" {...propsBlock} />
     </div>
   ),
-
-  'two columns': (
-    <div className="container grid grid-cols-12">
-      <Accordion className="col-span-12" {...propsTwoColumns} />
-    </div>
-  ),
 };

package/src/components/Accordion/AccordionContent.ts

@@ -1,109 +1,4 @@
-import type { GalleryContent } from '../Gallery/GalleryContent';
-import type { HeadlineContent } from '../Headline/HeadlineContent';
-import type { LinkDocsContent } from '../LinkDocs/LinkDocsContent';
-import type { MiniGalleryContent } from '../MiniGallery/MiniGalleryContent';
-import type { PictureTextContent } from '../PictureText/PictureTextContent';
-import type { ProductBlockContent } from '../ProductBlock/ProductBlockContent';
-import type { ProductTileContent } from '../ProductTile/ProductTileContent';
-import type { TextBlockContent } from '../TextBlock/TextBlockContent';
-import type { TileContent } from '../Tile/TileContent';
-import type { LinkListContent } from '../LinkList/LinkListContent';
-
-/**
- * @title Тип блока
- */
-export type AccordionBlockType =
-  | 'Headline'
-  | 'LinkDocs'
-  | 'TextBlock'
-  | 'PictureText'
-  | 'Tile'
-  | 'ProductTile'
-  | 'ProductBlock'
-  | 'Gallery'
-  | 'MiniGallery'
-  | 'LinkList';
-
-interface AccordionBlockDef {
-  accordionBlockType: AccordionBlockType;
-}
-
-/**
- * @title Заголовок
- */
-export type HeadlineAccordionBlockDef = HeadlineContent & AccordionBlockDef;
-
-/**
- * @title Список документов
- */
-export type LinkDocsAccordionBlockDef = LinkDocsContent & AccordionBlockDef;
-
-/**
- * @title Текстовый блок
- */
-export type TextBlockAccordionBlockDef = TextBlockContent & AccordionBlockDef;
-
-/**
- * @title Картинка с текстом
- */
-export type PictureTextAccordionBlockDef = PictureTextContent & AccordionBlockDef;
-
-/**
- * @title Продуктовый блок
- */
-export type ProductBlockAccordionBlockDef = ProductBlockContent & AccordionBlockDef;
-
-/**
- * @title Плитка
- */
-export type TileAccordionBlockDef = TileContent & AccordionBlockDef;
-
-/**
- * @title Продуктовая плитка
- */
-export type ProductTileAccordionBlockDef = ProductTileContent & AccordionBlockDef;
-
-/**
- * @title Галлерея
- */
-export type GalleryAccordionBlockDef = GalleryContent & AccordionBlockDef;
-
-/**
- * @title Мини-галлерея
- */
-export type MiniGalleryAccordionBlockDef = MiniGalleryContent & AccordionBlockDef;
-
-/**
- * @title Список ссылок
- */
-export type LinkListAccordionBlockDef = LinkListContent & AccordionBlockDef;
-
-/**
- * @title Выберите блок
- */
-export type EmptyOption = null;
-
-/**
- * @title Содержимое аккордеона
- */
-export type AccordionBlockProps =
-  | EmptyOption
-  | HeadlineAccordionBlockDef
-  | LinkDocsAccordionBlockDef
-  | TextBlockAccordionBlockDef
-  | PictureTextAccordionBlockDef
-  | ProductBlockAccordionBlockDef
-  | TileAccordionBlockDef
-  | ProductTileAccordionBlockDef
-  | GalleryAccordionBlockDef
-  | MiniGalleryAccordionBlockDef
-  | LinkListAccordionBlockDef;
-
-/**
- * @title Количество колонок
- * @enumNames ["1 колонка", "2 колонки"]
- */
-export type ColumnsCount = 1 | 2;
+import type { BlockDef, ColumnsCount } from '../../ui-kit/BlocksList/BlocksListProps';
 
 /**
  * @title Элемент списка
@@ -115,13 +10,12 @@ export interface AccordionItemCommonProps {
    */
   label?: string;
   /** @title Блоки */
-  blocks?: AccordionBlockProps[];
+  blocks?: BlockDef[];
   /**
    * @title Отображать/скрывать обводку элемента
    * @default false
    */
   bordered?: boolean; // TODO: только для мобильной версии
-
   columns?: ColumnsCount;
 }
 

package/src/components/Accordion/AccordionItem.mobile.tsx

@@ -3,12 +3,12 @@ import type { UniBlockProps } from '../../types';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import type { AccordionItemCommonProps } from './AccordionContent';
 import { AccordionItemInner } from './AccordionItemInner';
-import { isActiveHandler } from './utils/isActiveHandler';
+import { useActiveHandler } from './utils/useActiveHandler';
 
 export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockProps {}
 
 export const AccordionItem = JSX<AccordionItemProps>(({ label, blocks, bordered, context }) => {
-  const { hasContent, icon, handleToggle } = isActiveHandler({
+  const { hasContent, icon, handleToggle } = useActiveHandler({
     context,
     blocks,
   });

package/src/components/Accordion/AccordionItem.tsx

@@ -3,12 +3,12 @@ import type { UniBlockProps } from '../../types';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import type { AccordionItemCommonProps } from './AccordionContent';
 import { AccordionItemInner } from './AccordionItemInner';
-import { isActiveHandler } from './utils/isActiveHandler';
+import { useActiveHandler } from './utils/useActiveHandler';
 
 export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockProps {}
 
 export const AccordionItem = JSX<AccordionItemProps>(({ label, blocks, columns, context }) => {
-  const { hasContent, icon, handleToggle } = isActiveHandler({
+  const { hasContent, icon, handleToggle } = useActiveHandler({
     context,
     blocks,
   });

package/src/components/Accordion/AccordionItemInner.mobile.tsx

@@ -1,28 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { JSXBlock } from '../ContentPage/ContentPage';
-import type { ContentPageContext } from '../ContentPage/ContentPageContext';
-import { AccordionBlocks } from './AccordionBlocks';
-import type { AccordionBlockProps } from './AccordionContent';
 import type { AccordionItemProps } from './AccordionItem';
+import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
 
 export const AccordionItemInner = JSX<AccordionItemProps>(({ blocks, context }) => {
+  const className = 'mb-5 last:mb-0 first:mt-2';
+  const columns = 1;
   return (
     <div className="transition-all duration-300 max-h-0 overflow-hidden group-last:last:pb-0">
-      {blocks?.length ? blocks.map(renderBlock(context)) : null}
+      {renderBlocksList({ context, className, columns, blocks })}
     </div>
   );
 });
-
-const renderBlock = (context: ContentPageContext) => (block: AccordionBlockProps, i: number) => {
-  const type = block?.accordionBlockType;
-  if (!type || !(type in AccordionBlocks)) {
-    return null;
-  }
-
-  const AccordionBlock: JSXBlock = AccordionBlocks[type];
-  return (
-    <div className="mb-5 last:mb-0 first:mt-2" key={`block_${i}`}>
-      <AccordionBlock context={context} {...block} className="!p-0" />
-    </div>
-  );
-};