@redneckz/wildless-cms-uni-blocks 0.8.16 → 0.8.18

package/mobile/src/components/ProductGallery/ProductGallery.example.json

@@ -15,7 +15,6 @@
               "height": 299
             }
           },
-          "version": "primary",
           "description": "Описание",
           "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
           "benefits": [
@@ -50,7 +49,6 @@
               "height": 299
             }
           },
-          "version": "primary",
           "description": "Описание",
           "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
           "benefits": [
@@ -71,6 +69,7 @@
           ]
         }
       }
-    ]
+    ],
+    "version": "primary"
   }
 }

package/mobile/src/components/ProductGallery/ProductGallery.tsx

@@ -61,7 +61,7 @@ function renderProductBlock(block: ProductBlockInnerContent & UniBlockProps, i:
     >
       <div className="flex grow">
         <ProductBlockInner
-          className="pl-12 z-10 text-secondary-text group-data-secondary:text-white"
+          className="pl-12 z-10 group-data-secondary:text-white"
           textBlockClassName="mb-[154px]"
           headlineVersion="XXL"
           {...block}

package/mobile/src/components/TariffsTable/TariffsTable.example.json

@@ -35,6 +35,7 @@
             {
               "tableCellType": "List",
               "isDotted": true,
+              "listItemSize": "M",
               "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"]
             },
             {
@@ -45,6 +46,7 @@
             {
               "tableCellType": "List",
               "isDotted": false,
+              "listItemSize": "M",
               "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"]
             }
           ],
@@ -56,6 +58,7 @@
             {
               "tableCellType": "List",
               "isDotted": true,
+              "listItemSize": "M",
               "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"]
             }
           ],

package/mobile/src/components/TariffsTable/TariffsTableContent.ts

@@ -80,6 +80,7 @@ export type LabelDescriptionCellDef = LabelDescriptionCell & {
 
 /**
  * @title Список
+ * @default { "listItemSize": "M", "isDotted": true  }
  */
 export type ListBlockDef = ListProps & {
   /** @default List */

package/mobile/src/components/VerticalLayout/VerticalLayout.example.json

@@ -3,7 +3,7 @@
     "version": "primary",
     "isPadding": false,
     "isInnerPadding": true,
-    "align": "left",
+    "align": "stretch",
     "gap": ""
   },
   "style": ["col-span-12"],

package/mobile/src/components/VerticalLayout/VerticalLayout.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
-import type { AlignType } from '../../model/AlignType';
+import type { AlignTypeWithStretch } from '../../model/AlignType';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { style } from '../../utils/style';
@@ -9,7 +9,8 @@ import type { VerticalLayoutContent } from './VerticalLayoutContent';
 
 export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {}
 
-const alignStyle: Record<AlignType, string> = {
+const alignStyle: Record<AlignTypeWithStretch, string> = {
+  stretch: 'items-stretch',
   left: 'items-start',
   center: 'items-center',
   right: 'items-end',
@@ -19,7 +20,7 @@ export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutP
   ({
     className = '',
     gap = '',
-    align,
+    align = 'stretch',
     isPadding = false,
     isInnerPadding = true,
     version = 'transparent',

package/mobile/src/components/VerticalLayout/VerticalLayoutContent.ts

@@ -1,4 +1,4 @@
-import type { AlignType } from '../../model/AlignType';
+import type { AlignTypeWithStretch } from '../../model/AlignType';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { ColorPalette } from '../../model/ContentPageDef';
 import type { GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
@@ -9,7 +9,7 @@ import type { GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
 export interface VerticalLayoutContent {
   colorPalette?: ColorPalette;
   version?: BlockVersion;
-  align?: AlignType;
+  align?: AlignTypeWithStretch;
   gap?: GapVersion;
   /** @title Внутренний отступ компоновщика */
   isPadding?: boolean;

package/mobile/src/components/Video/Video.example.json

@@ -0,0 +1,5 @@
+{
+  "content": {
+    "title": "Заголовок блока"
+  }
+}

package/mobile/src/components/Video/Video.tsx

@@ -1,26 +1,32 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/JSXBlock';
+import { useRouter } from '../../hooks/useRouter';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { adjustHref } from '../../utils/adjustHref';
 import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
 import { getPaddings } from './getPaddings';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { VideoContent } from './VideoContent';
 
 interface VideoProps extends VideoContent, UniBlockProps {}
 
-export const Video = JSX<VideoProps>(({ className, title, src, previewImg, ...rest }) => (
-  <BlockWrapper className={style(getPaddings(className), className)} {...rest}>
-    <Headline title={title} headlineVersion="M" />
-    {src ? (
-      <video
-        className="m-auto w-full object-fill"
-        preload="metadata"
-        poster={previewImg?.src}
-        style={{ maxHeight: 524 }}
-        controls
-      >
-        <source src={src} />
-      </video>
-    ) : null}
-  </BlockWrapper>
-));
+export const Video = JSX<VideoProps>(({ className, title, url, previewImg, ...rest }) => {
+  const router = useRouter();
+
+  return (
+    <BlockWrapper className={style(getPaddings(className), className)} {...rest}>
+      <Headline title={title} headlineVersion="M" />
+      {url ? (
+        <video
+          className="m-auto w-full object-fill"
+          preload="metadata"
+          poster={adjustHref(router)(previewImg?.src)}
+          style={{ maxHeight: 524 }}
+          controls
+        >
+          <source src={adjustHref(router)(url)} />
+        </video>
+      ) : null}
+    </BlockWrapper>
+  );
+});

package/mobile/src/components/Video/Video.ui.json

@@ -6,7 +6,7 @@
   },
   "style": {
     "ui:options": {
-      "minCols": 6
+      "minCols": 3
     }
   }
 }

package/mobile/src/components/Video/VideoContent.ts

@@ -1,10 +1,25 @@
 import type { TitleProps } from '../../model/HeadlineType';
 import type { Picture } from '../../model/Picture';
 
-/** @title Блок Видео */
+/**
+ * @title Блок Видео
+ * @default {
+ *   "title": "Заголовок блока"
+ * }
+ */
 export interface VideoContent extends TitleProps {
-  /** @title URL */
-  src?: string;
-  /** @title Заставка */
+  /**
+   * @title Ссылка на видео
+   */
+  url?: string;
+  /**
+   * @title Заставка в блоке
+   * @default {
+   *   "format": "webp",
+   *   "size": {
+   *       "width": 1004
+   *   },
+   * }
+   */
   previewImg?: Picture;
 }

package/mobile/src/hooks/useLink.ts

@@ -1,18 +1,15 @@
 import type { LinkProps } from '../model/LinkProps';
+import type { PreventableEvent } from '../model/PreventableEvent';
 import { adjustHref } from '../utils/adjustHref';
 import { isLocalURL } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
 
-interface PreventableEvent {
-  preventDefault: () => void;
-}
-
 interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
 
-export function useLink(isRemote?: boolean) {
+export function useLink(isRemote = false) {
   const router = useRouter();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({

package/mobile/src/model/AlignType.ts

@@ -7,3 +7,14 @@
  * ]
  */
 export type AlignType = 'left' | 'center' | 'right';
+
+/**
+ * @title Выравнивание
+ * @enumNames [
+ *    "Во всю ширину",
+ *    "По левому краю",
+ *    "По центру",
+ *    "По правому краю"
+ * ]
+ */
+export type AlignTypeWithStretch = 'stretch' | 'left' | 'center' | 'right';

package/mobile/src/model/PreventableEvent.ts

@@ -0,0 +1,3 @@
+export interface PreventableEvent {
+  preventDefault: () => void;
+}

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

@@ -1,11 +1,6 @@
 import type { Router } from '../../hooks/useRouter';
 import { projectSettings } from '../../ProjectSettings';
 import { isHrefActive } from './isHrefActive';
-import { TopMenuItem } from './SitemapProps';
 
-export const isTopItemActive =
-  (router: Router) =>
-  (topItem: TopMenuItem): boolean =>
-    projectSettings.BASE_PATH
-      ? isHrefActive({ pathname: projectSettings.BASE_PATH })(topItem)
-      : topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);
+export const isTopItemActive = (router: Router) =>
+  isHrefActive(projectSettings.BASE_PATH ? { pathname: projectSettings.BASE_PATH } : router);

package/mobile/src/wlc.json

@@ -2,5 +2,7 @@
   "PROD_BRANCH": "master",
   "FORCED_DRAFT_FLOW": false,
   "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
-  "SITEMAP": "sayt-rshb"
+  "SITEMAP": "sayt-rshb",
+  "CHAT_BOT": "personal",
+  "BASE_PATH": "/natural/"
 }

package/package.json

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

package/src/ProjectSettings.ts

@@ -6,6 +6,7 @@ export interface ProjectSettings {
   ASSIST_PROJECT_ID?: string;
   SITEMAP?: string;
   FOOTER?: string;
+  CHAT_BOT?: string; // "personal" or "business"
   CDN?: string; // Should ends with "/"
   BASE_PATH?: string; // Should ends with "/"
   YANDEX_MAP_API_KEY?: string;
@@ -42,6 +43,9 @@ export const projectSettings = new (class implements ProjectSettings {
   get FOOTER() {
     return this._.FOOTER;
   }
+  get CHAT_BOT() {
+    return this._.CHAT_BOT;
+  }
   get CDN() {
     return appendSlash(this._.CDN);
   }

package/src/api/CorporateLeadAPI.ts

@@ -13,7 +13,7 @@ export interface DaDataResult {
 }
 
 export function CorporateLeadAPI() {
-  async function send(body: any) {
+  async function send(body: Record<string, string>) {
     try {
       const response = await fetch('/api/v1/sendCorporateLead', {
         method: 'POST',
@@ -22,7 +22,7 @@ export function CorporateLeadAPI() {
         body: JSON.stringify(body),
       });
 
-      const data = (await response.json()) as any;
+      const data = await response.json();
 
       return data;
     } catch (e) {

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -2,7 +2,7 @@ import '../../setup-fixture';
 import { ApplicationForm } from './ApplicationForm';
 import type { ApplicationFormContent } from './ApplicationFormContent';
 
-export const ApplicationFormProps: ApplicationFormContent = {
+const ApplicationFormProps: ApplicationFormContent = {
   title: 'Форма заявки',
   button: {
     text: 'Отправить заявку',

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { CorporateLeadAPI } from '../../api/CorporateLeadAPI';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -8,7 +9,7 @@ import { ApplicationFormBusinessCard } from './ApplicationFormBusinessCard';
 import type { ApplicationFormContent } from './ApplicationFormContent';
 import { ApplicationFormCredit } from './ApplicationFormCredit';
 import { ApplicationFormDeposit } from './ApplicationFormDeposit';
-import { ApplicationFormsProps } from './ApplicationFormsProps';
+import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { ApplicationFormWed } from './ApplicationFormWed';
 import { ResponseNotification } from './ResponseNotification';
 
@@ -22,13 +23,16 @@ const COMPONENTS_MAP = {
   wed: (props: ApplicationFormsProps) => <ApplicationFormWed {...props} />,
 };
 
+const API = CorporateLeadAPI();
+
 export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
   const { className = '', title, typeForm = 'credit', button, link, ...rest } = props;
 
-  const [responceType, setResponceType] = useState<'OK' | 'Fail' | ''>('');
+  const [responceType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
-  const handleSubmit = useCallback(() => {
-    setResponceType('OK');
+  const handleSubmit = useCallback(async (data: Record<string, string>) => {
+    const status = await API.send(data);
+    setResponseType(status ? 'OK' : 'Fail');
 
     return 'OK';
   }, []);

package/src/components/ApplicationForm/ApplicationFormAcquiring.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
@@ -43,11 +44,8 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
 
   const regions = useGetRegions();
 
-  const { handleChange, onSubmit } = useFormHandlers<AcquiringFormState>({
-    formState,
-    handleSubmit,
+  const { handleChange } = useFormHandlers<AcquiringFormState>({
     setFormState,
-    typeForm: 'acqr',
   });
 
   const selectedRegion = normalizeSelectedRegion(region, regions);
@@ -56,10 +54,27 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
     setFormState((oldState) => ({
       ...oldState,
       acquiringType:
-        ACQUIRING_TYPES?.length && ACQUIRING_TYPES[0]?.code ? ACQUIRING_TYPES[0].code : '',
+        ACQUIRING_TYPES?.length && ACQUIRING_TYPES[0]?.name ? ACQUIRING_TYPES[0].name : '',
     }));
   }, []);
 
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    const PartnerComments = `Вид эквайринга=${acquiringType}/Онлайн касса=${onlineСheckout}/POS-терминал=${posTerminal}`;
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'acqr',
+        region,
+        PartnerComments,
+        fullName,
+        inn,
+        name,
+        phone,
+      }));
+  };
+
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Вид эквайринга и регион" className="text-center mb-4" />

package/src/components/ApplicationForm/ApplicationFormBusinessCard.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { Region } from '../../hooks/useRegions';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
@@ -21,6 +22,7 @@ export interface BusinessCardFormState {
 
 export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
+
   const [formState, setFormState] = useState<BusinessCardFormState>({
     region: '',
     name: '',
@@ -29,18 +31,29 @@ export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) =>
     mail: '',
   });
 
-  const { name, phone, inn, mail } = formState;
+  const { region, name, phone, inn, mail } = formState;
 
   const regions = useGetRegions();
 
-  const { handleChange, onSubmit } = useFormHandlers<BusinessCardFormState>({
-    formState,
-    handleSubmit,
+  const { handleChange } = useFormHandlers<BusinessCardFormState>({
     setFormState,
-    typeForm: 'bcrd',
   });
 
-  const selectedRegion = normalizeSelectedRegion(formState.region, regions);
+  const selectedRegion = normalizeSelectedRegion(region, regions);
+
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'bcrd',
+        region,
+        name,
+        phone,
+        inn,
+        mail,
+      }));
+  };
 
   return (
     <form onSubmit={onSubmit} className="container">
@@ -122,7 +135,7 @@ const renderRegion = ({ regions, region, handleChange }: RenderRegionProps) => (
     <div className="w-full">
       <WrapperSelect
         data={regions}
-        fieldValue="code"
+        fieldValue="name"
         fieldLabel="name"
         selected={region}
         setSelected={(value) => handleChange({ region: value })}

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -1,18 +1,30 @@
-import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { TitleProps } from '../../model/HeadlineType';
 import type { LinkProps } from '../../model/LinkProps';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonAdditionalProps } from '../../ui-kit/Button/ButtonProps';
+
+/**
+ * @title Кнопка
+ */
+export interface ButtonProps extends ButtonAdditionalProps {
+  /**
+   * @title Текст
+   * @default "Отправить заявку"
+   */
+  text?: string;
+  version?: ButtonVersion;
+}
 
 /**
  * @title Форма заявки
  */
-export type ApplicationFormContent = HeadlineCommonProps & {
+export type ApplicationFormContent = TitleProps & {
   /**
    * @title Вид заявки
    * @default credit
    * @enumNames ["Бизнес-карта", "ВЭД", "Депозит", "Кредит", "Эквайринг"]
    */
   typeForm?: 'business-card' | 'wed' | 'deposit' | 'credit' | 'acquiring';
-  /** @title Кнопка */
   button?: ButtonProps;
   /** @title Условия передачи данных */
   link?: LinkProps;

package/src/components/ApplicationForm/ApplicationFormCredit.tsx

@@ -1,9 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useSafeBoxes } from '../../hooks/useSafeBoxes';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
+import { MIN_CREDIT_AMOUNT, MIN_CREDIT_TERM } from './CreditParameters';
 import { Footnote } from './Footnote';
 import { normalizeSelectedRegion } from './normalizeSelectedRegion';
 import { renderBankOffices } from './renderBankOffices';
@@ -25,16 +27,9 @@ export interface CreditFormState {
   annualRevenue: string;
 }
 
-export const MIN_CREDIT_AMOUNT = 50000;
-export const MAX_CREDIT_AMOUNT = 3000000;
-export const ITEMS_CREDIT_AMOUNT = ['От 50 000 ₽', 'До 3 000 000 ₽'];
-
-export const MIN_CREDIT_TERM = 1;
-export const MAX_CREDIT_TERM = 60;
-export const ITEMS_CREDIT_TERM = ['От 1 года', 'До 5 лет'];
-
 export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
+
   const [formState, setFormState] = useState<CreditFormState>({
     amount: MIN_CREDIT_AMOUNT,
     term: MIN_CREDIT_TERM,
@@ -53,11 +48,8 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
 
   const regions = useGetRegions();
 
-  const { handleChange, onSubmit } = useFormHandlers<CreditFormState>({
-    formState,
-    handleSubmit,
+  const { handleChange } = useFormHandlers<CreditFormState>({
     setFormState,
-    typeForm: 'cred',
   });
 
   const selectedRegion = normalizeSelectedRegion(formState.region, regions);
@@ -70,6 +62,25 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
     });
   }, [formState.region, handleChange]);
 
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    const PartnerComments = `Сумма=${amount}/Срок=${term}/Выручка=${annualRevenue}`;
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'cred',
+        fullName,
+        inn,
+        name,
+        phone,
+        mail,
+        region,
+        department,
+        PartnerComments,
+      }));
+  };
+
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Параметры кредита" className="text-center mb-4" />

package/src/components/ApplicationForm/ApplicationFormDeposit.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Input } from '../../ui-kit/Input/Input';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
@@ -21,13 +22,23 @@ export const ApplicationFormDeposit = JSX<ApplicationFormsProps>((props) => {
     phone: '',
   });
 
-  const { handleChange, onSubmit } = useFormHandlers<DepositFormState>({
-    formState,
-    handleSubmit,
+  const { name, phone } = formState;
+
+  const { handleChange } = useFormHandlers<DepositFormState>({
     setFormState,
-    typeForm: 'dpst',
   });
 
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'dpst',
+        name,
+        phone,
+      }));
+  };
+
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading