@redneckz/wildless-cms-uni-blocks 0.9.16 → 0.10.0

package/mobile/lib/ui-kit/Button/renderButtonsSection.js

@@ -2,11 +2,11 @@ import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { style } from '../../utils/style.js';
 import { Img } from '../Img/Img.js';
 import { Button } from './Button.js';
-export const renderButtonsSection = (buttons, { className = '', buttonClassName, isVertical } = {}) => buttons?.length && buttons.some((_) => _?.text) ? (_jsx("div", { className: style('flex', isVertical ? 'flex-col gap-2' : 'gap-4', className), children: buttons.map(renderButton(buttonClassName)) })) : null;
+export const renderButtonsSection = (buttons, { className = '', buttonClassName, isVertical } = {}) => buttons?.length && buttons.some((_) => _?.text || _?.icon?.icon) ? (_jsx("div", { className: style('flex', isVertical ? 'flex-col gap-2' : 'gap-4', className), children: buttons.map(renderButton(buttonClassName)) })) : null;
 const renderButton = (buttonClassName = '') => (button, index) => {
     const { text, icon, iconRight, version, ...rest } = button || {};
     const iconVersion = version === 'secondary' ? 'color' : 'white';
-    return text ? (_jsx(Button, { className: buttonClassName, appendLeft: renderButtonIcon({ ...icon, iconVersion }), appendRight: renderButtonIcon({ ...iconRight, iconVersion }), version: version, text: text, ...rest }, index ? String(index) : '')) : null;
+    return text || icon?.icon ? (_jsx(Button, { className: buttonClassName, appendLeft: renderButtonIcon({ ...icon, iconVersion }), appendRight: renderButtonIcon({ ...iconRight, iconVersion }), version: version, text: text, ...rest }, index ? String(index) : '')) : null;
 };
 const DEFAULT_ICON_W = 24;
 const renderButtonIcon = (icon) => icon?.icon || icon?.src ? (_jsx(Img, { image: icon, width: String(icon?.size?.width || DEFAULT_ICON_W), height: String(DEFAULT_ICON_W), asSVG: true })) : null;

package/mobile/lib/ui-kit/Button/renderButtonsSection.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderButtonsSection.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/renderButtonsSection.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASlC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAA6C,EAC7C,EAAE,SAAS,GAAG,EAAE,EAAE,eAAe,EAAE,UAAU,KAA4B,EAAE,EAC3E,EAAE,CACF,OAAO,EAAE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAChD,cAAK,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,YAC9E,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GACvC,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AAEX,MAAM,YAAY,GAChB,CAAC,eAAe,GAAG,EAAE,EAAE,EAAE,CACzB,CAAC,MAA4B,EAAE,KAAc,EAAE,EAAE;IAC/C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAEhE,OAAO,IAAI,CAAC,CAAC,CAAC,CACZ,KAAC,MAAM,IAEL,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,CAAC,EACtD,WAAW,EAAE,gBAAgB,CAAC,EAAE,GAAG,SAAS,EAAE,WAAW,EAAE,CAAC,EAC5D,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,KACN,IAAI,IANH,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAO/B,CACH,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC;AAEJ,MAAM,cAAc,GAAG,EAAE,CAAC;AAE1B,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,EAAE,CACzC,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CACxB,KAAC,GAAG,IACF,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,IAAI,cAAc,CAAC,EAClD,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,EAC9B,KAAK,SACL,CACH,CAAC,CAAC,CAAC,IAAI,CAAC"}
+{"version":3,"file":"renderButtonsSection.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/renderButtonsSection.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASlC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAA6C,EAC7C,EAAE,SAAS,GAAG,EAAE,EAAE,eAAe,EAAE,UAAU,KAA4B,EAAE,EAC3E,EAAE,CACF,OAAO,EAAE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CACjE,cAAK,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,YAC9E,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GACvC,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AAEX,MAAM,YAAY,GAChB,CAAC,eAAe,GAAG,EAAE,EAAE,EAAE,CACzB,CAAC,MAA4B,EAAE,KAAc,EAAE,EAAE;IAC/C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAEhE,OAAO,IAAI,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAC1B,KAAC,MAAM,IAEL,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,CAAC,EACtD,WAAW,EAAE,gBAAgB,CAAC,EAAE,GAAG,SAAS,EAAE,WAAW,EAAE,CAAC,EAC5D,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,KACN,IAAI,IANH,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAO/B,CACH,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC;AAEJ,MAAM,cAAc,GAAG,EAAE,CAAC;AAE1B,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,EAAE,CACzC,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CACxB,KAAC,GAAG,IACF,KAAK,EAAE,IAAI,EACX,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,IAAI,cAAc,CAAC,EAClD,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,EAC9B,KAAK,SACL,CACH,CAAC,CAAC,CAAC,IAAI,CAAC"}

package/mobile/lib/ui-kit/RichText/RichText.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { style } from '../../utils/style.js';
 export const RichText = JSX((props) => {
-    const { __html = '' } = props;
-    return _jsx("div", { className: "md-container", dangerouslySetInnerHTML: { __html } });
+    const { __html = '', richVersion = '' } = props;
+    return (_jsx("div", { className: style(richVersion, 'md-container'), dangerouslySetInnerHTML: { __html } }));
 });
 //# sourceMappingURL=RichText.js.map

package/mobile/lib/ui-kit/RichText/RichText.js.map

@@ -1 +1 @@
-{"version":3,"file":"RichText.js","sourceRoot":"","sources":["../../../src/ui-kit/RichText/RichText.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAgB,CAAC,KAAK,EAAE,EAAE;IACnD,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAE9B,OAAO,cAAK,SAAS,EAAC,cAAc,EAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,GAAI,CAAC;AAC/E,CAAC,CAAC,CAAC"}
+{"version":3,"file":"RichText.js","sourceRoot":"","sources":["../../../src/ui-kit/RichText/RichText.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAgB,CAAC,KAAK,EAAE,EAAE;IACnD,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;IAEhD,OAAO,CACL,cAAK,SAAS,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,uBAAuB,EAAE,EAAE,MAAM,EAAE,GAAI,CAC5F,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/RichText/RichTextProps.d.ts

@@ -4,8 +4,8 @@ export interface RichTextProps {
     __html?: HTML;
     /**
      * @title Стиль форматированного текста
-     * @enumNames ["по умолчанию", "в полоску"]
+     * @enumNames ["по умолчанию", "Строки разного цвета", "Горизонтальные разделители"]
      */
-    richVersion?: '' | 'striped';
+    richVersion?: '' | 'striped' | 'horizontal-separator';
 }
 export {};

package/mobile/lib/ui-kit/Select/Select.d.ts

@@ -10,5 +10,7 @@ export declare type SelectProps = LabelProps & {
     options: OptionProps[];
     isBorder?: boolean;
     placeholder?: string;
+    valid?: boolean;
+    onValidate?: (value: string) => void;
 };
 export declare const Select: import("@redneckz/uni-jsx").UNIComponent<SelectProps, any, any>;

package/mobile/lib/ui-kit/Select/Select.js

@@ -4,7 +4,7 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useOutsideClick } from '../../hooks/useOutsideClick.js';
 import { Text } from '../../ui-kit/Text/Text.js';
 import { Icon } from '../Icon/Icon.js';
-export const Select = JSX(({ className = '', isBorder = true, label, options = [], value, onChange, placeholder = '' }) => {
+export const Select = JSX(({ className = '', isBorder = true, label, options = [], value, onChange, placeholder = '', valid = true, onValidate, }) => {
     const [selectedItem, setSelectedItem] = useState(options[0] || { key: '', text: '' });
     const [isOpen, setIsOpen] = useState(false);
     const handleClickOutside = useCallback(() => setIsOpen(false), []);
@@ -13,13 +13,14 @@ export const Select = JSX(({ className = '', isBorder = true, label, options = [
         setSelectedItem(option);
         setIsOpen(false);
         onChange(option);
+        onValidate && onValidate(option.text);
     };
     const isSelected = (option) => Boolean(option.key === selectedItem.key);
     useEffect(() => {
         setSelectedItem(value || { key: '', text: '' });
     }, [value]);
     return (_jsxs("div", { className: `${className}`, ref: wrapperRef, children: [label ? (_jsx("div", { className: "mb-2", children: _jsx(Text, { size: "text-m", color: "text-primary-text", font: "font-light", children: label }) })) : null, _jsxs("div", { className: `relative ${isOpen ? 'z-20' : 'z-10'}`, children: [_jsxs("div", { className: `text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer
-            ${getBorderStyle(isBorder)}`, onClick: () => setIsOpen(!isOpen), children: [_jsx("p", { className: "p-4 pr-8 h-14 overflow-hidden text-ellipsis whitespace-nowrap", children: selectedItem?.text || placeholder }), _jsx(Icon, { name: "ArrowUpIcon", width: "16", height: "16", className: `absolute right-3 ${isOpen ? '' : 'rotate-180'}` })] }), options?.length ? (_jsx("div", { className: `h-0 ${renderOptionsStyle(isOpen)}`, children: _jsx("div", { className: `bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-[0_4px_25px_rgba(0,0,0,0.07)]`, children: options.map(renderOption(choiceOption, isOpen, isSelected)) }) })) : null] })] }));
+            ${getBorderStyle(isBorder, valid)}`, onClick: () => setIsOpen(!isOpen), children: [_jsx("p", { className: "p-4 pr-8 h-14 overflow-hidden text-ellipsis whitespace-nowrap", children: selectedItem?.text || placeholder }), _jsx(Icon, { name: "ArrowUpIcon", width: "16", height: "16", className: `absolute right-3 ${isOpen ? '' : 'rotate-180'}` })] }), options?.length ? (_jsx("div", { className: `h-0 ${renderOptionsStyle(isOpen)}`, children: _jsx("div", { className: `bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-[0_4px_25px_rgba(0,0,0,0.07)]`, children: options.map(renderOption(choiceOption, isOpen, isSelected)) }) })) : null] })] }));
 });
 const renderOptionsStyle = (isOpen) => (isOpen ? '' : 'overflow-hidden');
 const renderOption = (choiceOption, isOpen, isSelected) => (option, i) => {
@@ -27,5 +28,6 @@ const renderOption = (choiceOption, isOpen, isSelected) => (option, i) => {
             choiceOption(option);
         }, className: "flex px-4 py-3 cursor-pointer hover:bg-main-divider pr-11 relative", children: [_jsx("span", { className: "min-h-6", children: option.text }), _jsx(Icon, { name: "DoneSimpleIcon", width: "16", height: "16", className: ['absolute right-4 pt-0.5', isSelected(option) && isOpen ? '' : 'hidden'].join(' ') })] }, String(i)));
 };
-const getBorderStyle = (isBorder) => isBorder ? 'border border-gray rounded-md hover:border-primary-hover' : '';
+const getBorderStyle = (isBorder, valid) => `
+  ${isBorder ? 'border rounded-md hover:border-primary-hover' : ''} ${valid ? ' border-gray' : 'border-error'} `;
 //# sourceMappingURL=Select.js.map

package/mobile/lib/ui-kit/Select/Select.js.map

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}

package/mobile/src/common.css

@@ -17,6 +17,7 @@ html {
 /* Private clients | Green */
 [data-theme='pc'] {
   --color-primary-main: var(--color-green-dark);
+  --color-primary-divider: 235, 237, 240;
   --color-primary-hover: 36, 131, 65;
   --color-primary-active: 36, 95, 52;
   --color-secondary-hover: 36, 131, 65;
@@ -242,29 +243,47 @@ html {
 
   .md-container a {
     @apply text-primary-main;
+    font-weight: 400;
   }
 
   .md-container strong {
     @apply font-bold;
   }
 
-  .striped .md-container table {
+  .striped.md-container table {
     width: 100%;
     table-layout: fixed;
     text-align: left;
   }
-  .striped .md-container table thead {
+  .striped.md-container table thead,
+  .horizontal-separator.md-container table thead {
     color: rgb(var(--color-secondary-text));
   }
 
-  .striped .md-container table td,
-  .striped .md-container table th {
+  .striped.md-container table td,
+  .striped.md-container table th {
     padding: 8px 14px 5px;
   }
 
-  .striped .md-container table tbody tr:nth-child(2n-1) {
+  .striped.md-container table tbody tr:nth-child(2n-1) {
     background-color: rgb(var(--color-secondary-light));
   }
+
+  .horizontal-separator.md-container table {
+    width: 100%;
+    text-align: left;
+  }
+
+  .horizontal-separator.md-container table td,
+  .horizontal-separator.md-container table th {
+    padding: 12px 8px 12px 0;
+    font-size: 18px;
+    min-width: 116px;
+  }
+
+  .horizontal-separator.md-container table tr {
+    border-bottom: 1px solid rgb(var(--color-primary-divider));
+  }
 }
 
 /*

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

@@ -3,6 +3,7 @@
     "button": {
       "text": "Отправить заявку"
     },
-    "typeForm": "credit"
+    "typeForm": "credit",
+    "version": "primary"
   }
 }

package/mobile/src/components/ApplicationForm/ApplicationForm.tsx

@@ -31,10 +31,10 @@ export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
   const [responceType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
   const handleSubmit = useCallback(async (data: Record<string, string>) => {
-    const status = await API.send(data);
-    setResponseType(status ? 'OK' : 'Fail');
+    const status = (await API.send(data)) ? 'OK' : 'Fail';
+    setResponseType(status);
 
-    return 'OK';
+    return status;
   }, []);
 
   return (

package/mobile/src/components/ApplicationForm/ApplicationFormAcquiring.tsx

@@ -1,18 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Input } from '../../ui-kit/Input/Input';
 import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
-import { ACQUIRING_TYPES } from './acquiringTypes';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import type { HandleFormStateChange } from './models';
-import { normalizeSelectedRegion } from './normalizeSelectedRegion';
-import { renderSelects } from './renderSelects';
+import { renderAcquiringDataOrganization } from './renderAcquiringDataOrganization';
+import { renderAcquiringRegion } from './renderAcquiringRegion';
 import { renderSlideCheckboxes } from './renderSlideCheckboxes';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useFormHandlers } from './useFormHandlers';
+import { useForm } from './useForm';
 
 export interface AcquiringFormState {
   acquiringType: string;
@@ -25,67 +21,76 @@ export interface AcquiringFormState {
   posTerminal: boolean;
 }
 
+const initialFormState = {
+  acquiringType: 'Торговый эквайринг',
+  region: '',
+  fullName: '',
+  inn: '',
+  name: '',
+  phone: '',
+  onlineСheckout: false,
+  posTerminal: false,
+};
+
+const errorsInitialState = {
+  acquiringType: '',
+  region: '',
+  fullName: '',
+  inn: '',
+  name: '',
+  phone: '',
+};
+
 export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
 
-  const [formState, setFormState] = useState<AcquiringFormState>({
-    acquiringType: '',
-    region: '',
-    fullName: '',
-    inn: '',
-    name: '',
-    phone: '',
-    onlineСheckout: false,
-    posTerminal: false,
-  });
+  const { formState, errors, handleChange, handleChangeErrors, sendForm } =
+    useForm<AcquiringFormState>({
+      initialFormState,
+      errorsInitialState,
+      handleSubmit,
+    });
 
   const { acquiringType, region, fullName, inn, name, phone, onlineСheckout, posTerminal } =
     formState;
 
   const regions = useGetRegions();
 
-  const { handleChange } = useFormHandlers<AcquiringFormState>({
-    setFormState,
-  });
-
-  const selectedRegion = normalizeSelectedRegion(region, regions);
-
-  useEffect(() => {
-    setFormState((oldState) => ({
-      ...oldState,
-      acquiringType:
-        ACQUIRING_TYPES?.length && ACQUIRING_TYPES[0]?.name ? ACQUIRING_TYPES[0].name : '',
-    }));
-  }, []);
-
-  const onSubmit = async (e: PreventableEvent) => {
+  const onSubmit = (e: PreventableEvent) => {
     e.preventDefault();
 
-    const partnerComments = `Вид эквайринга=${acquiringType}/Онлайн касса=${onlineСheckout}/POS-терминал=${posTerminal}`;
-
-    handleSubmit &&
-      (await handleSubmit({
-        typeForm: 'acqr',
-        region: regions.find((_) => _.code === selectedRegion)?.name || '',
-        partnerComments,
-        fullName,
-        inn,
-        name,
-        phone,
-      }));
+    sendForm({
+      typeForm: 'acqr',
+      region: regions.find((_) => _.code === region)?.name || '',
+      partnerComments: `Вид эквайринга=${acquiringType}/Онлайн касса=${onlineСheckout}/POS-терминал=${posTerminal}`,
+      fullName,
+      inn,
+      name,
+      phone,
+    });
   };
 
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Вид эквайринга и регион" className="text-center mb-4" />
-      {renderSelects({
+      {renderAcquiringRegion({
         acquiringType,
         regions,
-        region: selectedRegion,
+        region,
         handleChange,
+        errors,
+        handleChangeErrors,
       })}
       <Heading headingType="h6" title="Данные организации" className="text-center mb-4" />
-      {renderDataOrganization({ fullName, inn, name, phone, handleChange })}
+      {renderAcquiringDataOrganization({
+        fullName,
+        inn,
+        name,
+        phone,
+        handleChange,
+        errors,
+        handleChangeErrors,
+      })}
       {renderSlideCheckboxes({
         onlineСheckout,
         posTerminal,
@@ -96,58 +101,3 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
     </form>
   );
 });
-
-interface RenderDataOrganizationProps {
-  fullName: string;
-  inn: string;
-  name: string;
-  phone: string;
-  handleChange: HandleFormStateChange<AcquiringFormState>;
-}
-
-const renderDataOrganization = ({
-  fullName,
-  inn,
-  name,
-  phone,
-  handleChange,
-}: RenderDataOrganizationProps) => (
-  <div className="flex justify-between gap-5 mb-5">
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="Наименование организации"
-        label="Наименование организации"
-        value={fullName}
-        onChange={(value) => handleChange({ fullName: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full"
-        type="text"
-        aria-label="Контактное лицо"
-        label="Контактное лицо"
-        value={name}
-        onChange={(value) => handleChange({ name: value })}
-      />
-    </div>
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        label="ИНН"
-        aria-label="ИНН"
-        value={inn}
-        onChange={(value) => handleChange({ inn: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full"
-        type="text"
-        label="Телефон"
-        aria-label="Телефон"
-        value={phone}
-        onChange={(value) => handleChange({ phone: value })}
-      />
-    </div>
-  </div>
-);

package/mobile/src/components/ApplicationForm/ApplicationFormBusinessCard.tsx

@@ -1,16 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { Region } from '../../hooks/useRegions';
 import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
-import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import type { HandleFormStateChange } from './models';
-import { normalizeSelectedRegion } from './normalizeSelectedRegion';
+import { renderBusinessCardDataOrganization } from './renderBusinessCardDataOrganization';
+import { renderRegion } from './renderRegion';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useFormHandlers } from './useFormHandlers';
-import { WrapperSelect } from './WrapperSelect';
+import { useForm } from './useForm';
 
 export interface BusinessCardFormState {
   region: string;
@@ -20,128 +16,61 @@ export interface BusinessCardFormState {
   mail: string;
 }
 
+const initialFormState = {
+  region: '',
+  name: '',
+  phone: '',
+  inn: '',
+  mail: '',
+};
+
 export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
 
-  const [formState, setFormState] = useState<BusinessCardFormState>({
-    region: '',
-    name: '',
-    phone: '',
-    inn: '',
-    mail: '',
-  });
+  const { formState, errors, handleChange, handleChangeErrors, sendForm } =
+    useForm<BusinessCardFormState>({
+      initialFormState,
+      errorsInitialState: initialFormState,
+      handleSubmit,
+    });
 
   const { region, name, phone, inn, mail } = formState;
 
   const regions = useGetRegions();
 
-  const { handleChange } = useFormHandlers<BusinessCardFormState>({
-    setFormState,
-  });
-
-  const selectedRegion = normalizeSelectedRegion(region, regions);
-
-  const onSubmit = async (e: PreventableEvent) => {
+  const onSubmit = (e: PreventableEvent) => {
     e.preventDefault();
 
-    handleSubmit &&
-      (await handleSubmit({
-        typeForm: 'bcrd',
-        region: regions.find((_) => _.code === selectedRegion)?.name || '',
-        name,
-        phone,
-        inn,
-        mail,
-      }));
+    sendForm({
+      typeForm: 'bcrd',
+      region: regions.find((_) => _.code === region)?.name || '',
+      name,
+      phone,
+      inn,
+      mail,
+    });
   };
 
   return (
     <form onSubmit={onSubmit} className="container">
       {renderRegion({
         regions,
-        region: selectedRegion,
+        region,
+        handleChange,
+        errors,
+        handleChangeErrors,
+      })}
+      {renderBusinessCardDataOrganization({
+        name,
+        phone,
+        inn,
+        mail,
         handleChange,
+        errors,
+        handleChangeErrors,
       })}
-      {renderDataOrganization({ name, phone, inn, mail, handleChange })}
       {renderSubmitButton(button, 'mb-4')}
       <Footnote link={link} />
     </form>
   );
 });
-
-interface RenderDataOrganizationProps {
-  name: string;
-  phone: string;
-  mail: string;
-  inn: string;
-  handleChange: HandleFormStateChange<BusinessCardFormState>;
-}
-
-const renderDataOrganization = ({
-  name,
-  phone,
-  mail,
-  inn,
-  handleChange,
-}: RenderDataOrganizationProps) => (
-  <div className="flex justify-between gap-5">
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="Контактное лицо"
-        label="Контактное лицо"
-        value={name}
-        onChange={(value) => handleChange({ name: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="ИНН"
-        label="ИНН"
-        value={inn}
-        onChange={(value) => handleChange({ inn: value })}
-      />
-    </div>
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="Телефон"
-        label="Телефон"
-        value={phone}
-        onChange={(value) => handleChange({ phone: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full "
-        type="text"
-        aria-label="Электронная почта"
-        label="Электронная почта"
-        value={mail}
-        onChange={(value) => handleChange({ mail: value })}
-      />
-    </div>
-  </div>
-);
-
-interface RenderRegionProps {
-  regions: Region[];
-  region: string;
-  handleChange: HandleFormStateChange<BusinessCardFormState>;
-}
-
-const renderRegion = ({ regions, region, handleChange }: RenderRegionProps) => (
-  <div className="flex justify-between gap-5 mb-5">
-    <div className="w-full">
-      <WrapperSelect
-        data={regions}
-        fieldValue="code"
-        fieldLabel="name"
-        selected={region}
-        setSelected={(value) => handleChange({ region: value })}
-        label="Регион"
-        placeholder="Выберите регион"
-      />
-    </div>
-  </div>
-);