@redneckz/wildless-cms-uni-blocks 0.5.12 → 0.5.14

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

@@ -1,30 +1,40 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/ContentPageDef';
+import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { AccordionContent } from './AccordionContent';
 import { AccordionItem } from './AccordionItem';
+import { AccordionItemsList } from './AccordionItemsList';
 
 export interface AccordionProps extends AccordionContent, UniBlockProps {}
 
 export const Accordion = JSX<AccordionProps>(
-  ({ title, description, accordionItems, context, className = '', bordered }) => {
+  ({ title, description, accordionItems, context, className = '', bordered, ...rest }) => {
     return (
-      <section className={`py-6 px-4 font-sans bg-white text-primary-text ${className}`}>
+      <BlockWrapper
+        context={context}
+        className={`py-6 px-4 font-sans bg-white text-primary-text ${className}`}
+        {...rest}
+      >
         {title ? <Heading headingType="h3" className="mb-2 text-center" title={title} /> : null}
         {description ? <div className="mb-5 text-m-light text-center">{description}</div> : null}
         {accordionItems?.length ? (
-          <ul className="list-none m-0 p-0">
+          <AccordionItemsList>
             {accordionItems.map((item, i) => (
               <AccordionItem
                 key={`AccordionItem_${i}`}
-                {...item}
                 context={context}
                 bordered={bordered}
-              />
+                hasContent={Boolean(item.blocks?.length)}
+                {...item}
+              >
+                {renderBlocksList({ blocks: item.blocks, context, className: '!p-0 mb-5' })}
+              </AccordionItem>
             ))}
-          </ul>
+          </AccordionItemsList>
         ) : null}
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/Accordion/Accordion.tsx

@@ -1,10 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { AlignType } from '../../model/AlignType';
 import type { UniBlockProps } from '../../model/ContentPageDef';
+import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { AccordionContent } from './AccordionContent';
 import { AccordionItem } from './AccordionItem';
+import { AccordionItemsList } from './AccordionItemsList';
 
 const ALIGN_TITLE: Record<AlignType, string> = {
   left: 'text-left',
@@ -40,11 +42,18 @@ export const Accordion = JSX<AccordionProps>(
         ) : null}
         {description ? <div className="mb-2.5 text-l">{description}</div> : null}
         {accordionItems?.length ? (
-          <ul className="list-none m-0 p-0">
+          <AccordionItemsList>
             {accordionItems.map((item, i) => (
-              <AccordionItem key={`AccordionItem${i}`} {...item} context={context} />
+              <AccordionItem
+                key={`AccordionItem${i}`}
+                context={context}
+                hasContent={Boolean(item.blocks?.length)}
+                {...item}
+              >
+                {renderBlocksList({ blocks: item.blocks, context, className: '!p-0 mb-5' })}
+              </AccordionItem>
             ))}
-          </ul>
+          </AccordionItemsList>
         ) : null}
       </BlockWrapper>
     );

package/src/components/Accordion/AccordionContent.ts

@@ -1,12 +1,9 @@
 import type { AlignType } from '../../model/AlignType';
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { Picture } from '../../model/Picture';
 import type { BlockDef } from '../../ui-kit/BlocksList/BlocksListProps';
-import type { HeadlineCommonProps } from '../../model/HeadlineType';
 
-/**
- * @title Элемент списка
- */
 export interface AccordionItemCommonProps {
   /**
    * @title Название
@@ -15,8 +12,6 @@ export interface AccordionItemCommonProps {
   label?: string;
   /** @title Отображать в раскрытом виде */
   isExpanded?: boolean;
-  /** @title Блоки */
-  blocks?: BlockDef[];
   /**
    * @title Отображать/скрывать обводку элемента
    * @default false
@@ -25,6 +20,14 @@ export interface AccordionItemCommonProps {
   labelIcon?: Picture; // TODO: только для мобильной версии
 }
 
+/**
+ * @title Элемент списка
+ */
+export interface AccordionItem extends AccordionItemCommonProps {
+  /** @title Блоки */
+  blocks?: BlockDef[];
+}
+
 /**
  * @title Аккордеон
  */
@@ -36,7 +39,7 @@ export type AccordionContent = HeadlineCommonProps & {
   accordionAlignTitle?: AlignType;
   version?: BlockVersion;
   /** @title Список */
-  accordionItems?: AccordionItemCommonProps[];
+  accordionItems?: AccordionItem[];
   /**
    * @title Отображать/скрывать обводку у элемента списка
    * @default false

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

@@ -1,43 +1,47 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { UniBlockProps } from '../../model/ContentPageDef';
-import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
+import type { Picture } from '../../model/Picture';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
-import type { FoldButtonProps } from '../../ui-kit/Foldable/FoldButtonProps';
+import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import type { IconName } from '../../ui-kit/Icon/IconProps';
 import { Img } from '../../ui-kit/Img/Img';
-import type { AccordionItemCommonProps } from './AccordionContent';
-
-export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockProps {}
+import type { AccordionItemProps } from './AccordionItemProps';
 
 const icons: IconName[] = ['PlusIcon', 'MinusIcon'];
 
 export const AccordionItem = JSX<AccordionItemProps>(
-  ({ label = '', labelIcon, blocks, bordered, context }) => {
-    const foldableBlocks = blocks ? renderBlocksList({ context, blocks, className: '!px-0' }) : [];
-
-    return (
-      <li className={`${borderedLiClass(bordered)} border-solid border-main-divider`}>
-        <Foldable
-          hiddenBlocksNum={foldableBlocks.length}
-          blocks={foldableBlocks}
-          isFoldButtonOnTop
-          containerClassName="flex flex-wrap group-last:last:pb-0"
-          renderFoldButton={(props) => (
-            <FoldButton
-              className={bordered ? '' : 'py-[14px] px-0'}
-              icon={icons[Number(props.isUnfolded)]}
-              label={label}
-              primaryIcon={labelIcon}
-              hasContent={Boolean(blocks?.length)}
-              onClick={props.onToggle}
-            />
-          )}
-        />
-      </li>
-    );
-  },
+  ({ label = '', labelIcon, bordered, children, hasContent = true }) => (
+    <li className={`${borderedLiClass(bordered)} border-solid border-main-divider`}>
+      <Foldable
+        isFoldButtonOnTop={true}
+        renderFoldableSection={({ isUnfolded }) => (
+          <FoldableSection className="flex flex-wrap group-last:last:pb-0" isUnfolded={isUnfolded}>
+            {children}
+          </FoldableSection>
+        )}
+        renderFoldButton={({ isUnfolded, onToggle }) => (
+          <FoldButton
+            className={bordered ? '' : 'py-[14px] px-0'}
+            label={label}
+            icon={icons[Number(isUnfolded)]}
+            primaryIcon={labelIcon}
+            hasContent={hasContent}
+            onClick={onToggle}
+          />
+        )}
+      />
+    </li>
+  ),
 );
 
+interface FoldButtonProps {
+  className?: string;
+  label: string;
+  icon: IconName;
+  primaryIcon?: Picture;
+  hasContent: boolean;
+  onClick?: () => void;
+}
+
 const FoldButton = JSX<FoldButtonProps>(
   ({ className, hasContent, icon, label, primaryIcon, onClick }) => (
     <button

package/src/components/Accordion/AccordionItem.tsx

@@ -1,42 +1,43 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { UniBlockProps } from '../../model/ContentPageDef';
-import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
-import type { FoldButtonProps } from '../../ui-kit/Foldable/FoldButtonProps';
+import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import type { IconName } from '../../ui-kit/Icon/IconProps';
 import { Img } from '../../ui-kit/Img/Img';
-import type { AccordionItemCommonProps } from './AccordionContent';
-
-export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockProps {}
+import type { AccordionItemProps } from './AccordionItemProps';
 
 const icons: IconName[] = ['PlusIcon', 'MinusIcon'];
 
-export const AccordionItem = JSX<AccordionItemProps>(({ label = '', blocks, context }) => {
-  const foldableBlocks = blocks
-    ? renderBlocksList({ context, blocks, className: '!p-0 mb-5' })
-    : [];
-
-  return (
+export const AccordionItem = JSX<AccordionItemProps>(
+  ({ label = '', children, hasContent = true }) => (
     <li className="border-0 border-b border-solid border-main-divider last:border-b-0">
       <Foldable
-        hiddenBlocksNum={foldableBlocks.length}
-        blocks={foldableBlocks}
-        isFoldButtonOnTop
-        containerClassName="grid grid-cols-12"
-        renderFoldButton={(props) => (
+        isFoldButtonOnTop={true}
+        renderFoldableSection={({ isUnfolded }) => (
+          <FoldableSection className="grid grid-cols-12" isUnfolded={isUnfolded}>
+            {children}
+          </FoldableSection>
+        )}
+        renderFoldButton={({ isUnfolded, onToggle }) => (
           <FoldButton
-            icon={icons[Number(props.isUnfolded)]}
             label={label}
-            hasContent={Boolean(blocks?.length)}
-            onClick={props.onToggle}
+            icon={icons[Number(isUnfolded)]}
+            hasContent={hasContent}
+            onClick={onToggle}
           />
         )}
       />
     </li>
-  );
-});
+  ),
+);
+
+interface FoldButtonProps {
+  label: string;
+  icon: IconName;
+  hasContent: boolean;
+  onClick?: () => void;
+}
 
-const FoldButton = JSX<FoldButtonProps>(({ icon, label, hasContent, onClick }) => (
+const FoldButton = JSX<FoldButtonProps>(({ label, icon, hasContent, onClick }) => (
   <button
     className={`border-none bg-transparent px-0 pt-5 pb-3.5 flex justify-between text-left w-full font-sans text-h6 group cursor-pointer ${
       hasContent ? 'group cursor-pointer' : ''

package/src/components/Accordion/AccordionItemProps.ts

@@ -0,0 +1,6 @@
+import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { AccordionItemCommonProps } from './AccordionContent';
+
+export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockProps {
+  hasContent?: boolean;
+}

package/src/components/Accordion/AccordionItemsList.tsx

@@ -0,0 +1,5 @@
+import { JSX } from '@redneckz/uni-jsx';
+
+export const AccordionItemsList = JSX(({ children }) => (
+  <ul className="list-none m-0 p-0">{children}</ul>
+));

package/src/components/Blocks.ts

@@ -14,11 +14,13 @@ import { GracePeriod } from './GracePeriod/GracePeriod';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
 import { InsuranceAmountBlock } from './InsuranceAmountBlock/InsuranceAmountBlock';
+import { InvestmentInfo } from './InvestmentInfo/InvestmentInfo';
 import { LinkDocs } from './LinkDocs/LinkDocs';
 import { MiniGallery } from './MiniGallery/MiniGallery';
 import { MobileAppTile } from './MobileAppTile/MobileAppTile';
 import { OfficeServicesBlock } from './OfficeServicesBlock/OfficeServicesBlock';
 import { OtherProducts } from './OtherProducts/OtherProducts';
+import { OtherProductsItem } from './OtherProductsItem/OtherProductsItem';
 import { PictureText } from './PictureText/PictureText';
 import { Placeholder } from './Placeholder/Placeholder';
 import { ProductBlock } from './ProductBlock/ProductBlock';
@@ -48,6 +50,7 @@ export const Blocks = {
   Header,
   Headline,
   InsuranceAmountBlock,
+  InvestmentInfo,
   LinkDocs,
   MiniGallery,
   MobileAppTile,
@@ -57,6 +60,7 @@ export const Blocks = {
   ProductTile,
   PromoTile,
   OtherProducts,
+  OtherProductsItem,
   Recommendation,
   StepsBlock,
   TariffsTable,

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

@@ -1,13 +1,11 @@
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { BlockDef } from '../../model/ContentPageDef';
-import { isBlockInRegistry } from './isBlockInRegistry';
 import { normalizeBlock } from './normalizeBlock';
 
 export const filterBlocks = (blocks: BlockDef[], blocksRegistry: BlocksRegistry) =>
   blocks
     ?.filter(
       (block) =>
-        isBlockInRegistry(block?.type || block?.mobile?.type, blocksRegistry) &&
-        !block.mobile?.hidden,
+        (block?.type || block?.mobile?.type || '') in blocksRegistry && !block.mobile?.hidden,
     )
     .map(normalizeBlock);

package/src/components/ContentPage/filterBlocks.ts

@@ -1,7 +1,6 @@
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { BlockDef } from '../../model/ContentPageDef';
-import { isBlockInRegistry } from './isBlockInRegistry';
 import { normalizeBlock } from './normalizeBlock';
 
 export const filterBlocks = (blocks: BlockDef[], blocksRegistry: BlocksRegistry) =>
-  blocks?.filter((block) => isBlockInRegistry(block?.type, blocksRegistry)).map(normalizeBlock);
+  blocks?.filter((block) => (block?.type || '') in blocksRegistry).map(normalizeBlock);

package/src/components/ContentPage/renderBlock.tsx

@@ -1,6 +1,7 @@
-import { BlockAncestors, BlockDecorator, DEFAULT_SLOT_NAME } from '../../model/BlockDecorator';
+import { BlockAncestors, BlockDecorator, DEFAULT_ANCESTORS } 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';
 
@@ -12,13 +13,15 @@ interface RenderBlockOptions {
   context: ContentPageContext;
 }
 
+const defaultChildRenderer = (_: VNode) => _;
+
 export function renderBlock(
   block: BlockDef,
   options: RenderBlockOptions,
-  ancestors: BlockAncestors = [DEFAULT_SLOT_NAME], // Recursion context
+  ancestors: BlockAncestors = DEFAULT_ANCESTORS, // Recursion context
 ) {
   const { key, page, blockDecorator, blocksRegistry, context } = options;
-  const { type } = block;
+  const { type, blocks: childBlocks } = block;
 
   if (!(type && type in blocksRegistry)) {
     console.warn(`No block with "${type}" is registered`);
@@ -26,6 +29,14 @@ 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;
+
   return blockDecorator(
     {
       blockClassName: `scroll-mt-12 ${style2className(block.style)}`, // TODO scroll-mt-12 ? here?
@@ -33,21 +44,15 @@ export function renderBlock(
       ancestors,
       // Adjusted by decorator block and blockClassName
       render: ({ block: adjustedBlock, blockClassName: adjustedBlockClassName }) => {
-        const { version, content, anchor, labels, blocks: childBlocks } = adjustedBlock;
-
-        const children = childBlocks
-          ? childBlocks.map((_, j) =>
-              renderBlock(_, { ...options, key: `${options.key}-${j}` }, [...ancestors, block]),
-            )
-          : null;
+        const { version, anchor, labels, content } = adjustedBlock;
 
         return BlockComponent ? (
           <BlockComponent
             key={key}
             className={adjustedBlockClassName}
-            version={version}
             context={context}
             page={page}
+            version={version}
             anchor={anchor}
             labels={labels}
             {...content}

package/src/components/ExchangeRateTile/ExchangeRateTile.ui.json

@@ -1 +1,8 @@
-{}
+{
+  "content": {},
+  "style": {
+    "ui:options": {
+      "minCols": 6
+    }
+  }
+}

package/src/components/Footer/Footer.mobile.tsx

@@ -1,6 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/ContentPageDef';
-import { Accordion } from '../Accordion/Accordion';
+import type { Fallback } from '../../model/Fallback';
+import { useSitemap } from '../../services/sitemap/useSitemap';
+import { Button } from '../../ui-kit/Button/Button';
+import { Img } from '../../ui-kit/Img/Img';
+import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
+import { AccordionItem } from '../Accordion/AccordionItem';
+import { AccordionItemsList } from '../Accordion/AccordionItemsList';
+import { LinkList } from '../LinkList/LinkList';
 import { MobileAppTile } from '../MobileAppTile/MobileAppTile';
 import { Contacts } from './Contacts';
 import type { FooterContent, SubMenuItem } from './FooterContent';
@@ -8,13 +15,6 @@ import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
 
-import { useSitemap } from '../../services/sitemap/useSitemap';
-import type { Fallback } from '../../model/Fallback';
-import { Button } from '../../ui-kit/Button/Button';
-import { Img } from '../../ui-kit/Img/Img';
-import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
-import { getAccordionItems } from '../../utils/getAccordionItems';
-
 export interface FooterProps extends FooterContent, UniBlockProps {}
 
 export const Footer = JSX<FooterProps>(
@@ -35,11 +35,13 @@ export const Footer = JSX<FooterProps>(
     return (
       <footer className={`font-sans px-4 py-[26px] bg-white ${className}`}>
         <Contacts className="overflow-hidden" items={contacts} context={context} hasButton />
-        <Accordion
-          context={context}
-          className="!p-0 mb-4"
-          accordionItems={getAccordionItems(sitemap.topItems)}
-        />
+        <AccordionItemsList>
+          {sitemap.topItems?.map((item, i) => (
+            <AccordionItem key={String(i)} context={context} label={item.text}>
+              <LinkList context={context} documents={item.items} />
+            </AccordionItem>
+          ))}
+        </AccordionItemsList>
         <div>{dispositions?.map(renderSubMenuItem)}</div>
         <MobileAppTile
           context={context}

package/src/components/GracePeriod/GracePeriod.ui.json

@@ -11,5 +11,10 @@
         }
       }
     }
+  },
+  "style": {
+    "ui:options": {
+      "minCols": 6
+    }
   }
 }

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

@@ -2,15 +2,16 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useLink } from '../../hooks/useLink';
 import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { Fallback } from '../../model/Fallback';
 import { findActiveSubItem } from '../../services/sitemap/findActiveSubItem';
 import { isTopItemActive } from '../../services/sitemap/isTopItemActive';
 import { mergeTopItems } from '../../services/sitemap/mergeTopItems';
 import { useSitemap } from '../../services/sitemap/useSitemap';
-import type { Fallback } from '../../model/Fallback';
 import { HeaderItem } from '../../ui-kit/HeaderItem/HeaderItem';
 import type { TopItemProps } from '../../ui-kit/TopItem/TopItem';
-import { getAccordionItems } from '../../utils/getAccordionItems';
-import { Accordion } from '../Accordion/Accordion';
+import { AccordionItem } from '../Accordion/AccordionItem';
+import { AccordionItemsList } from '../Accordion/AccordionItemsList';
+import { LinkList } from '../LinkList/LinkList';
 import { HeaderBurger } from './HeaderBurger';
 import type { HeaderContent } from './HeaderContent';
 import { HeaderTop } from './HeaderTop';
@@ -19,17 +20,19 @@ export interface HeaderProps extends HeaderContent, UniBlockProps {}
 
 export const Header = JSX<HeaderProps>(
   ({ className = '', defaultLocation, bgColor = 'bg-white', context, topItems, page }) => {
+    const { handlerDecorator } = context;
     const router = context.useRouter();
+
     const fallback: Fallback | undefined = page?.fallback;
     const sitemap = useSitemap(fallback);
-    const dispositions = sitemap?.dispositions;
-    const { handlerDecorator } = context;
 
     const mergedItems = mergeTopItems(sitemap.topItems, topItems);
     const activeTopItem = mergedItems.find(isTopItemActive(router));
     const subItems = activeTopItem?.items;
     const activeSubItem = findActiveSubItem(router)(subItems);
+
     const [burgerMenuShow, setBurgerMenuShow] = useState(false);
+
     const toggleBurgerMenu = () => setBurgerMenuShow(!burgerMenuShow);
 
     return (
@@ -55,14 +58,16 @@ export const Header = JSX<HeaderProps>(
           <HeaderBurger
             context={context}
             onClick={toggleBurgerMenu}
-            burgerSubMenu={dispositions}
+            burgerSubMenu={sitemap?.dispositions}
             defaultLocation={defaultLocation}
           >
-            <Accordion
-              context={context}
-              accordionItems={getAccordionItems(sitemap.topItems)}
-              className="!p-0 mb-4"
-            />
+            <AccordionItemsList>
+              {sitemap.topItems?.map((item, i) => (
+                <AccordionItem key={String(i)} context={context} label={item.text}>
+                  <LinkList context={context} documents={item.items} />
+                </AccordionItem>
+              ))}
+            </AccordionItemsList>
           </HeaderBurger>
         ) : null}
       </header>

package/src/components/InvestmentInfo/InvestmentInfo.example.json

@@ -0,0 +1,48 @@
+{
+  "items": ["Пункт 1", "Пункт 2", "Пункт 3"],
+  "investmentZeroColumn": {
+    "title": "Название 1"
+  },
+  "investmentColumns": [
+    {
+      "title": "Название 2",
+      "cells": [
+        {
+          "text": "Ячейка 2-1",
+          "cellColor": "green-dark",
+          "cellSize": "S"
+        }
+      ]
+    },
+    {
+      "title": "Название 3",
+      "cells": [
+        {
+          "text": "Ячейка 3-1",
+          "cellColor": "green-dark",
+          "cellSize": "S"
+        }
+      ]
+    },
+    {
+      "title": "Название 4",
+      "cells": [
+        {
+          "text": "Ячейка 4-1",
+          "cellColor": "green-dark",
+          "cellSize": "L"
+        }
+      ]
+    },
+    {
+      "title": "Название 5",
+      "cells": [
+        {
+          "text": "Ячейка 5-1",
+          "cellColor": "green-dark",
+          "cellSize": "XL"
+        }
+      ]
+    }
+  ]
+}