@redneckz/wildless-cms-uni-blocks 0.14.617 → 0.14.619

package/mobile/lib/ui-kit/FormField/Fields/LastJobExperienceField.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl.js';
+import { InputControl } from '../../Input/InputControl.js';
 import { validatorObj } from '../getObjectValidator.js';
 import { getValidation } from '../getValidation.js';
-export const LastJobExperienceField = JSX(({ field, input }) => (_jsx(InputNumberControl, { label: "\u0421\u0442\u0430\u0436 \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0440\u0430\u0431\u043E\u0447\u0435\u043C \u043C\u0435\u0441\u0442\u0435", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", inputLength: 2, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required), ...input })));
+export const LastJobExperienceField = JSX(({ field, input }) => (_jsx(InputControl, { label: "\u0421\u0442\u0430\u0436 \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0440\u0430\u0431\u043E\u0447\u0435\u043C \u043C\u0435\u0441\u0442\u0435", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", inputLength: 2, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required), ...input })));
 //# sourceMappingURL=LastJobExperienceField.js.map

package/mobile/lib/ui-kit/FormField/Fields/LastJobExperienceField.js.map

@@ -1 +1 @@
-{"version":3,"file":"LastJobExperienceField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/LastJobExperienceField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAChF,KAAC,kBAAkB,IACjB,KAAK,EAAC,wKAAiC,EACvC,WAAW,EAAC,iFAAgB,EAC5B,WAAW,EAAE,CAAC,KACV,aAAa,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,YAAY,CAAC,iBAAiB,EAAE,KAAK,EAAE,QAAQ,CAAC,KAC1F,KAAK,GACT,CACH,CAAC,CAAC"}
+{"version":3,"file":"LastJobExperienceField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/LastJobExperienceField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAChF,KAAC,YAAY,IACX,KAAK,EAAC,wKAAiC,EACvC,WAAW,EAAC,iFAAgB,EAC5B,WAAW,EAAE,CAAC,KACV,aAAa,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,YAAY,CAAC,iBAAiB,EAAE,KAAK,EAAE,QAAQ,CAAC,KAC1F,KAAK,GACT,CACH,CAAC,CAAC"}

package/mobile/lib/ui-kit/FormField/Fields/PartInBusinessField.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl.js';
+import { InputControl } from '../../Input/InputControl.js';
 import { validatorObj } from '../getObjectValidator.js';
 import { getValidation } from '../getValidation.js';
-export const PartInBusinessField = JSX(({ field, input }) => (_jsx(InputNumberControl, { label: "\u0414\u043E\u043B\u044F \u0443\u0447\u0430\u0441\u0442\u0438\u044F \u0432 \u0431\u0438\u0437\u043D\u0435\u0441\u0435", placeholder: "\u0432 %", inputLength: 2, ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required), ...input })));
+export const PartInBusinessField = JSX(({ field, input }) => (_jsx(InputControl, { label: "\u0414\u043E\u043B\u044F \u0443\u0447\u0430\u0441\u0442\u0438\u044F \u0432 \u0431\u0438\u0437\u043D\u0435\u0441\u0435", placeholder: "\u0432 %", inputLength: 2, ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required), ...input })));
 //# sourceMappingURL=PartInBusinessField.js.map

package/mobile/lib/ui-kit/FormField/Fields/PartInBusinessField.js.map

@@ -1 +1 @@
-{"version":3,"file":"PartInBusinessField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/PartInBusinessField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAC7E,KAAC,kBAAkB,IACjB,KAAK,EAAC,uHAAwB,EAC9B,WAAW,EAAC,UAAK,EACjB,WAAW,EAAE,CAAC,KACV,aAAa,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,KACpF,KAAK,GACT,CACH,CAAC,CAAC"}
+{"version":3,"file":"PartInBusinessField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/PartInBusinessField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAC7E,KAAC,YAAY,IACX,KAAK,EAAC,uHAAwB,EAC9B,WAAW,EAAC,UAAK,EACjB,WAAW,EAAE,CAAC,KACV,aAAa,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,KACpF,KAAK,GACT,CACH,CAAC,CAAC"}

package/mobile/lib/ui-kit/Input/InputControl.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 { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
 import { getRequiredLabel } from '../../utils/getRequiredLabel.js';
@@ -8,9 +9,10 @@ import { style } from '../../utils/style.js';
 import { Input } from './Input.js';
 import { renderErrorText } from './renderErrorText.js';
 import { useInputPopup } from './useInputPopup.js';
-export const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, dadata = false, }) => {
+export const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, inputLength, dadata = false, }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
     const popupRef = useOutsideClick(close);
+    const handleChange = useCallback((v) => (inputLength ? v.length <= inputLength && onChange(v) : onChange(v)), [onChange]);
     const inputRef = useInputPopup({
         isOpen: isOpen && dadata,
         name,
@@ -19,7 +21,7 @@ export const InputControl = JSX(({ className, label, value = '', placeholder, er
         onChange,
         onDaDataChange,
     });
-    return (_jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: close, onFocus: open, children: [_jsx("div", { ref: inputRef, children: _jsx(Input, { type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), value: value, onChange: onChange, onBlur: onBlur, isTextarea: isTextarea, placeholder: getPlaceholder(placeholder, errors, label) }) }), renderErrorText(error)] }));
+    return (_jsxs("div", { className: style('shrink-0 w-full', className), ref: popupRef, onBlur: close, onFocus: open, children: [_jsx("div", { ref: inputRef, children: _jsx(Input, { type: type || 'text', "aria-label": label, label: getRequiredLabel({ label, errors }), valid: Boolean(!error), value: value, onChange: handleChange, onBlur: onBlur, isTextarea: isTextarea, placeholder: getPlaceholder(placeholder, errors, label) }) }), renderErrorText(error)] }));
 });
 const getPlaceholder = (placeholder, errors, label) => errors && !label ? `${placeholder}*` : placeholder;
 //# sourceMappingURL=InputControl.js.map

package/mobile/lib/ui-kit/Input/InputControl.js.map

@@ -1 +1 @@
-{"version":3,"file":"InputControl.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/InputControl.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,WAAW,EACX,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,IAAI,EACf,cAAc,EACd,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,iBAAiB,EACjB,MAAM,GAAG,KAAK,GACf,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,eAAe,CAAiB,KAAK,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,aAAa,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,MAAM;QACxB,IAAI;QACJ,KAAK;QACL,iBAAiB;QACjB,QAAQ;QACR,cAAc;KACf,CAAC,CAAC;IAEH,OAAO,CACL,eACE,SAAS,EAAE,KAAK,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAC9C,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,IAAI,aAEb,cAAK,GAAG,EAAE,QAAQ,YAChB,KAAC,KAAK,IACJ,IAAI,EAAE,IAAI,IAAI,MAAM,gBACR,KAAK,EACjB,KAAK,EAAE,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAC1C,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,EACtB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,GACvD,GACE,EACL,eAAe,CAAC,KAAK,CAAC,IACnB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,MAAiB,EAAE,KAAc,EAAE,EAAE,CACjF,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC"}
+{"version":3,"file":"InputControl.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/InputControl.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,WAAW,EACX,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,IAAI,EACf,cAAc,EACd,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,iBAAiB,EACjB,WAAW,EACX,MAAM,GAAG,KAAK,GACf,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,eAAe,CAAiB,KAAK,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,WAAW,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACnF,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,QAAQ,GAAG,aAAa,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,MAAM;QACxB,IAAI;QACJ,KAAK;QACL,iBAAiB;QACjB,QAAQ;QACR,cAAc;KACf,CAAC,CAAC;IAEH,OAAO,CACL,eACE,SAAS,EAAE,KAAK,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAC9C,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,IAAI,aAEb,cAAK,GAAG,EAAE,QAAQ,YAChB,KAAC,KAAK,IACJ,IAAI,EAAE,IAAI,IAAI,MAAM,gBACR,KAAK,EACjB,KAAK,EAAE,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAC1C,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,EACtB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,GACvD,GACE,EACL,eAAe,CAAC,KAAK,CAAC,IACnB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,MAAiB,EAAE,KAAc,EAAE,EAAE,CACjF,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC"}

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

@@ -23,6 +23,7 @@ import { renderAgreementSubmit } from './renderAgreementSubmit';
 import { renderContacts } from './renderContacts';
 
 interface ApplicationFormProps extends ApplicationFormContent, UniBlockProps {}
+
 const API = LeadServiceAPI();
 
 export const ApplicationForm = JSX<ApplicationFormProps>(
@@ -48,7 +49,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
         const inputsFiltered = getFilteredInputs(inputs, formData);
         const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
         if (!isValidationSuccess(feedbackValidator(formData))) {
-          return 'Fail';
+          return console.warn('validation fail');
         }
         const formatData = getFormatData({ ...formData, ...additionalParams });
         const status = (await API.send(formatData, endpoint === 'lead')) ? 'OK' : 'Fail';
@@ -108,15 +109,13 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
 
 const getFilteredInputs = (inputs: FieldDef[], data: FormState) =>
   inputs
-    .filter((_) => _)
+    .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
     .filter(
       (input) =>
         !input?.condition ||
         input?.condition.values.find((_) => {
           const dataValue = data?.[input?.condition?.name ?? ''];
 
-          return input.name === 'secondaryPhone'
-            ? Boolean(data.secondaryPhone)
-            : _ === (dataValue?.key ?? dataValue);
+          return _ === (dataValue?.key ?? dataValue);
         }),
     );

package/mobile/src/ui-kit/FormField/Fields/DependentsField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const DependentsField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Количество иждивенцев"
     placeholder="За исключение детей до 18 лет"
     inputLength={2}

package/mobile/src/ui-kit/FormField/Fields/DulNumberField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Номер документа"
     inputLength={6}
     {...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required)}

package/mobile/src/ui-kit/FormField/Fields/DulSerieField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Серия документа"
     inputLength={4}
     {...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required)}

package/mobile/src/ui-kit/FormField/Fields/DulSubdivisionCodeField.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -12,7 +12,7 @@ export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input })
   }, []);
 
   return (
-    <InputNumberControl
+    <InputControl
       label="Код подразделения"
       {...input}
       inputLength={6}

package/mobile/src/ui-kit/FormField/Fields/Experience5YearsField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Стаж"
     placeholder="За последние 5 лет"
     inputLength={2}

package/mobile/src/ui-kit/FormField/Fields/FamilyMembersField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const FamilyMembersField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Количество членов семьи"
     placeholder="Введите значение"
     inputLength={2}

package/mobile/src/ui-kit/FormField/Fields/GeneralSeniorityField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Общий стаж"
     inputLength={2}
     placeholder="Количество лет"

package/mobile/src/ui-kit/FormField/Fields/InnField.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -13,8 +13,9 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
   }, []);
 
   return (
-    <InputNumberControl
+    <InputControl
       label="ИНН"
+      type="number"
       inputLength={12}
       {...input}
       {...getValidation(field('inn'), validatorObj.inn, input?.required)}

package/mobile/src/ui-kit/FormField/Fields/JobsNumberField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Количество мест работы за последние 5 лет"
     placeholder="Количество мест"
     inputLength={2}

package/mobile/src/ui-kit/FormField/Fields/LastJobExperienceField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Стаж на последнем рабочем месте"
     placeholder="Количество лет"
     inputLength={2}

package/mobile/src/ui-kit/FormField/Fields/PartInBusinessField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Доля участия в бизнесе"
     placeholder="в %"
     inputLength={2}

package/mobile/src/ui-kit/Input/InputControl.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
 import { getRequiredLabel } from '../../utils/getRequiredLabel';
@@ -24,11 +25,17 @@ export const InputControl = JSX<InputProps>(
     type,
     name = '',
     daDataQueryPrefix,
+    inputLength,
     dadata = false,
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
     const popupRef = useOutsideClick<HTMLDivElement>(close);
 
+    const handleChange = useCallback(
+      (v: string) => (inputLength ? v.length <= inputLength && onChange(v) : onChange(v)),
+      [onChange],
+    );
+
     const inputRef = useInputPopup({
       isOpen: isOpen && dadata,
       name,
@@ -52,7 +59,7 @@ export const InputControl = JSX<InputProps>(
             label={getRequiredLabel({ label, errors })}
             valid={Boolean(!error)}
             value={value}
-            onChange={onChange}
+            onChange={handleChange}
             onBlur={onBlur}
             isTextarea={isTextarea}
             placeholder={getPlaceholder(placeholder, errors, label)}

package/package.json

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

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -23,6 +23,7 @@ import { renderAgreementSubmit } from './renderAgreementSubmit';
 import { renderContacts } from './renderContacts';
 
 interface ApplicationFormProps extends ApplicationFormContent, UniBlockProps {}
+
 const API = LeadServiceAPI();
 
 export const ApplicationForm = JSX<ApplicationFormProps>(
@@ -48,7 +49,7 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
         const inputsFiltered = getFilteredInputs(inputs, formData);
         const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
         if (!isValidationSuccess(feedbackValidator(formData))) {
-          return 'Fail';
+          return console.warn('validation fail');
         }
         const formatData = getFormatData({ ...formData, ...additionalParams });
         const status = (await API.send(formatData, endpoint === 'lead')) ? 'OK' : 'Fail';
@@ -108,15 +109,13 @@ export const ApplicationForm = JSX<ApplicationFormProps>(
 
 const getFilteredInputs = (inputs: FieldDef[], data: FormState) =>
   inputs
-    .filter((_) => _)
+    .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
     .filter(
       (input) =>
         !input?.condition ||
         input?.condition.values.find((_) => {
           const dataValue = data?.[input?.condition?.name ?? ''];
 
-          return input.name === 'secondaryPhone'
-            ? Boolean(data.secondaryPhone)
-            : _ === (dataValue?.key ?? dataValue);
+          return _ === (dataValue?.key ?? dataValue);
         }),
     );

package/src/ui-kit/FormField/Fields/DependentsField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const DependentsField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Количество иждивенцев"
     placeholder="За исключение детей до 18 лет"
     inputLength={2}

package/src/ui-kit/FormField/Fields/DulNumberField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Номер документа"
     inputLength={6}
     {...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required)}

package/src/ui-kit/FormField/Fields/DulSerieField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Серия документа"
     inputLength={4}
     {...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required)}

package/src/ui-kit/FormField/Fields/DulSubdivisionCodeField.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -12,7 +12,7 @@ export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input })
   }, []);
 
   return (
-    <InputNumberControl
+    <InputControl
       label="Код подразделения"
       {...input}
       inputLength={6}

package/src/ui-kit/FormField/Fields/Experience5YearsField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Стаж"
     placeholder="За последние 5 лет"
     inputLength={2}

package/src/ui-kit/FormField/Fields/FamilyMembersField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const FamilyMembersField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Количество членов семьи"
     placeholder="Введите значение"
     inputLength={2}

package/src/ui-kit/FormField/Fields/GeneralSeniorityField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Общий стаж"
     inputLength={2}
     placeholder="Количество лет"

package/src/ui-kit/FormField/Fields/InnField.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -13,8 +13,9 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
   }, []);
 
   return (
-    <InputNumberControl
+    <InputControl
       label="ИНН"
+      type="number"
       inputLength={12}
       {...input}
       {...getValidation(field('inn'), validatorObj.inn, input?.required)}

package/src/ui-kit/FormField/Fields/JobsNumberField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Количество мест работы за последние 5 лет"
     placeholder="Количество мест"
     inputLength={2}

package/src/ui-kit/FormField/Fields/LastJobExperienceField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Стаж на последнем рабочем месте"
     placeholder="Количество лет"
     inputLength={2}

package/src/ui-kit/FormField/Fields/PartInBusinessField.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputNumberControl } from '../../Input/InputNumberControl';
+import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
 export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputNumberControl
+  <InputControl
     label="Доля участия в бизнесе"
     placeholder="в %"
     inputLength={2}

package/src/ui-kit/Input/InputControl.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
 import { getRequiredLabel } from '../../utils/getRequiredLabel';
@@ -24,11 +25,17 @@ export const InputControl = JSX<InputProps>(
     type,
     name = '',
     daDataQueryPrefix,
+    inputLength,
     dadata = false,
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
     const popupRef = useOutsideClick<HTMLDivElement>(close);
 
+    const handleChange = useCallback(
+      (v: string) => (inputLength ? v.length <= inputLength && onChange(v) : onChange(v)),
+      [onChange],
+    );
+
     const inputRef = useInputPopup({
       isOpen: isOpen && dadata,
       name,
@@ -52,7 +59,7 @@ export const InputControl = JSX<InputProps>(
             label={getRequiredLabel({ label, errors })}
             valid={Boolean(!error)}
             value={value}
-            onChange={onChange}
+            onChange={handleChange}
             onBlur={onBlur}
             isTextarea={isTextarea}
             placeholder={getPlaceholder(placeholder, errors, label)}

package/bundle/ui-kit/Input/InputNumberControl.d.ts

@@ -1,2 +0,0 @@
-import { type InputProps } from './InputProps';
-export declare const InputNumberControl: import("@redneckz/uni-jsx").UNIComponent<InputProps<string>, any, any>;

package/bundle/ui-kit/InputNumber/InputNumber.d.ts

@@ -1,2 +0,0 @@
-import { type InputProps } from '../Input/InputProps';
-export declare const InputNumber: import("@redneckz/uni-jsx").UNIComponent<InputProps<string>, any, any>;

package/dist/ui-kit/Input/InputNumberControl.d.ts

@@ -1,2 +0,0 @@
-import { type InputProps } from './InputProps';
-export declare const InputNumberControl: import("@redneckz/uni-jsx").UNIComponent<InputProps<string>, any, any>;

package/dist/ui-kit/Input/InputNumberControl.js

@@ -1,10 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InputNumberControl = void 0;
-const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
-const uni_jsx_1 = require("@redneckz/uni-jsx");
-const getRequiredLabel_1 = require("../../utils/getRequiredLabel");
-const style_1 = require("../../utils/style");
-const InputNumber_1 = require("../InputNumber/InputNumber");
-const renderErrorText_1 = require("./renderErrorText");
-exports.InputNumberControl = (0, uni_jsx_1.JSX)(({ className, label, error, ...rest }) => ((0, jsx_runtime_1.jsxs)("div", { className: (0, style_1.style)('shrink-0 w-full', className), children: [(0, jsx_runtime_1.jsx)(InputNumber_1.InputNumber, { "aria-label": label, label: (0, getRequiredLabel_1.getRequiredLabel)({ label, errors: rest?.errors }), valid: Boolean(!error), ...rest }), (0, renderErrorText_1.renderErrorText)(error)] })));
-//# sourceMappingURL=InputNumberControl.js.map

package/dist/ui-kit/Input/InputNumberControl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"InputNumberControl.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/InputNumberControl.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,mEAAgE;AAChE,6CAA0C;AAC1C,4DAAyD;AAEzD,uDAAoD;AAEvC,QAAA,kBAAkB,GAAG,IAAA,aAAG,EAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CAC1F,iCAAK,SAAS,EAAE,IAAA,aAAK,EAAC,iBAAiB,EAAE,SAAS,CAAC,aACjD,uBAAC,yBAAW,kBACE,KAAK,EACjB,KAAK,EAAE,IAAA,mCAAgB,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EACxD,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,KAClB,IAAI,GACR,EACD,IAAA,iCAAe,EAAC,KAAK,CAAC,IACnB,CACP,CAAC,CAAC"}

package/dist/ui-kit/InputNumber/InputNumber.d.ts

@@ -1,2 +0,0 @@
-import { type InputProps } from '../Input/InputProps';
-export declare const InputNumber: import("@redneckz/uni-jsx").UNIComponent<InputProps<string>, any, any>;