@redneckz/wildless-cms-uni-blocks 0.8.26 → 0.8.28

package/mobile/src/utils/minBy.ts

@@ -3,3 +3,5 @@ import { defaultDiscriminator, maxBy } from './maxBy';
 export const minBy = <Item, Value = Item>(
   discriminator: (item: Item) => Value = defaultDiscriminator,
 ) => maxBy((_: Item) => -discriminator(_));
+
+export const min = minBy<number>();

package/mobile/src/utils/sum.ts

@@ -0,0 +1 @@
+export const sum = (list: number[] = []): number => list.reduce((a, b) => a + b, 0);

package/mobile/src/utils/unique.ts

@@ -0,0 +1 @@
+export const unique = <T>(list: T[]): T[] => [...new Set(list)];

package/mobile/src/utils/url.ts

@@ -10,5 +10,5 @@ export const isHash = (href?: string): href is `#${string}` => Boolean(href?.sta
 export const withoutQuery = (href?: string): string =>
   (href || '').replace(/\?.*/, '').replace(/\/$/, '');
 
-export const joinPath = (...path: (string | undefined)[]): string =>
+export const joinPath = (...path: (string | undefined | null)[]): string =>
   path.filter(Boolean).join('/').replace(/\/+/g, '/');

package/mobile/src/utils/zip.ts

@@ -0,0 +1,8 @@
+export function zip<A>(a: A[]): [A][];
+export function zip<A, B>(a: A[], b: B[]): [A, B][];
+export function zip<A, B, C>(a: A[], b: B[], c: C[]): [A, B, C][];
+export function zip<A, B, C, D>(a: A[], b: B[], c: C[], d: D[]): [A, B, C, D][];
+
+export function zip(firstCol: any[], ...restCols: any[][]) {
+  return firstCol.map((firstEl, rowIndex) => [firstEl, ...restCols.map((col) => col[rowIndex])]);
+}

package/package.json

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

package/src/EventBus/defaultEventBus.ts

@@ -3,6 +3,7 @@ import { EventBus } from './EventBus';
 
 interface GlobalEventMap {
   tab: TabActivationEvent;
+  setPageOverflowHidden: boolean;
 }
 
 export const defaultEventBus = new EventBus<GlobalEventMap>();

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -0,0 +1,8 @@
+{
+  "content": {
+    "button": {
+      "text": "Отправить заявку"
+    },
+    "typeForm": "credit"
+  }
+}

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -8,10 +8,7 @@ import type { ButtonAdditionalProps } from '../../ui-kit/Button/ButtonProps';
  * @title Кнопка
  */
 export interface SubmitButtonProps extends ButtonAdditionalProps {
-  /**
-   * @title Текст
-   * @default "Отправить заявку"
-   */
+  /** @title Текст */
   text?: string;
   version?: ButtonVersion;
 }
@@ -23,7 +20,6 @@ export type ApplicationFormContent = UniBlockContent &
   TitleProps & {
     /**
      * @title Вид заявки
-     * @default credit
      * @enumNames ["Бизнес-карта", "ВЭД", "Депозит", "Кредит", "Эквайринг"]
      */
     typeForm?: 'business-card' | 'wed' | 'deposit' | 'credit' | 'acquiring';

package/src/components/BaseTile/BaseTileProps.ts

@@ -2,13 +2,13 @@ import type { AlignType } from '../../model/AlignType';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { VNode } from '../../model/VNode';
 import type { HeadingType } from '../../ui-kit/Heading/HeadingProps';
+import type { ListContent } from '../../ui-kit/List/ListContent';
 
-export interface BaseTileCommonProps extends UniBlockProps {
+export interface BaseTileCommonProps extends UniBlockProps, ListContent {
   title?: VNode;
   headingType?: HeadingType;
   description?: string;
   image?: VNode;
-  items?: string[];
   list?: string;
   buttons?: VNode;
   align?: AlignType;

package/src/components/BenefitsBlock/BenefitsBlock.example.json

@@ -7,7 +7,7 @@
         "label": "Преимущество №1",
         "description": {
           "name": "Описание 1",
-          "benefitType": "description"
+          "benefitType": "text"
         },
         "icon": {
           "icon": "ClockIcon",
@@ -21,8 +21,8 @@
       {
         "label": "Преимущество №2",
         "description": {
-          "name": "Описание 2",
-          "benefitType": "description"
+          "items": ["Пункт 1", "Пункт 2"],
+          "benefitType": "list"
         },
         "icon": {
           "icon": "SignDocsIcon",

package/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -2,6 +2,7 @@ import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { LabelProps, TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
+import type { ListContent } from '../../ui-kit/List/ListContent';
 
 /**
  * @title Пункты описания
@@ -16,16 +17,9 @@ export type TextBenefitDef = {
 /**
  * @title Список
  */
-export type ListBenefitDef = {
+export type ListBenefitDef = ListContent & {
   /** @title Буллиты */
   bullets?: boolean;
-  /**
-   * @title Пункты
-   * @default [
-   *  "Пункт 1"
-   * ]
-   */
-  items?: string[];
   /** @default list */
   benefitType?: 'list';
 };

package/src/components/Bonus/Bonus.example.json

@@ -5,7 +5,8 @@
     "bonusItems": [
       {
         "title": "Плитка 1",
-        "description": "Описание плитки 1"
+        "description": "Описание плитки 1",
+        "buttons": [{ "version": "secondary", "target": "_self" }]
       }
     ]
   }

package/src/components/Bonus/Bonus.ui.json

@@ -7,7 +7,7 @@
             "ui:widget": "hidden"
           },
           "image": {
-            "ui:field": "icon"
+            "ui:field": "picture"
           }
         },
         "buttons": {

package/src/components/Bonus/BonusContent.ts

@@ -37,7 +37,6 @@ export type BonusItem = HeadlineCommonProps & {
   /**
    * @title Кнопка
    * @maxItems 1
-   * @default [{"version" : "secondary", "target": "_self"}]
    */
   buttons?: ButtonWithIconProps[];
 };

package/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,5 +1,5 @@
 import type { AlignType } from '../../model/AlignType';
-import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
+import type { DescriptionProps, SubtitleProps, TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 
@@ -15,10 +15,6 @@ export type ColumnsCount = '3' | '4' | '5';
 
 /**
  * @title Бонус и преимущество
- * @default {
- *   "title": "Верхний заголовок",
- *   "description": "Нижний заголовок",
- * }
  */
 export type BonusBenefit = TitleProps & IconProps & DescriptionProps;
 
@@ -26,9 +22,8 @@ export type BonusBenefit = TitleProps & IconProps & DescriptionProps;
  * @title Блок бонусов и преимуществ
  */
 export type BonusBenefitsBlockContent = UniBlockContent &
-  TitleProps & {
-    /** @title Подзаголовок */
-    subtitle?: string;
+  TitleProps &
+  SubtitleProps & {
     /** @title Список бонусов */
     bonusBenefits?: BonusBenefit[];
     columnsCount?: ColumnsCount;

package/src/components/BusinessBlock/BusinessBlock.example.json

@@ -12,22 +12,39 @@
       "title": "Заголовок карточки",
       "cardItems": [
         {
-          "icon": { "icon": "RoundRubleIcon" },
+          "icon": {
+            "icon": "RoundRubleIcon",
+            "format": "webp",
+            "size": { "width": 24, "height": 24 },
+            "iconVersion": "color"
+          },
           "text": "Пункт 1"
         },
         {
-          "icon": { "icon": "EmptyWalletIcon" },
+          "icon": {
+            "icon": "EmptyWalletIcon",
+            "format": "webp",
+            "size": { "width": 24, "height": 24 },
+            "iconVersion": "color"
+          },
           "text": "Пункт 2"
         },
         {
-          "icon": { "icon": "PercentageSquareIcon" },
+          "icon": {
+            "icon": "PercentageSquareIcon",
+            "format": "webp",
+            "size": { "width": 24, "height": 24 },
+            "iconVersion": "color"
+          },
           "text": "Пункт 3"
         }
       ],
       "button": {
         "href": "#",
         "text": "Кнопка",
-        "version": "primary"
+        "version": "primary",
+        "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
+        "iconRight": { "format": "webp", "size": { "width": 24, "height": 24 } }
       }
     },
     {
@@ -41,22 +58,39 @@
       "title": "Заголовок карточки",
       "cardItems": [
         {
-          "icon": { "icon": "RoundRubleIcon" },
+          "icon": {
+            "icon": "RoundRubleIcon",
+            "format": "webp",
+            "size": { "width": 24, "height": 24 },
+            "iconVersion": "color"
+          },
           "text": "Пункт 1"
         },
         {
-          "icon": { "icon": "EmptyWalletIcon" },
+          "icon": {
+            "icon": "EmptyWalletIcon",
+            "format": "webp",
+            "size": { "width": 24, "height": 24 },
+            "iconVersion": "color"
+          },
           "text": "Пункт 2"
         },
         {
-          "icon": { "icon": "PercentageSquareIcon" },
+          "icon": {
+            "icon": "PercentageSquareIcon",
+            "format": "webp",
+            "size": { "width": 24, "height": 24 },
+            "iconVersion": "color"
+          },
           "text": "Пункт 3"
         }
       ],
       "button": {
         "href": "#",
         "text": "Кнопка",
-        "version": "primary"
+        "version": "primary",
+        "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
+        "iconRight": { "format": "webp", "size": { "width": 24, "height": 24 } }
       }
     }
   ]

package/src/components/BusinessBlock/BusinessBlockContent.ts

@@ -1,25 +1,19 @@
+import type { ButtonCommonIconProps } from '../../model/Button';
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
-/** @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }}} */
 export type BusinessCardItemProps = IconProps & {
   /** @title Текст */
   text?: string;
 };
 
 export type BusinessCardProps = TitleProps &
-  ImageContent & {
+  ImageContent &
+  ButtonCommonIconProps & {
     /** @title Список */
     cardItems?: BusinessCardItemProps[];
-    /**
-     * @title Кнопка
-     * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
-     * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}, "text": "Кнопка"}
-     */
-    button?: ButtonWithIconProps;
   };
 
 /**

package/src/components/ButtonBlock/ButtonBlock.example.json

@@ -4,7 +4,9 @@
       "href": "#",
       "text": "Кнопка",
       "target": "_blank",
-      "version": "primary"
+      "version": "primary",
+      "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
+      "iconRight": { "format": "webp", "size": { "width": 24, "height": 24 } }
     }
   }
 }

package/src/components/ButtonBlock/ButtonBlockContent.ts

@@ -4,10 +4,6 @@ import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
  * @title Блок Кнопка
  */
 export interface ButtonBlockContent {
-  /**
-   * @title Кнопка
-   * @default {"icon": {"format": "webp", "size": { "width": 24, "height": 24 }},
-   * "iconRight": {"format": "webp", "size": { "width": 24, "height": 24 }}}
-   */
+  /** @title Кнопка */
   button?: ButtonWithIconProps;
 }

package/src/components/Calculator/CalculatorContent.ts

@@ -2,14 +2,13 @@ import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { Footnote } from '../../model/Footnote';
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 
-export type CommonCalculatorProps = Footnote & {
-  /** @title Кнопки */
-  buttons?: ButtonWithIconProps[];
-  /** @title Адрес справочника */
-  sourceBookDir?: string;
-};
+export type CommonCalculatorProps = Footnote &
+  ButtonContent & {
+    /** @title Адрес справочника */
+    sourceBookDir?: string;
+  };
 
 export interface BusinessDepositCalculatorProps extends CommonCalculatorProps {
   /** @title Сноска снизу блока */

package/src/components/Carousel/Carousel.example.json

@@ -1,6 +1,7 @@
 {
-  "isBlur": false,
   "visibleItemCount": 1,
+  "isBlur": false,
+  "arrowsPadded": true,
   "isCycle": false,
   "isPadding": true
 }

package/src/components/Carousel/Carousel.fixture.tsx

@@ -8,7 +8,7 @@ import { CAROUSEL_EVENT_CARD } from '../CarouselEventCard/CarouselEventCard.fixt
 import { INVESTMENT_CARD_WITH_SINGLE_COLUMN } from '../CarouselInvestmentCard/CarouselInvestmentCard.fixture';
 import { PRODUCT_CARD } from '../CarouselProductCard/CarouselProductCard.fixture';
 import { BUSINESS_CARD } from '../CarouselProgramsCard/CarouselProgramsCard.fixture';
-import { CAROUSEL_RECOMMENDATION_CARD } from '../CarouselRecommendationCard/CarouselRecommendationCard.fixture';
+import { CAROUSEL_RECOMMENDATION_CARD_WITHOUT_LIST } from '../CarouselRecommendationCard/CarouselRecommendationCard.fixture';
 import { TARIFFS_CARD, TARIFFS_CARD_HIT } from '../CarouselTariffsCard/CarouselTariffsCard.fixture';
 import { Carousel } from './Carousel';
 
@@ -163,14 +163,15 @@ export default {
     <div className="container grid grid-cols-12">
       <Carousel
         className="col-span-12"
-        isBlur={true}
+        isBlur={false}
         isCyclic={false}
+        visibleItemCount={2}
         block={{
           type: 'Carousel',
           blocks: new Array(6).fill({
             type: 'CarouselRecommendationCard',
-            content: CAROUSEL_RECOMMENDATION_CARD,
-            style: ['col-span-4'],
+            content: CAROUSEL_RECOMMENDATION_CARD_WITHOUT_LIST,
+            style: ['col-span-2'],
           }),
         }}
         options={options}

package/src/components/Carousel/CarouselContent.ts

@@ -11,10 +11,7 @@ export type CarouselContent = UniBlockContent & {
   visibleItemCount?: 0 | 1 | 2 | 3 | 4;
   /** @title Добавление  блюра на стрелках*/
   isBlur?: boolean;
-  /**
-   * @title Добавление  отступа на стрелках
-   * @default true
-   * */
+  /** @title Добавление  отступа на стрелках */
   arrowsPadded?: boolean;
   /** @title Цикличность */
   isCyclic?: boolean;

package/src/components/CarouselCard/CarouselCard.example.json

@@ -5,7 +5,9 @@
     "href": "",
     "text": "Подробнее",
     "target": "_self",
-    "version": "primary"
+    "version": "primary",
+    "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
+    "iconRight": { "format": "webp", "size": { "width": 24, "height": 24 } }
   },
   "version": "normal"
-}
+}

package/src/components/CarouselCard/CarouselCard.fixture.tsx

@@ -14,6 +14,7 @@ export const CARD: CarouselCardContent = {
   description: 'Стажировка в Россельхозбанке — это возможность реализовать смелые идеи и проекты.',
   button,
   carouselVersion: 'normal',
+  version: 'primary',
 };
 
 export const CARD_NEW: CarouselCardContent = {
@@ -21,6 +22,7 @@ export const CARD_NEW: CarouselCardContent = {
   description: 'Стажировка в Россельхозбанке — это возможность реализовать смелые идеи и проекты.',
   button,
   carouselVersion: 'normal',
+  version: 'primary',
 };
 
 export const CARD_MINI: CarouselCardContent = {
@@ -28,6 +30,7 @@ export const CARD_MINI: CarouselCardContent = {
   description: 'Стажировка в Россельхозбанке — это возможность реализовать смелые идеи и проекты.',
   button,
   carouselVersion: 'small',
+  version: 'primary',
 };
 
 export default {

package/src/components/CarouselCard/CarouselCard.tsx

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { SizeVersion } from '../../model/SizeVersion';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Headline } from '../Headline/Headline';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import type { CarouselCardContent } from './CarouselCardContent';
-import type { SizeVersion } from '../../model/SizeVersion';
 
 export interface CarouselCardProps extends CarouselCardContent, UniBlockProps {}
 
@@ -15,7 +15,7 @@ const CARD_WIDTH_MAP: Record<SizeVersion, string> = {
 };
 
 export const CarouselCard = JSX<CarouselCardProps>(
-  ({ className = '', button, description, title, carouselVersion = 'normal' }) => (
+  ({ className = '', button, description, title, carouselVersion = 'normal', version = '' }) => (
     <section
       className={`flex pb-9 pl-12 border-box h-full ${CARD_WIDTH_MAP[carouselVersion]} ${className}`}
     >
@@ -30,6 +30,7 @@ export const CarouselCard = JSX<CarouselCardProps>(
             description={description}
             headlineVersion="L"
             align="text-left"
+            version={version}
           />
           {renderButtonsSection([button], { className: 'mt-14' })}
         </div>

package/src/components/CarouselCard/CarouselCardContent.ts

@@ -1,20 +1,13 @@
+import type { ButtonCommonIconProps } from '../../model/Button';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { SizeVersion } from '../../model/SizeVersion';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 /**
  * @title Карточка карусели
  */
 export type CarouselCardContent = UniBlockContent &
-  HeadlineCommonProps & {
-    /**
-     * @title Кнопка
-     * @default {
-     *  "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
-     *  "iconRight" : { "format": "webp", "size": { "width": 24, "height": 24 } }
-     * }
-     */
-    button?: ButtonWithIconProps;
+  HeadlineCommonProps &
+  ButtonCommonIconProps & {
     carouselVersion?: SizeVersion;
   };

package/src/components/CarouselCatalogCard/CarouselCatalogCard.example.json

@@ -12,6 +12,8 @@
     "href": "",
     "text": "Подробнее",
     "target": "_self",
-    "version": "primary"
+    "version": "primary",
+    "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
+    "iconRight": { "format": "webp", "size": { "width": 24, "height": 24 } }
   }
 }

package/src/components/CarouselCatalogCard/CarouselCatalogCardContent.ts

@@ -1,7 +1,7 @@
+import type { ButtonCommonIconProps } from '../../model/Button';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { ProductColorVersion } from '../../model/ProductColorVersion';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 /**
@@ -9,17 +9,10 @@ import type { ImageContent } from '../../ui-kit/Img/ImgProps';
  */
 export type CarouselCatalogCardContent = UniBlockContent &
   HeadlineCommonProps &
-  ImageContent & {
+  ImageContent &
+  ButtonCommonIconProps & {
     /** @title Цена в рублях */
     price?: number;
     /** @title Доступные цвета */
     colors?: ProductColorVersion[];
-    /**
-     * @title Кнопка
-     * @default {
-     *  "icon": { "format": "webp", "size": { "width": 24, "height": 24 } },
-     *  "iconRight" : { "format": "webp", "size": { "width": 24, "height": 24 } }
-     * }
-     */
-    button?: ButtonWithIconProps;
   };

package/src/components/CarouselInvestmentCard/CarouselInvestmentCard.example.json

@@ -1,16 +1,23 @@
 {
   "image": {
     "format": "webp",
-      "size": {
-        "width": 180,
-        "height": 180
-      }
+    "size": {
+      "width": 290
     },
+    "sources": [
+      {
+        "media": 1279,
+        "width": 174,
+        "format": "webp",
+        "alignment": "southeast"
+      }
+    ]
+  },
   "title": "Заголовок",
   "description": "Описание",
   "additionalDescription": "Описание 1-2",
   "columnsMode": "1",
-  "cardsList":[
+  "cardsList": [
     {
       "parameter": "Параметр",
       "parameterDescription": "Описание пункта"
@@ -25,4 +32,4 @@
     }
   ],
   "version": "primary"
-}
+}

package/src/components/CarouselInvestmentCard/CarouselInvestmentCardContent.ts

@@ -1,6 +1,6 @@
 import type { AdditionalDescriptionProps, HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { Picture } from '../../model/Picture';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 
 /**
  * @title Количество колонок
@@ -23,26 +23,9 @@ export interface CardsListItem {
  */
 export type CarouselInvestmentCardContent = UniBlockContent &
   HeadlineCommonProps &
-  AdditionalDescriptionProps & {
-    /** @default 1 */
+  AdditionalDescriptionProps &
+  ImageContent & {
     columnsMode?: CardColumnsMode;
-    /**
-     * @title Список
-     */
+    /** @title Список */
     cardsList?: CardsListItem[];
-    /**
-     * @default {
-     *   "format": "webp",
-     *   "size": {
-     *       "width": 290
-     *   },
-     *   "sources": [{
-     *       "media": 1279,
-     *       "width": 174,
-     *       "format": "webp",
-     *       "alignment": "southeast"
-     *   }]
-     * }
-     */
-    image?: Picture;
   };