@redneckz/wildless-cms-uni-blocks 0.14.589 → 0.14.591

package/mobile/lib/ui-kit/FormField/validators.d.ts

@@ -1,11 +1,11 @@
-export declare const defaultValidator: import("../../validation/validator").Validator<any>;
+export declare const defaultValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
 export declare const defaultSelectValidator: import("../../validation/validator").Validator<any>;
-export declare const nameValidator: import("../../validation/validator").Validator<any>;
-export declare const lengthStringValidator: (maxLength: number) => import("../../validation/validator").Validator<any>;
-export declare const serieValidator: import("../../validation/validator").Validator<any>;
-export declare const numberValidator: import("../../validation/validator").Validator<any>;
-export declare const innValidator: import("../../validation/validator").Validator<any>;
-export declare const phoneValidator: import("../../validation/validator").Validator<any>;
+export declare const nameValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
+export declare const lengthStringValidator: (maxLength: number, errorMsg?: string) => import("../../validation/validator").Validator<any>;
+export declare const serieValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
+export declare const numberValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
+export declare const innValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
+export declare const phoneValidator: (errorMsg: string) => import("../../validation/validator").Validator<any>;
 export declare const agreementValidator: import("../../validation/validator").Validator<any>;
-export declare const snilsValidator: import("../../validation/validator").Validator<string>;
-export declare const emailValidator: import("../../validation/validator").Validator<string>;
+export declare const snilsValidator: (errorMsg: string) => import("../../validation/validator").Validator<string>;
+export declare const emailValidator: (errorMsg: string) => import("../../validation/validator").Validator<string>;

package/mobile/lib/ui-kit/FormField/validators.js

@@ -2,14 +2,14 @@ import { pattern } from '../../validation/pattern.js';
 import { required } from '../../validation/required.js';
 import { validator } from '../../validation/validator.js';
 const ERROR_MESSAGE = 'Некорректно заполненное поле';
-export const defaultValidator = required(ERROR_MESSAGE);
+export const defaultValidator = (errorMsg) => required(errorMsg ? errorMsg : ERROR_MESSAGE);
 export const defaultSelectValidator = validator((_) => _?.key && _?.key !== '')(ERROR_MESSAGE);
-export const nameValidator = validator((_) => typeof _ === 'string' && _.length > 1)(ERROR_MESSAGE);
-export const lengthStringValidator = (maxLength) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= maxLength)(ERROR_MESSAGE);
-export const serieValidator = validator((_) => typeof _ === 'string' && _.length === 4)(ERROR_MESSAGE);
-export const numberValidator = validator((_) => typeof _ === 'string' && _.length === 6)(ERROR_MESSAGE);
-export const innValidator = validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(ERROR_MESSAGE);
-export const phoneValidator = pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(ERROR_MESSAGE);
+export const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1)(errorMsg ? errorMsg : ERROR_MESSAGE);
+export const lengthStringValidator = (maxLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= maxLength)(errorMsg ? errorMsg : ERROR_MESSAGE);
+export const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
+export const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
+export const innValidator = (errorMsg) => validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
+export const phoneValidator = (errorMsg) => pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(errorMsg);
 export const agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
 const snilsValidate = (snils) => {
     const snl = String(snils).replace(/[^0-9]+/g, '');
@@ -28,7 +28,7 @@ const snilsValidate = (snils) => {
     }
     return false;
 };
-export const snilsValidator = validator(snilsValidate)(ERROR_MESSAGE);
+export const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
 const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2}$/.test(email);
-export const emailValidator = validator((_) => emailValidate(_))(ERROR_MESSAGE);
+export const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
 //# sourceMappingURL=validators.js.map

package/mobile/lib/ui-kit/FormField/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAExD,MAAM,CAAC,MAAM,sBAAsB,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC;AAE/F,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;AAEpG,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAiB,EAAE,EAAE,CACzD,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CACrF,aAAa,CACd,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CACtF,aAAa,CACd,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,IAAI,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CACrE,CAAC,aAAa,CAAC,CAAC;AAEjB,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CACnC,wEAAwE,CACzE,CAAC,aAAa,CAAC,CAAC;AAEjB,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAC7E,sBAAsB,CACvB,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE;QACrB,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/C;QACD,IAAI,QAAQ,GAAG,GAAG,EAAE;YAClB,QAAQ,GAAG,QAAQ,GAAG,GAAG,CAAC;SAC3B;QACD,IAAI,QAAQ,KAAK,GAAG,IAAI,QAAQ,KAAK,GAAG,EAAE;YACxC,QAAQ,GAAG,CAAC,CAAC;SACd;QAED,OAAO,QAAQ,KAAK,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7C;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC,aAAa,CAAC,CAAC;AAEtE,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,gCAAgC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAEtF,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":"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"}

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

@@ -7,17 +7,18 @@ import { renderLabel } from './renderLabel.js';
 export const Input = JSX(({ key, className = '', id, name, type = 'text', label, placeholder, value = '', valid = true, children, onChange, onFocus, onBlur, pattern, autoFocus = false, isTextarea = false, }) => {
     const inputRef = useRef(null);
     const handleChange = useCallback((e) => {
-        onChange && onChange(e.target?.value || '');
+        const valueWithoutSpace = (e.target?.value || '').trimStart();
+        onChange && onChange(valueWithoutSpace);
     }, [onChange]);
     useEffect(() => {
         if (autoFocus) {
             inputRef.current?.focus();
         }
     }, [autoFocus, inputRef]);
-    const defaultStyle = 'w-full border rounded-md text-primary-text outline-none p-m';
     const paddingStyle = children ? 'pr-3xl' : '';
     const validStyle = getValidStyle(valid);
     return (_jsxs("div", { className: style('relative', className), children: [_jsxs("label", { className: "space-y-xs", children: [renderLabel(label), isTextarea ? (_jsx("textarea", { className: style('block resize-y min-h-24', defaultStyle, validStyle), id: style('textarea', id), name: name || id, placeholder: placeholder, value: value, onChange: handleChange, onFocus: onFocus, onBlur: onBlur }, key)) : (_jsx("input", { type: type, className: style('h-14', defaultStyle, paddingStyle, validStyle), ref: inputRef, id: id, name: name || id, placeholder: placeholder, value: value, onChange: handleChange, onFocus: onFocus, onBlur: onBlur, pattern: pattern }, key))] }), children] }));
 });
 const getValidStyle = (valid) => (valid ? inputValidStyle : 'border-error');
+const defaultStyle = 'w-full border rounded-md text-primary-text outline-none p-m';
 //# sourceMappingURL=Input.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/Input.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CACtB,CAAC,EACC,GAAG,EACH,SAAS,GAAG,EAAE,EACd,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,MAAM,EACb,KAAK,EACL,WAAW,EACX,KAAK,GAAG,EAAE,EACV,KAAK,GAAG,IAAI,EACZ,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,SAAS,GAAG,KAAK,EACjB,UAAU,GAAG,KAAK,GACnB,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,MAAM,CAA0B,IAAI,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAkC,EAAE,EAAE;QACrC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,EAAE;YACb,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3B;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC1B,MAAM,YAAY,GAAG,6DAA6D,CAAC;IACnF,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAExC,OAAO,CACL,eAAK,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,aAC1C,iBAAO,SAAS,EAAC,YAAY,aAC1B,WAAW,CAAC,KAAK,CAAC,EAClB,UAAU,CAAC,CAAC,CAAC,CACZ,mBACE,SAAS,EAAE,KAAK,CAAC,yBAAyB,EAAE,YAAY,EAAE,UAAU,CAAC,EAErE,EAAE,EAAE,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,EACzB,IAAI,EAAE,IAAI,IAAI,EAAE,EAChB,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,IAPT,GAAG,CAQR,CACH,CAAC,CAAC,CAAC,CACF,gBACE,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,CAAC,EAChE,GAAG,EAAE,QAAQ,EAEb,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,IAAI,IAAI,EAAE,EAChB,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,IARX,GAAG,CASR,CACH,IACK,EACP,QAAQ,IACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC"}
+{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/Input.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CACtB,CAAC,EACC,GAAG,EACH,SAAS,GAAG,EAAE,EACd,EAAE,EACF,IAAI,EACJ,IAAI,GAAG,MAAM,EACb,KAAK,EACL,WAAW,EACX,KAAK,GAAG,EAAE,EACV,KAAK,GAAG,IAAI,EACZ,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,SAAS,GAAG,KAAK,EACjB,UAAU,GAAG,KAAK,GACnB,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,MAAM,CAA0B,IAAI,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAkC,EAAE,EAAE;QACrC,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9D,QAAQ,IAAI,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,SAAS,EAAE;YACb,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;SAC3B;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE1B,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAExC,OAAO,CACL,eAAK,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,aAC1C,iBAAO,SAAS,EAAC,YAAY,aAC1B,WAAW,CAAC,KAAK,CAAC,EAClB,UAAU,CAAC,CAAC,CAAC,CACZ,mBACE,SAAS,EAAE,KAAK,CAAC,yBAAyB,EAAE,YAAY,EAAE,UAAU,CAAC,EAErE,EAAE,EAAE,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,EACzB,IAAI,EAAE,IAAI,IAAI,EAAE,EAChB,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,IAPT,GAAG,CAQR,CACH,CAAC,CAAC,CAAC,CACF,gBACE,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,CAAC,EAChE,GAAG,EAAE,QAAQ,EAEb,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,IAAI,IAAI,EAAE,EAChB,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,IARX,GAAG,CASR,CACH,IACK,EACP,QAAQ,IACL,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;AAErF,MAAM,YAAY,GAAG,6DAA6D,CAAC"}

package/mobile/src/hooks/useElementSpace.ts

@@ -0,0 +1,25 @@
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type RefObject } from 'react';
+
+export const useElementSpace = (ref: RefObject<HTMLElement>, heightEl: number) => {
+  const [spaceAbove, setSpaceAbove] = useState(false);
+
+  useEffect(() => {
+    const handleResize = () => {
+      if (ref?.current) {
+        const { top } = ref.current.getBoundingClientRect();
+
+        const hasSpaceAbove = top > heightEl;
+
+        setSpaceAbove(hasSpaceAbove);
+      }
+    };
+
+    handleResize();
+    window.addEventListener('resize', handleResize);
+
+    return () => window.removeEventListener('resize', handleResize);
+  }, [ref]);
+
+  return spaceAbove;
+};

package/mobile/src/ui-kit/DatePicker/DatePicker.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { useElementSpace } from '../../hooks/useElementSpace';
 import { type LabelProps } from '../../model/HeadlineType';
 import { type IconVersion } from '../../model/IconVersion';
 import { formatDate } from '../../utils/formatDate';
@@ -65,13 +66,19 @@ export const DatePicker = JSX<DatePickerProps>(
       showCalendar,
     });
 
+    const spaceAbove = useElementSpace(ref, 370);
+
     return (
       <div className={style('space-y-xs', className)} ref={ref}>
         {renderLabel(label)}
         <div className="relative">
           {renderDatePickerForm(handleChangeVisibleCalendar, value, valid)}
           {showCalendar ? (
-            <div className="absolute bg-white z-20 select-none bottom-full">
+            <div
+              className={style('absolute bg-white z-20 select-none', {
+                'bottom-full': spaceAbove,
+              })}
+            >
               <div className="flex gap-s">
                 <div className="my-auto" onClick={handlePrevMonth}>
                   <Icon {...ICON_PROPS} className="-rotate-90 cursor-pointer" />
@@ -99,6 +106,7 @@ export const DatePicker = JSX<DatePickerProps>(
                 onDateSelect={onChange}
                 min={minDate}
                 max={maxDate}
+                setValue={setValue}
               />
             </div>
           ) : null}

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

@@ -1,7 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
 export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl label="Отчество (Обязательно, при наличии)" {...field('middleName')} {...input} />
+  <InputControl
+    label="Отчество (Обязательно, при наличии)"
+    {...getValidation(field('middleName'), validatorObj.middleName)}
+    {...input}
+  />
 ));

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -16,50 +16,51 @@ import {
 } from './validators';
 
 export const validatorObj: Record<string, Validator> = {
-  typeForm: defaultValidator,
-  surname: nameValidator,
-  name: nameValidator,
+  typeForm: defaultValidator(),
+  surname: nameValidator('Укажите свою фамилию'),
+  name: nameValidator('Укажите своё имя'),
+  middleName: nameValidator('Укажите своё отчество'),
   region: defaultSelectValidator,
   addressBranch: defaultSelectValidator,
-  phone: phoneValidator,
-  secondaryPhone: phoneValidator,
-  birthday: defaultValidator,
-  education: defaultValidator,
-  housing: defaultValidator,
-  employment: defaultValidator,
-  organization: defaultValidator,
-  amountWorkers: defaultValidator,
-  employerActivities: defaultValidator,
-  employerOrganization: defaultValidator,
-  positionOrganization: defaultValidator,
-  email: emailValidator,
-  dulSerie: serieValidator,
-  dulNumber: numberValidator,
-  dulIssueDateField: defaultValidator,
-  dulSubdivisionCode: numberValidator,
-  dulIssuedBy: defaultValidator,
-  fullName: nameValidator,
-  inn: innValidator,
-  legalForm: defaultValidator,
-  organizationName: defaultValidator,
-  generalSeniority: defaultValidator,
-  lastJobExperience: defaultValidator,
-  experience5Years: defaultValidator,
-  jobsNumber: defaultValidator,
-  beginDate: defaultValidator,
-  fullAddress: defaultValidator,
-  partnerComments: defaultValidator,
-  collectionCount: defaultValidator,
-  comment: defaultValidator,
+  phone: phoneValidator('Укажите номер телефона'),
+  secondaryPhone: phoneValidator('Укажите номер телефона'),
+  birthday: defaultValidator('Укажите дату рождения'),
+  education: defaultValidator('Выберите ваше образование'),
+  housing: defaultValidator('Выберите тип жилья'),
+  employment: defaultValidator('Выберите информацию о трудоустройстве'),
+  organization: defaultValidator('Выберите тип организации'),
+  amountWorkers: defaultValidator('Выберите информацию о количестве сотрудников'),
+  employerActivities: defaultValidator('Выберите вид деятельности организации'),
+  employerOrganization: defaultValidator('Выберите вид организации'),
+  positionOrganization: defaultValidator('Выберите вашу должность'),
+  dulSerie: serieValidator('Укажите серию паспорта'),
+  dulNumber: numberValidator('Укажите номер паспорта'),
+  dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+  dulSubdivisionCode: numberValidator('Укажите код подразделения'),
+  dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
+  email: emailValidator('Укажите электронную почту'),
+  fullName: nameValidator(),
+  inn: innValidator('Укажите ИНН'),
+  legalForm: defaultValidator('Укажите ОПФ'),
+  organizationName: defaultValidator('Укажите наименование организации'),
+  generalSeniority: defaultValidator(),
+  lastJobExperience: defaultValidator('Укажите стаж на последнем месте работы'),
+  experience5Years: defaultValidator('Укажите общий стаж за последние 5 лет'),
+  jobsNumber: defaultValidator('Укажите количество лет стажа'),
+  beginDate: defaultValidator('Укажите дату заключения трудового договора'),
+  fullAddress: defaultValidator(),
+  partnerComments: defaultValidator(),
+  collectionCount: defaultValidator(),
+  comment: defaultValidator(),
   acquiringType: defaultSelectValidator,
   feedbackMethod: defaultSelectValidator,
   serviceType: defaultSelectValidator,
   serviceDirection: defaultSelectValidator,
-  meetingDay: defaultValidator,
-  product: defaultValidator,
-  localities: defaultValidator,
+  meetingDay: defaultValidator(),
+  product: defaultValidator(),
+  localities: defaultValidator(),
   consentDataProcessing: agreementValidator,
-  annualRevenue: defaultValidator,
+  annualRevenue: defaultValidator(),
   consentToReceiveMaterials: agreementValidator,
   processPersonalDataLeadFlg: agreementValidator,
   consentProviderFlg: agreementValidator,
@@ -68,14 +69,14 @@ export const validatorObj: Record<string, Validator> = {
   consentAssignmentClaimsFlg: agreementValidator,
   consentCollectionFlg: agreementValidator,
   consentInformFlg: agreementValidator,
-  familyStatus: defaultValidator,
-  children: lengthStringValidator(2),
-  familyMembers: lengthStringValidator(2),
-  dependents: lengthStringValidator(2),
-  totalIncome: lengthStringValidator(19),
-  expenses: lengthStringValidator(10),
-  snils: snilsValidator,
-  conscription: defaultValidator,
+  familyStatus: defaultValidator('Выберите семейное положение'),
+  children: lengthStringValidator(2, 'Укажите количество детей'),
+  familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
+  dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
+  totalIncome: lengthStringValidator(19, 'Укажите среднемесячный доход от основной зарплаты'),
+  expenses: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
+  snils: snilsValidator('Некорректный номер СНИЛС'),
+  conscription: defaultValidator(),
   armyIdFlg: agreementValidator,
 };
 

package/mobile/src/ui-kit/FormField/validators.ts

@@ -4,30 +4,30 @@ import { validator } from '../../validation/validator';
 
 const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
-export const defaultValidator = required(ERROR_MESSAGE);
+export const defaultValidator = (errorMsg?: string) =>
+  required(errorMsg ? errorMsg : ERROR_MESSAGE);
 
 export const defaultSelectValidator = validator((_) => _?.key && _?.key !== '')(ERROR_MESSAGE);
 
-export const nameValidator = validator((_) => typeof _ === 'string' && _.length > 1)(ERROR_MESSAGE);
+export const nameValidator = (errorMsg?: string) =>
+  validator((_) => typeof _ === 'string' && _.length > 1)(errorMsg ? errorMsg : ERROR_MESSAGE);
 
-export const lengthStringValidator = (maxLength: number) =>
-  validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= maxLength)(ERROR_MESSAGE);
+export const lengthStringValidator = (maxLength: number, errorMsg?: string) =>
+  validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= maxLength)(
+    errorMsg ? errorMsg : ERROR_MESSAGE,
+  );
 
-export const serieValidator = validator((_) => typeof _ === 'string' && _.length === 4)(
-  ERROR_MESSAGE,
-);
+export const serieValidator = (errorMsg: string) =>
+  validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
 
-export const numberValidator = validator((_) => typeof _ === 'string' && _.length === 6)(
-  ERROR_MESSAGE,
-);
+export const numberValidator = (errorMsg: string) =>
+  validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
 
-export const innValidator = validator(
-  (_) => typeof _ === 'string' && (_.length === 10 || _.length === 12),
-)(ERROR_MESSAGE);
+export const innValidator = (errorMsg: string) =>
+  validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
 
-export const phoneValidator = pattern(
-  /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/,
-)(ERROR_MESSAGE);
+export const phoneValidator = (errorMsg: string) =>
+  pattern(/^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/)(errorMsg);
 
 export const agreementValidator = validator((_) => typeof _ === 'boolean' && _)(
   'Согласие обязательно',
@@ -53,8 +53,9 @@ const snilsValidate = (snils: string) => {
   return false;
 };
 
-export const snilsValidator = validator(snilsValidate)(ERROR_MESSAGE);
+export const snilsValidator = (errorMsg: string) => validator(snilsValidate)(errorMsg);
 
 const emailValidate = (email: string) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2}$/.test(email);
 
-export const emailValidator = validator((_: string) => emailValidate(_))(ERROR_MESSAGE);
+export const emailValidator = (errorMsg: string) =>
+  validator((_: string) => emailValidate(_))(errorMsg);

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

@@ -25,9 +25,11 @@ export const Input = JSX<InputProps>(
     isTextarea = false,
   }) => {
     const inputRef = useRef<HTMLInputElement | null>(null);
+
     const handleChange = useCallback(
       (e: { target?: { value?: string } }) => {
-        onChange && onChange(e.target?.value || '');
+        const valueWithoutSpace = (e.target?.value || '').trimStart();
+        onChange && onChange(valueWithoutSpace);
       },
       [onChange],
     );
@@ -37,7 +39,7 @@ export const Input = JSX<InputProps>(
         inputRef.current?.focus();
       }
     }, [autoFocus, inputRef]);
-    const defaultStyle = 'w-full border rounded-md text-primary-text outline-none p-m';
+
     const paddingStyle = children ? 'pr-3xl' : '';
     const validStyle = getValidStyle(valid);
 
@@ -81,3 +83,5 @@ export const Input = JSX<InputProps>(
 );
 
 const getValidStyle = (valid: boolean) => (valid ? inputValidStyle : 'border-error');
+
+const defaultStyle = 'w-full border rounded-md text-primary-text outline-none p-m';

package/package.json

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

package/src/hooks/useElementSpace.ts

@@ -0,0 +1,25 @@
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type RefObject } from 'react';
+
+export const useElementSpace = (ref: RefObject<HTMLElement>, heightEl: number) => {
+  const [spaceAbove, setSpaceAbove] = useState(false);
+
+  useEffect(() => {
+    const handleResize = () => {
+      if (ref?.current) {
+        const { top } = ref.current.getBoundingClientRect();
+
+        const hasSpaceAbove = top > heightEl;
+
+        setSpaceAbove(hasSpaceAbove);
+      }
+    };
+
+    handleResize();
+    window.addEventListener('resize', handleResize);
+
+    return () => window.removeEventListener('resize', handleResize);
+  }, [ref]);
+
+  return spaceAbove;
+};

package/src/ui-kit/DatePicker/DatePicker.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { useElementSpace } from '../../hooks/useElementSpace';
 import { type LabelProps } from '../../model/HeadlineType';
 import { type IconVersion } from '../../model/IconVersion';
 import { formatDate } from '../../utils/formatDate';
@@ -65,13 +66,19 @@ export const DatePicker = JSX<DatePickerProps>(
       showCalendar,
     });
 
+    const spaceAbove = useElementSpace(ref, 370);
+
     return (
       <div className={style('space-y-xs', className)} ref={ref}>
         {renderLabel(label)}
         <div className="relative">
           {renderDatePickerForm(handleChangeVisibleCalendar, value, valid)}
           {showCalendar ? (
-            <div className="absolute bg-white z-20 select-none bottom-full">
+            <div
+              className={style('absolute bg-white z-20 select-none', {
+                'bottom-full': spaceAbove,
+              })}
+            >
               <div className="flex gap-s">
                 <div className="my-auto" onClick={handlePrevMonth}>
                   <Icon {...ICON_PROPS} className="-rotate-90 cursor-pointer" />
@@ -99,6 +106,7 @@ export const DatePicker = JSX<DatePickerProps>(
                 onDateSelect={onChange}
                 min={minDate}
                 max={maxDate}
+                setValue={setValue}
               />
             </div>
           ) : null}

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

@@ -1,7 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
 export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl label="Отчество (Обязательно, при наличии)" {...field('middleName')} {...input} />
+  <InputControl
+    label="Отчество (Обязательно, при наличии)"
+    {...getValidation(field('middleName'), validatorObj.middleName)}
+    {...input}
+  />
 ));

package/src/ui-kit/FormField/getObjectValidator.tsx

@@ -16,50 +16,51 @@ import {
 } from './validators';
 
 export const validatorObj: Record<string, Validator> = {
-  typeForm: defaultValidator,
-  surname: nameValidator,
-  name: nameValidator,
+  typeForm: defaultValidator(),
+  surname: nameValidator('Укажите свою фамилию'),
+  name: nameValidator('Укажите своё имя'),
+  middleName: nameValidator('Укажите своё отчество'),
   region: defaultSelectValidator,
   addressBranch: defaultSelectValidator,
-  phone: phoneValidator,
-  secondaryPhone: phoneValidator,
-  birthday: defaultValidator,
-  education: defaultValidator,
-  housing: defaultValidator,
-  employment: defaultValidator,
-  organization: defaultValidator,
-  amountWorkers: defaultValidator,
-  employerActivities: defaultValidator,
-  employerOrganization: defaultValidator,
-  positionOrganization: defaultValidator,
-  email: emailValidator,
-  dulSerie: serieValidator,
-  dulNumber: numberValidator,
-  dulIssueDateField: defaultValidator,
-  dulSubdivisionCode: numberValidator,
-  dulIssuedBy: defaultValidator,
-  fullName: nameValidator,
-  inn: innValidator,
-  legalForm: defaultValidator,
-  organizationName: defaultValidator,
-  generalSeniority: defaultValidator,
-  lastJobExperience: defaultValidator,
-  experience5Years: defaultValidator,
-  jobsNumber: defaultValidator,
-  beginDate: defaultValidator,
-  fullAddress: defaultValidator,
-  partnerComments: defaultValidator,
-  collectionCount: defaultValidator,
-  comment: defaultValidator,
+  phone: phoneValidator('Укажите номер телефона'),
+  secondaryPhone: phoneValidator('Укажите номер телефона'),
+  birthday: defaultValidator('Укажите дату рождения'),
+  education: defaultValidator('Выберите ваше образование'),
+  housing: defaultValidator('Выберите тип жилья'),
+  employment: defaultValidator('Выберите информацию о трудоустройстве'),
+  organization: defaultValidator('Выберите тип организации'),
+  amountWorkers: defaultValidator('Выберите информацию о количестве сотрудников'),
+  employerActivities: defaultValidator('Выберите вид деятельности организации'),
+  employerOrganization: defaultValidator('Выберите вид организации'),
+  positionOrganization: defaultValidator('Выберите вашу должность'),
+  dulSerie: serieValidator('Укажите серию паспорта'),
+  dulNumber: numberValidator('Укажите номер паспорта'),
+  dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+  dulSubdivisionCode: numberValidator('Укажите код подразделения'),
+  dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
+  email: emailValidator('Укажите электронную почту'),
+  fullName: nameValidator(),
+  inn: innValidator('Укажите ИНН'),
+  legalForm: defaultValidator('Укажите ОПФ'),
+  organizationName: defaultValidator('Укажите наименование организации'),
+  generalSeniority: defaultValidator(),
+  lastJobExperience: defaultValidator('Укажите стаж на последнем месте работы'),
+  experience5Years: defaultValidator('Укажите общий стаж за последние 5 лет'),
+  jobsNumber: defaultValidator('Укажите количество лет стажа'),
+  beginDate: defaultValidator('Укажите дату заключения трудового договора'),
+  fullAddress: defaultValidator(),
+  partnerComments: defaultValidator(),
+  collectionCount: defaultValidator(),
+  comment: defaultValidator(),
   acquiringType: defaultSelectValidator,
   feedbackMethod: defaultSelectValidator,
   serviceType: defaultSelectValidator,
   serviceDirection: defaultSelectValidator,
-  meetingDay: defaultValidator,
-  product: defaultValidator,
-  localities: defaultValidator,
+  meetingDay: defaultValidator(),
+  product: defaultValidator(),
+  localities: defaultValidator(),
   consentDataProcessing: agreementValidator,
-  annualRevenue: defaultValidator,
+  annualRevenue: defaultValidator(),
   consentToReceiveMaterials: agreementValidator,
   processPersonalDataLeadFlg: agreementValidator,
   consentProviderFlg: agreementValidator,
@@ -68,14 +69,14 @@ export const validatorObj: Record<string, Validator> = {
   consentAssignmentClaimsFlg: agreementValidator,
   consentCollectionFlg: agreementValidator,
   consentInformFlg: agreementValidator,
-  familyStatus: defaultValidator,
-  children: lengthStringValidator(2),
-  familyMembers: lengthStringValidator(2),
-  dependents: lengthStringValidator(2),
-  totalIncome: lengthStringValidator(19),
-  expenses: lengthStringValidator(10),
-  snils: snilsValidator,
-  conscription: defaultValidator,
+  familyStatus: defaultValidator('Выберите семейное положение'),
+  children: lengthStringValidator(2, 'Укажите количество детей'),
+  familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
+  dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
+  totalIncome: lengthStringValidator(19, 'Укажите среднемесячный доход от основной зарплаты'),
+  expenses: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
+  snils: snilsValidator('Некорректный номер СНИЛС'),
+  conscription: defaultValidator(),
   armyIdFlg: agreementValidator,
 };