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

package/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/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';