@redneckz/wildless-cms-uni-blocks 0.5.13 → 0.5.15

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.ui.json

@@ -7,5 +7,10 @@
         }
       }
     }
+  },
+  "style": {
+    "ui:options": {
+      "minCols": 12
+    }
   }
 }

package/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,5 +1,13 @@
-import type { IconProps } from '../../model/Picture';
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { IconProps } from '../../model/Picture';
+/**
+ * @title Количество элементов в строке
+ * @enumNames [
+ *   "Четыре колонки",
+ *   "Пять колонок",
+ *  ]
+ */
+export type ColumnsCount = '4' | '5';
 
 /**
  * @title Бонус и преимущество
@@ -14,4 +22,5 @@ export type BonusBenefitsBlockContent = TitleProps & {
   subtitle?: string;
   /** @title Список бонусов */
   bonusBenefits?: BonusBenefit[];
+  columnsCount?: ColumnsCount;
 };

package/src/components/Calculator/BonusCalculatorForm.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { CommonCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { DEFAULT_REST_MIN_SUM, DEFAULT_TRAVEL_MIN_SUM } from './constants';

package/src/components/Calculator/Calculator.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Img } from '../../ui-kit/Img/Img';

package/src/components/Calculator/CreditCalculatorForm.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { CommonCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
@@ -88,7 +88,8 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
             value={calculatorParams.monthlyPayment}
             postfix="₽"
           />
-          {renderPaymentTypeSelector(context, {
+          {renderPaymentTypeSelector({
+            context,
             items: paymentTypeItems,
             checkedItem: isAnnuity ? ANNUITY : DIFFERENTIAL,
             onChange: (text: string) => toggleIsAnnuity(text === ANNUITY),

package/src/components/Calculator/DepositCalculatorForm.tsx

@@ -2,7 +2,7 @@
 
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { CommonCalculatorProps, DepositCalculatorParams } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
 import {
@@ -78,7 +78,8 @@ export const DepositCalculatorForm = JSX<DepositCalculatorProp>(
           {finallySum ? (
             <CalculatorValueBlock title="Сумма в конце срока" value={finallySum} postfix="₽" />
           ) : null}
-          {renderPaymentTypeSelector(context, {
+          {renderPaymentTypeSelector({
+            context,
             items: depositTypeItems,
             checkedItem: isEveryMonth ? EVERY_MONTH : AT_END_TERM,
             onChange: (text: string) => toggleIsEveryMonth(text === EVERY_MONTH),

package/src/components/Calculator/renderButtonSection.tsx

@@ -1,6 +1,8 @@
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 
-export function renderButtonSection(context, buttons) {
+export function renderButtonSection(context: ContentPageContext, buttons?: ButtonWithIconProps[]) {
   return buttons?.length ? (
     <ButtonSection context={context} buttons={buttons} className="flex flex-col mt-7 gap-2" />
   ) : null;

package/src/components/Calculator/renderCalculatorBlock.tsx

@@ -1,4 +1,4 @@
-import type { JSXBlock } from '../../model/BlocksRegistry';
+import type { JSXBlock } from '../../model/JSXBlock';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { CalculatorBlockDef } from './CalculatorContent';
 import { EmbeddableCalcBlocks, EmbeddableCalcProps } from './EmbeddableCalcBlocks';

package/src/components/Calculator/renderFootnote.tsx

@@ -1,2 +1,2 @@
-export const renderFootnote = (text) =>
+export const renderFootnote = (text?: string) =>
   text ? <p className="text-s-light text-secondary-text mt-7">{text}</p> : null;

package/src/components/Calculator/renderInitialFeeInput.tsx

@@ -9,7 +9,11 @@ interface RenderWantedSumInputParams {
   moneyValue: number;
 }
 
-export function renderInitialFeeInput(title, props: RenderWantedSumInputParams, callback) {
+export function renderInitialFeeInput(
+  props: RenderWantedSumInputParams,
+  title?: string,
+  callback?: (value: number) => void,
+) {
   const { moneyValue } = props;
 
   const minSum = DEFAULT_MIN_SUM;

package/src/components/Calculator/renderMonthsInput.tsx

@@ -9,9 +9,13 @@ interface RenderMonthsInputParams {
   monthsValue: number;
 }
 
-export function renderMonthsInput(title: string, params: RenderMonthsInputParams, callback) {
+export function renderMonthsInput(
+  title: string,
+  params: RenderMonthsInputParams,
+  callback?: (value: number) => void,
+) {
   const { minMonths, maxMonths, monthsValue } = params;
-  const monthText = (month) => {
+  const monthText = (month: number) => {
     const text = Number(month) % 10 === 1 ? 'месяца' : 'месяцев';
 
     return `${month} ${text}`;

package/src/components/Calculator/renderPaymentTypeSelector.tsx

@@ -1,12 +1,14 @@
+import type { RadioButtonItem } from '../../ui-kit/RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroup } from '../../ui-kit/RadioButtonGroup/RadioButtonGroup';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 
-export function renderPaymentTypeSelector(context, { items, checkedItem, onChange }) {
-  return (
-    <RadioButtonGroup
-      context={context}
-      items={items}
-      checkedItem={checkedItem}
-      onChangeCheckedItem={onChange}
-    />
-  );
+interface RenderPaymentTypeSelectorProps {
+  context: ContentPageContext;
+  items: RadioButtonItem[];
+  checkedItem?: string;
+  onChange: (id: string) => void;
+}
+
+export function renderPaymentTypeSelector({ onChange, ...rest }: RenderPaymentTypeSelectorProps) {
+  return <RadioButtonGroup onChangeCheckedItem={onChange} {...rest} />;
 }

package/src/components/Calculator/renderRealEstateValue.tsx

@@ -9,7 +9,11 @@ interface RenderRealEstateValueInputProps {
   moneyValue: number;
 }
 
-export function renderRealEstateValue(title, props: RenderRealEstateValueInputProps, callback) {
+export function renderRealEstateValue(
+  props: RenderRealEstateValueInputProps,
+  title?: string,
+  callback?: (value: number) => void,
+) {
   const { moneyValue } = props;
 
   const minSum = DEFAULT_MIN_SUM;

package/src/components/Calculator/renderWantedSumInput.tsx

@@ -13,7 +13,11 @@ interface RenderWantedSumParams {
   isShowItems?: boolean;
 }
 
-export function renderWantedSumInput(title: string, params: RenderWantedSumParams, callback) {
+export function renderWantedSumInput(
+  title: string,
+  params: RenderWantedSumParams,
+  callback?: (value: number) => void,
+) {
   const { moneyValue, minSum, maxSum, step = DEFAULT_MONEY_STEP, isShowItems = true } = params;
 
   const items = [

package/src/components/CardTransfer/CardTransfer.tsx

@@ -1,14 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
-import type { CardTransferContent } from './CardTransferContent';
+import { useLink } from '../../hooks/useLink';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
-import { Heading } from '../../ui-kit/Heading/Heading';
 import { getDisabledButtonClasses } from '../../ui-kit/Button/getDisabledButtonClasses';
 import { getRegularButtonClasses } from '../../ui-kit/Button/getRegularButtonClasses';
-import { useLink } from '../../hooks/useLink';
+import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
+import { Heading } from '../../ui-kit/Heading/Heading';
 import { getSanitizedValue } from '../../utils/getSanitizedValue';
+import type { CardTransferContent } from './CardTransferContent';
 
 const AMOUNT_KEY = 'amount';
 const FORM_URL = 'https://www.rshb.ru/p2p/';

package/src/components/Catalog/Catalog.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import type { ContentPageContext } from '../ContentPage/ContentPageContext';
@@ -58,7 +58,7 @@ const renderCatalogCard = (context: ContentPageContext) => (card: CatalogCardTyp
 interface RenderNavButtonsProps {
   cardsCount: number;
   activeCardIndex: number;
-  setActiveCardIndex: (number) => void;
+  setActiveCardIndex: (index: number) => void;
 }
 
 const renderNavButtons = ({

package/src/components/Catalog/Catalog.ui.json

@@ -1 +1,11 @@
-{}
+{
+  "content": {
+    "cards": {
+      "items": {
+        "price": {
+          "ui:field": "number"
+        }
+      }
+    }
+  }
+}

package/src/components/Catalog/CatalogCard.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';

package/src/components/ComparisonTable/ComparisonTable.mobile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
 import type { CellData, ComparisonTableContent } from './ComparisonTableContent';

package/src/components/ComparisonTable/ComparisonTable.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { ComparisonTableBody } from './ComparisonTableBody';

package/src/components/ComparisonTable/TableColumn.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { ButtonVersion } from '../../model/ButtonVersion';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../../ui-kit/Button/Button';
 import type { CellData, ColumnHeader } from './ComparisonTableContent';
 import { GRADIENT } from './constants';

package/src/components/ContentPage/ContentPage.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockAncestors, BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
-import type { BlockDef, ContentPageDef, UniBlockProps } from '../../model/ContentPageDef';
+import type { BlockDef, ContentPageDef } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { style2className } from '../../utils/style2className';
 import { LikeControl } from '../LikeControl/LikeControl';
 import type { ContentPageContext } from './ContentPageContext';

package/src/components/ContentPage/renderBlock.tsx

@@ -1,6 +1,7 @@
 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_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,16 @@ 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}
+            ancestors={ancestors}
+            version={version}
             anchor={anchor}
             labels={labels}
             {...content}

package/src/components/ErrorBlock/ErrorBlock.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';

package/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -1,13 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useLink } from '../../hooks/useLink';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../../ui-kit/Button/Button';
-import { renderInput } from './renderInput';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { calculateResult, formatValue } from './calculateResult';
 import { callbackCurrencySelect } from './callbackCurrencySelect';
 import { Currency } from './CurrencyProps';
-import type { UniBlockProps } from '../../model/ContentPageDef';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import { renderInput } from './renderInput';
 
 export interface ExchangeCurrencyItem {
   code?: Currency;

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useExchangeRates } from '../../hooks/useExchangeRates';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { BaseTile } from '../BaseTile/BaseTile';
@@ -30,8 +30,7 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
     return (
       <BlockWrapper
         context={context}
-        className={`bg-white text-primary-text font-sans p-9 box-border min-h-[320px] 
-          ${className}`}
+        className={`bg-white text-primary-text font-sans p-9 box-border min-h-[320px] ${className}`}
         {...rest}
       >
         <BaseTile

package/src/components/Footer/Contacts.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../../ui-kit/Button/Button';
 import type { ContactInfo } from './FooterContent';
 

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { Fallback } from '../../model/Fallback';
+import type { UniBlockProps } from '../../model/JSXBlock';
 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 { AccordionItem } from '../AccordionItem/AccordionItem';
 import { LinkList } from '../LinkList/LinkList';
 import { MobileAppTile } from '../MobileAppTile/MobileAppTile';
 import { Contacts } from './Contacts';

package/src/components/Footer/Footer.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { Fallback } from '../../model/Fallback';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Logo } from '../../ui-kit/Logo/Logo';
 import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';

package/src/components/Footer/FooterLink.ts

@@ -1,4 +1,4 @@
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 
 export interface FooterLink extends UniBlockProps {

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

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { FooterLink } from './FooterLink';
 import { HorizontalNavigationLink } from './HorizontalNavigationLink';
 

package/src/components/Footer/HorizontalNavigation.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { FooterLink } from './FooterLink';
 import { HorizontalNavigationLink } from './HorizontalNavigationLink';
 

package/src/components/Footer/Sitemap.tsx

@@ -1,17 +1,25 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { Fallback } from '../../model/Fallback';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 import { mergeTopItems } from '../../services/sitemap/mergeTopItems';
 import type { TopMenuItem } from '../../services/sitemap/SitemapProps';
 import { useSitemap } from '../../services/sitemap/useSitemap';
-import type { Fallback } from '../../model/Fallback';
+import type { HandlerDecorator, Router } from '../ContentPage/ContentPageContext';
 
 export interface SitemapProps extends UniBlockProps {
   items?: TopMenuItem[];
   fallback?: Fallback;
 }
 
+interface RenderColumnProps {
+  menuItem: TopMenuItem;
+  index: number;
+  router: Router;
+  handlerDecorator?: HandlerDecorator;
+}
+
 export const Sitemap = JSX<SitemapProps>(({ className = '', items, fallback, context }) => {
   const sitemap = useSitemap(fallback);
   const mergedItems = mergeTopItems(sitemap.topItems, items);
@@ -22,13 +30,13 @@ export const Sitemap = JSX<SitemapProps>(({ className = '', items, fallback, con
 
   return (
     <div className={`flex flex-grow items-start justify-between gap-[54px] xl:gap-5 ${className}`}>
-      {mergedItems?.map((_, i) => renderColumn(_, i, linkParams))}
+      {mergedItems?.map((_, i) => renderColumn({ menuItem: _, index: i, ...linkParams }))}
     </div>
   );
 });
 
-const renderColumn = (c: TopMenuItem, index: number, { router, handlerDecorator }) => {
-  const { text, href, items, target } = c;
+const renderColumn = ({ menuItem, index, router, handlerDecorator }: RenderColumnProps) => {
+  const { text, href, items, target } = menuItem;
 
   return (
     <div key={String(index)} className="flex flex-col w-1/5 last:w-1/4 gap-3.5">

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

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 import { MediaButton } from './MediaButton';
 

package/src/components/Footer/SocialMedia.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
 import { MediaButton } from './MediaButton';
 

package/src/components/Gallery/Gallery.mobile.tsx

@@ -3,10 +3,12 @@ import type { BlockVersion } from '../../model/BlockVersion';
 import { VersionStyleMap } from '../../model/BlockVersion';
 import type { ListOrientation } from '../../model/ListOrientation';
 import { Button } from '../../ui-kit/Button/Button';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { ListItemVersion } from '../../ui-kit/List/ListProps';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 import type { GalleryCardProps, GalleryItemProps } from './GalleryContent';
 import type { GalleryProps } from './GalleryProps';
 
@@ -32,7 +34,11 @@ export const Gallery = JSX<GalleryProps>(
   },
 );
 
-function renderCardsLayout(orientation: ListOrientation, cards: GalleryCardProps[], context) {
+function renderCardsLayout(
+  orientation: ListOrientation,
+  cards: GalleryCardProps[],
+  context: ContentPageContext,
+) {
   return orientation === 'horizontal' ? (
     <SwipeListControl context={context}>{cards?.map(renderCard)}</SwipeListControl>
   ) : (
@@ -62,14 +68,8 @@ function renderCard(card: GalleryCardProps, key: number) {
   );
 }
 
-function renderButton(button) {
-  return (
-    <Button
-      className="mt-3"
-      appendLeft={button?.icon && <Img image={button?.icon} width="24px" height="24px" asSVG />}
-      {...button}
-    />
-  );
+function renderButton(button?: ButtonWithIconProps) {
+  return <Button className="mt-3" {...button} />;
 }
 
 function renderDescription(card: GalleryCardProps) {
@@ -90,7 +90,11 @@ const LIST_DOT_STYLE_MAP: Record<ListItemVersion, string> = {
   gray: 'bg-secondary-text',
 };
 
-function renderItems(items: GalleryItemProps[], isDotted, version: BlockVersion = 'primary') {
+function renderItems(
+  items: GalleryItemProps[],
+  isDotted?: boolean,
+  version: BlockVersion = 'primary',
+) {
   return (
     <section className="mt-3">
       {items.map((item, i) => (

package/src/components/Gallery/GalleryInner.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/ContentPageDef';
 import type { GalleryVersion } from '../../model/GalleryVersion';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { galleryLengthForScrollMap } from './constants';

package/src/components/Gallery/GalleryProps.ts

@@ -1,4 +1,4 @@
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { GalleryContent } from './GalleryContent';
 
 export interface GalleryProps extends GalleryContent, UniBlockProps {}