@redneckz/wildless-cms-uni-blocks 0.10.4 → 0.10.6

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

@@ -1,33 +1,24 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '../../hooks/useBool.js';
 import { useOutsideClick } from '../../hooks/useOutsideClick.js';
 import { Text } from '../../ui-kit/Text/Text.js';
+import { style } from '../../utils/style.js';
 import { Icon } from '../Icon/Icon.js';
-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), []);
-    const wrapperRef = useOutsideClick(handleClickOutside);
-    const choiceOption = (option) => {
-        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, 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] })] }));
+export const Select = JSX(({ className = '', label, options = [], value, valid = true, isBorder = true, placeholder = '', onChange, }) => {
+    const [isOpen, { setFalse: close, toggle }] = useBool();
+    const wrapperRef = useOutsideClick(close);
+    const handleChange = useCallback((option) => {
+        close();
+        onChange && onChange(option);
+    }, [onChange]);
+    const isSelected = (option) => option.key === value?.key;
+    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: style('relative', isOpen ? 'z-20' : 'z-10'), children: [_jsxs("div", { className: style('text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer', getBorderStyle(isBorder, valid)), onClick: toggle, children: [_jsx("p", { className: "p-4 pr-8 h-14 overflow-hidden text-ellipsis whitespace-nowrap", children: formatOption(value) || placeholder }), _jsx(Icon, { className: style('absolute right-3', isOpen ? '' : 'rotate-180'), name: "ArrowUpIcon", width: "16", height: "16" })] }), options?.length ? (_jsx("div", { className: style('h-0', isOpen ? '' : 'overflow-hidden'), 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(handleChange, isOpen, isSelected)) }) })) : null] })] }));
 });
-const renderOptionsStyle = (isOpen) => (isOpen ? '' : 'overflow-hidden');
-const renderOption = (choiceOption, isOpen, isSelected) => (option, i) => {
-    return (_jsxs("div", { onClick: () => {
-            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, valid) => `
-  ${isBorder ? 'border rounded-md hover:border-primary-hover' : ''} ${valid ? ' border-gray' : 'border-error'} `;
+const renderOption = (handleChange, isOpen, isSelected) => (option, i) => (_jsxs("div", { onClick: () => {
+        handleChange(option);
+    }, className: "flex px-4 py-3 cursor-pointer hover:bg-main-divider pr-11 relative", children: [_jsx("span", { className: "min-h-6", children: formatOption(option) }), _jsx(Icon, { name: "DoneSimpleIcon", width: "16", height: "16", className: style('absolute right-4 pt-0.5', isSelected(option) && isOpen ? '' : 'hidden') })] }, String(i)));
+const formatOption = (_) => _?.text || _?.key || '';
+const getBorderStyle = (isBorder, valid) => style(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/lib/ui-kit/SlideCheckbox/SlideCheckbox.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { style } from '../../utils/style.js';
 import { Text } from '../Text/Text.js';
-export const SlideCheckbox = JSX(({ value = false, text, type = 'checkbox', onChange }) => (_jsxs("div", { role: type, "aria-checked": value, className: "flex justify-start items-center w-full cursor-pointer mb-4", onClick: () => onChange && onChange(!value), children: [_jsx("div", { className: `relative flex-shrink-0 duration-300 w-9 h-5 mr-3 rounded-2xl ${value ? 'bg-primary-main' : 'bg-main-divider'}`, children: _jsx("div", { className: `absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full ${value ? 'left-[50%]' : 'left-[5%]'}` }) }), _jsx("div", { children: _jsx(Text, { size: "text-m", font: "font-light", color: "text-primary-text", children: text }) })] })));
+export const SlideCheckbox = JSX(({ value = false, text, type = 'checkbox', onChange }) => (_jsxs("div", { role: type, "aria-checked": value, className: "flex justify-start items-center w-full cursor-pointer mb-3", onClick: () => onChange && onChange(!value), children: [_jsx("div", { className: style('relative flex-shrink-0 duration-300 w-9 h-5 mr-3 rounded-2xl', value ? 'bg-primary-main' : 'bg-main-divider'), children: _jsx("div", { className: style('absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full', value ? 'left-[50%]' : 'left-[5%]') }) }), _jsx(Text, { size: "text-l", font: "font-light", color: "text-primary-text", children: text })] })));
 //# sourceMappingURL=SlideCheckbox.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SlideCheckbox.js","sourceRoot":"","sources":["../../../src/ui-kit/SlideCheckbox/SlideCheckbox.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAQpC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAC9B,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CACxD,eACE,IAAI,EAAE,IAAI,kBACI,KAAK,EACnB,SAAS,EAAC,4DAA4D,EACtE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,KAAK,CAAC,aAE3C,cACE,SAAS,EAAE,gEACT,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAC9B,EAAE,YAEF,cACE,SAAS,EAAE,0EACT,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WACzB,EAAE,GACF,GACE,EACN,wBACE,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,EAAC,KAAK,EAAC,mBAAmB,YAC5D,IAAI,GACA,GACH,IACF,CACP,CACF,CAAC"}
+{"version":3,"file":"SlideCheckbox.js","sourceRoot":"","sources":["../../../src/ui-kit/SlideCheckbox/SlideCheckbox.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAQpC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAC9B,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CACxD,eACE,IAAI,EAAE,IAAI,kBACI,KAAK,EACnB,SAAS,EAAC,4DAA4D,EACtE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,KAAK,CAAC,aAE3C,cACE,SAAS,EAAE,KAAK,CACd,8DAA8D,EAC9D,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAC9C,YAED,cACE,SAAS,EAAE,KAAK,CACd,wEAAwE,EACxE,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CACnC,GACD,GACE,EACN,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,EAAC,KAAK,EAAC,mBAAmB,YAC5D,IAAI,GACA,IACH,CACP,CACF,CAAC"}

package/mobile/lib/validation/and.d.ts

@@ -0,0 +1,2 @@
+import { Validator } from './validator';
+export declare const and: (...validators: Validator[]) => Validator;

package/mobile/lib/validation/and.js

@@ -0,0 +1,2 @@
+export const and = (...validators) => (data) => validators.flatMap((_) => _(data));
+//# sourceMappingURL=and.js.map

package/mobile/lib/validation/and.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"and.js","sourceRoot":"","sources":["../../src/validation/and.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,GAAG,GACd,CAAC,GAAG,UAAuB,EAAa,EAAE,CAC1C,CAAC,IAAI,EAAE,EAAE,CACP,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAmB,CAAC"}

package/mobile/lib/validation/objectValidator.d.ts

@@ -0,0 +1,2 @@
+import { ValidationInfo, Validator } from './validator';
+export declare const objectValidator: <VMap extends Record<string, Validator<any>>>(validatorsMap: VMap) => <O extends Partial<{ [P in keyof VMap]: Parameters<VMap[P]>[0]; }>>(o: O) => ValidationInfo;

package/mobile/lib/validation/objectValidator.js

@@ -0,0 +1,4 @@
+export const objectValidator = (validatorsMap) => (o) => (o &&
+    Object.entries(validatorsMap).flatMap(([key, validator]) => validator(o[key]))) ||
+    [];
+//# sourceMappingURL=objectValidator.js.map

package/mobile/lib/validation/objectValidator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"objectValidator.js","sourceRoot":"","sources":["../../src/validation/objectValidator.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAyC,aAAmB,EAAE,EAAE,CAChE,CAAmE,CAAI,EAAkB,EAAE,CACzF,CAAC,CAAC;IACC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,CAC1D,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CACC,CAAC;IACvB,EAAE,CAAC"}

package/mobile/lib/validation/pattern.d.ts

@@ -0,0 +1 @@
+export declare const pattern: (regexp: RegExp) => (message: string) => import("./validator").Validator<any>;

package/mobile/lib/validation/pattern.js

@@ -0,0 +1,3 @@
+import { validator } from './validator.js';
+export const pattern = (regexp) => validator((_) => typeof _ === 'string' && regexp.test(_));
+//# sourceMappingURL=pattern.js.map

package/mobile/lib/validation/pattern.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pattern.js","sourceRoot":"","sources":["../../src/validation/pattern.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE,CACxC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/mobile/lib/validation/required.d.ts

@@ -0,0 +1 @@
+export declare const required: (message: string) => import("./validator").Validator<any>;

package/mobile/lib/validation/required.js

@@ -0,0 +1,3 @@
+import { validator } from './validator.js';
+export const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
+//# sourceMappingURL=required.js.map

package/mobile/lib/validation/required.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"required.js","sourceRoot":"","sources":["../../src/validation/required.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC"}

package/mobile/lib/validation/validator.d.ts

@@ -0,0 +1,10 @@
+declare type ValidationMessage = string;
+declare type ValidationSuccess = [];
+declare type ValidationErr = [ValidationMessage, ...ValidationMessage[]];
+export declare type ValidationInfo = ValidationSuccess | ValidationErr;
+export declare type Validator<T = any> = (_: T) => ValidationInfo;
+export declare const isValidationSuccess: (info: ValidationInfo) => info is [];
+export declare const isValidationErr: (info: ValidationInfo) => info is ValidationErr;
+declare type Predicate<T = any> = (_: T) => boolean;
+export declare const validator: <T = any>(predicate: Predicate<T>) => (message: string) => Validator<T>;
+export {};

package/mobile/lib/validation/validator.js

@@ -0,0 +1,4 @@
+export const isValidationSuccess = (info) => !info?.length;
+export const isValidationErr = (info) => Boolean(info?.length);
+export const validator = (predicate) => (message) => (_) => predicate(_) ? [] : [message];
+//# sourceMappingURL=validator.js.map

package/mobile/lib/validation/validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/validation/validator.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAoB,EAA6B,EAAE,CACrF,CAAC,IAAI,EAAE,MAAM,CAAC;AAChB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAoB,EAAyB,EAAE,CAC7E,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAIxB,MAAM,CAAC,MAAM,SAAS,GACpB,CAAU,SAAuB,EAAE,EAAE,CACrC,CAAC,OAAe,EAAgB,EAAE,CAClC,CAAC,CAAC,EAAE,EAAE,CACJ,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC"}

package/mobile/lib/validation/withValidator.d.ts

@@ -0,0 +1,10 @@
+import { ValidationInfo, Validator } from './validator';
+interface FieldProps<V> {
+    value?: V;
+    isDirty?: boolean;
+}
+export declare const withValidator: <V, P extends FieldProps<V> = FieldProps<V>>(props: P, validator: Validator<V | undefined>) => P & {
+    errors?: ValidationInfo | undefined;
+    error?: ValidationInfo[0];
+};
+export {};

package/mobile/lib/validation/withValidator.js

@@ -0,0 +1,10 @@
+export const withValidator = (props, validator) => {
+    const { value, isDirty } = props;
+    const errors = isDirty ? validator(value) : [];
+    return {
+        ...props,
+        errors,
+        error: errors[0],
+    };
+};
+//# sourceMappingURL=withValidator.js.map

package/mobile/lib/validation/withValidator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"withValidator.js","sourceRoot":"","sources":["../../src/validation/withValidator.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,KAAQ,EACR,SAAmC,EACyB,EAAE;IAC9D,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEjC,MAAM,MAAM,GAAmB,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/D,OAAO;QACL,GAAG,KAAK;QACR,MAAM;QACN,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;KACjB,CAAC;AACJ,CAAC,CAAC"}

package/mobile/src/components/ApplicationForm/AcquiringFormState.ts

@@ -0,0 +1,12 @@
+import type { Option } from '../../ui-kit/Select/Select';
+
+export interface AcquiringFormState {
+  acquiringType?: Option;
+  region?: Option;
+  fullName: string;
+  inn: string;
+  name: string;
+  phone: string;
+  onlineCheckout: boolean;
+  posTerminal: boolean;
+}

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

@@ -4,6 +4,7 @@ import { CorporateLeadAPI } from '../../api/CorporateLeadAPI';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
+import { style } from '../../utils/style';
 import { ApplicationFormAcquiring } from './ApplicationFormAcquiring';
 import { ApplicationFormBusinessCard } from './ApplicationFormBusinessCard';
 import type { ApplicationFormContent } from './ApplicationFormContent';
@@ -26,9 +27,9 @@ const COMPONENTS_MAP = {
 const API = CorporateLeadAPI();
 
 export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
-  const { className = '', title, typeForm = 'credit', button, link, ...rest } = props;
+  const { className, title, typeForm = 'credit', button, link, ...rest } = props;
 
-  const [responceType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
+  const [responseType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
   const handleSubmit = useCallback(async (data: Record<string, string>) => {
     const status = (await API.send(data)) ? 'OK' : 'Fail';
@@ -38,11 +39,11 @@ export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
   }, []);
 
   return (
-    <BlockWrapper className={`font-sans bg-white p-[50px] pb-9 ${className}`} {...rest}>
+    <BlockWrapper className={style('font-sans bg-white p-12 pb-9', className)} {...rest}>
       <div className="container max-w-[978px]">
         {title ? <Heading headingType="h3" title={title} className="text-center mb-8" /> : null}
-        {COMPONENTS_MAP[typeForm]({ button, link, handleSubmit })}
-        {responceType ? <ResponseNotification responceType={responceType} /> : null}
+        {COMPONENTS_MAP[typeForm]({ button, link, onSubmit: handleSubmit })}
+        {responseType ? <ResponseNotification responseType={responseType} /> : null}
       </div>
     </BlockWrapper>
   );

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

@@ -1,101 +1,73 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
+import { objectValidator } from '../../validation/objectValidator';
+import { isValidationSuccess } from '../../validation/validator';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
+import { AcquiringFormState } from './AcquiringFormState';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
 import { renderAcquiringDataOrganization } from './renderAcquiringDataOrganization';
 import { renderAcquiringRegion } from './renderAcquiringRegion';
 import { renderSlideCheckboxes } from './renderSlideCheckboxes';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useForm } from './useForm';
+import { defaultValidator, innValidator, nameValidator, phoneValidator } from './validators';
 
-export interface AcquiringFormState {
-  acquiringType: string;
-  region: string;
-  fullName: string;
-  inn: string;
-  name: string;
-  phone: string;
-  onlineСheckout: boolean;
-  posTerminal: boolean;
-}
-
-const initialFormState = {
-  acquiringType: 'Торговый эквайринг',
-  region: '',
+const initialFormState: AcquiringFormState = {
+  acquiringType: { key: 'Торговый эквайринг' },
   fullName: '',
   inn: '',
   name: '',
   phone: '',
-  onlineСheckout: false,
+  onlineCheckout: false,
   posTerminal: false,
 };
 
-const errorsInitialState = {
-  acquiringType: '',
-  region: '',
-  fullName: '',
-  inn: '',
-  name: '',
-  phone: '',
-};
+const acquiringValidator = objectValidator({
+  acquiringType: defaultValidator,
+  region: defaultValidator,
+  fullName: defaultValidator,
+  inn: innValidator,
+  name: nameValidator,
+  phone: phoneValidator,
+});
 
 export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
-  const { button, link, handleSubmit } = props;
-
-  const { formState, errors, handleChange, handleChangeErrors, sendForm } =
-    useForm<AcquiringFormState>({
-      initialFormState,
-      errorsInitialState,
-      handleSubmit,
-    });
+  const { button, link, onSubmit } = props;
 
-  const { acquiringType, region, fullName, inn, name, phone, onlineСheckout, posTerminal } =
-    formState;
+  const handleSubmit = useCallback(
+    (formState: AcquiringFormState) => {
+      const { acquiringType, region, fullName, inn, name, phone, onlineCheckout, posTerminal } =
+        formState;
 
-  const regions = useGetRegions();
+      isValidationSuccess(acquiringValidator(formState)) &&
+        onSubmit({
+          typeForm: 'acqr',
+          region: region?.text || '',
+          partnerComments: `Вид эквайринга=${
+            acquiringType?.key || ''
+          }/Онлайн касса=${onlineCheckout}/POS-терминал=${posTerminal}`,
+          fullName,
+          inn,
+          name,
+          phone,
+        });
+    },
+    [onSubmit],
+  );
 
-  const onSubmit = (e: PreventableEvent) => {
-    e.preventDefault();
+  const [, { field, ...formProps }] = useForm(initialFormState, handleSubmit);
 
-    sendForm({
-      typeForm: 'acqr',
-      region: regions.find((_) => _.code === region)?.name || '',
-      partnerComments: `Вид эквайринга=${acquiringType}/Онлайн касса=${onlineСheckout}/POS-терминал=${posTerminal}`,
-      fullName,
-      inn,
-      name,
-      phone,
-    });
-  };
+  const regions = useGetRegions();
 
   return (
-    <form onSubmit={onSubmit} className="container">
+    <form className="container" onSubmit={formProps.onSubmit}>
       <Heading headingType="h6" title="Вид эквайринга и регион" className="text-center mb-4" />
-      {renderAcquiringRegion({
-        acquiringType,
-        regions,
-        region,
-        handleChange,
-        errors,
-        handleChangeErrors,
-      })}
+      {renderAcquiringRegion({ regions, field })}
       <Heading headingType="h6" title="Данные организации" className="text-center mb-4" />
-      {renderAcquiringDataOrganization({
-        fullName,
-        inn,
-        name,
-        phone,
-        handleChange,
-        errors,
-        handleChangeErrors,
-      })}
-      {renderSlideCheckboxes({
-        onlineСheckout,
-        posTerminal,
-        handleChange,
-      })}
+      {renderAcquiringDataOrganization(field)}
+      {renderSlideCheckboxes(field)}
       {renderSubmitButton(button, 'mb-4')}
       <Footnote link={link} />
     </form>

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

@@ -1,74 +1,60 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm';
+import { objectValidator } from '../../validation/objectValidator';
+import { isValidationSuccess } from '../../validation/validator';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
+import { BusinessCardFormState } from './BusinessCardFormState';
 import { Footnote } from './Footnote';
 import { renderBusinessCardDataOrganization } from './renderBusinessCardDataOrganization';
 import { renderRegion } from './renderRegion';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useForm } from './useForm';
+import { defaultValidator, innValidator, nameValidator, phoneValidator } from './validators';
 
-export interface BusinessCardFormState {
-  region: string;
-  name: string;
-  phone: string;
-  inn: string;
-  mail: string;
-}
-
-const initialFormState = {
-  region: '',
+const initialFormState: BusinessCardFormState = {
   name: '',
   phone: '',
   inn: '',
   mail: '',
 };
 
-export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) => {
-  const { button, link, handleSubmit } = props;
+const businessCardValidator = objectValidator({
+  region: defaultValidator,
+  name: nameValidator,
+  phone: phoneValidator,
+  inn: innValidator,
+  mail: defaultValidator,
+});
 
-  const { formState, errors, handleChange, handleChangeErrors, sendForm } =
-    useForm<BusinessCardFormState>({
-      initialFormState,
-      errorsInitialState: initialFormState,
-      handleSubmit,
-    });
+export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) => {
+  const { button, link, onSubmit } = props;
+
+  const handleSubmit = useCallback(
+    (formState: BusinessCardFormState) => {
+      const { region, name, phone, inn, mail } = formState;
+
+      isValidationSuccess(businessCardValidator(formState)) &&
+        onSubmit({
+          typeForm: 'bcrd',
+          region: region?.text || '',
+          name,
+          phone,
+          inn,
+          mail,
+        });
+    },
+    [onSubmit],
+  );
 
-  const { region, name, phone, inn, mail } = formState;
+  const [, { field, ...formProps }] = useForm(initialFormState, handleSubmit);
 
   const regions = useGetRegions();
 
-  const onSubmit = (e: PreventableEvent) => {
-    e.preventDefault();
-
-    sendForm({
-      typeForm: 'bcrd',
-      region: regions.find((_) => _.code === region)?.name || '',
-      name,
-      phone,
-      inn,
-      mail,
-    });
-  };
-
   return (
-    <form onSubmit={onSubmit} className="container">
-      {renderRegion({
-        regions,
-        region,
-        handleChange,
-        errors,
-        handleChangeErrors,
-      })}
-      {renderBusinessCardDataOrganization({
-        name,
-        phone,
-        inn,
-        mail,
-        handleChange,
-        errors,
-        handleChangeErrors,
-      })}
+    <form className="container" onSubmit={formProps.onSubmit}>
+      {renderRegion({ regions, field })}
+      {renderBusinessCardDataOrganization(field)}
       {renderSubmitButton(button, 'mb-4')}
       <Footnote link={link} />
     </form>