@redneckz/wildless-cms-uni-blocks 0.14.681 → 0.14.683

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

@@ -15,7 +15,7 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
     <InputControl
       label="ИНН"
-      type="number"
+      isInteger={true}
       maxLength={12}
       {...input}
       {...getValidation(field('inn'), validatorObj.inn, input?.required)}

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

@@ -8,7 +8,7 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Количество мест работы за последние 5 лет"
     placeholder="Количество мест"
-    type="number"
+    isInteger={true}
     maxLength={2}
     {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
     {...input}

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

@@ -8,7 +8,7 @@ export const MandatoryPaymentsField = JSX<CustomFieldProps>(({ field, input }) =
   <InputControl
     label="Обязательные выплаты"
     placeholder="Введите значение"
-    type="number"
+    isInteger={true}
     {...getValidation(field('mandatoryPayments'), validatorObj.mandatoryPayments, input?.required)}
     {...input}
   />

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

@@ -8,7 +8,7 @@ export const OtherIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Иные доходы"
     placeholder="Введите значение"
-    type="number"
+    isInteger={true}
     {...getValidation(field('otherIncome'), validatorObj.otherIncome, input?.required)}
     {...input}
   />

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

@@ -19,7 +19,7 @@ export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
     <InputControl
       label="Доля участия в бизнесе"
       placeholder="в %"
-      type="number"
+      isInteger={true}
       maxLength={3}
       {...getValidation(field(FIELD_NAME), validatorObj.partInBusiness, input?.required)}
       {...input}

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

@@ -22,7 +22,7 @@ export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) =>
     <InputControl
       label="Пенсионные доходы"
       placeholder="Введите значение"
-      type="number"
+      isInteger={true}
       {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
       {...input}
       onChange={onChange}

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

@@ -8,7 +8,7 @@ export const TotalIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Совокупный официальный доход в месяц после вычета налогов (зарплата, премии)"
     placeholder="Введите значение"
-    type="number"
+    isInteger={true}
     {...getValidation(field('totalIncome'), validatorObj.totalIncome, input?.required)}
     {...input}
   />

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

@@ -22,7 +22,7 @@ export const WagesField = JSX<CustomFieldProps>(({ field, input }) => {
     <InputControl
       label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
       placeholder="Введите значение"
-      type="number"
+      isInteger={true}
       {...getValidation(field('wages'), validatorObj.wages, input?.required)}
       {...input}
       onChange={onChange}

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

@@ -99,7 +99,8 @@ const PRODUCT_REF = {
 };
 
 export const getField =
-  (field: FormFieldRegisterer<any>, typeForm: string) => (input: FieldDef, i: number) => {
+  (field: FormFieldRegisterer<any>, typeForm = '') =>
+  (input: FieldDef, i: number) => {
     const isPremium = typeForm === 'ULTRASERVICE' || typeForm === 'PREMIUMSERVICE';
 
     const InputsMap = {

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

@@ -1,4 +1,4 @@
-import type { FormColumnsCount } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { type ColumnsCount } from '../../model/ColumnCount';
 
-export const inputColumnStyles = (column: FormColumnsCount | undefined) =>
+export const inputColumnStyles = (column: ColumnsCount | undefined) =>
   column === 2 ? '@xl:grid-cols-2' : '';

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } 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';
@@ -25,6 +25,7 @@ export const InputControl = JSX<InputProps>(
     type,
     name = '',
     daDataQueryPrefix,
+    isInteger = false,
     maxLength,
     dadata = false,
     disabled = false,
@@ -40,6 +41,10 @@ export const InputControl = JSX<InputProps>(
       [dadata, isOpen, onChange],
     );
 
+    useEffect(() => {
+      isInteger && value ? onChange(normalizeInteger(value)) : null;
+    }, [value]);
+
     const inputRef = useInputPopup({
       isOpen: isOpen && dadata,
       name,
@@ -76,5 +81,7 @@ export const InputControl = JSX<InputProps>(
   },
 );
 
+const normalizeInteger = (val = '') => val.replace(/[^\d]+/g, '');
+
 const getPlaceholder = (placeholder?: string, errors?: string[], label?: string) =>
   errors && !label ? `${placeholder}*` : placeholder;

package/src/ui-kit/Input/InputProps.ts

@@ -19,4 +19,5 @@ export interface InputProps<V = string> extends DefaultControlType, ControlProps
   isTextarea?: boolean;
   dadata?: boolean;
   maxLength?: number;
+  isInteger?: boolean;
 }

package/src/ui-kit/LocationDialog/SearchBar.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { style } from '../../utils/style';
 import { inputValidStyle } from '../Input/inputValidStyle';
+import { type PreventableEvent } from '../PreventableEvent';
 
 export interface SearchBarInnerProps {
   className?: string;
@@ -25,7 +26,9 @@ export const SearchBar = JSX<SearchBarInnerProps>(({ className, searchTerm, onSe
           `h-12 pl-m w-full peer text-l text-black rounded-md box-border`,
         )}
         value={searchTerm}
-        onChange={(e) => onSearch(e.target.value.toLowerCase())}
+        onChange={(e: PreventableEvent & { target: { value: string } }) =>
+          onSearch(e.target.value.toLowerCase())
+        }
         type="text"
         name="location-search-bar-input"
       />

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

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { style } from '../../utils/style';
 import { defaultCheckStyle } from '../Checkbox/checkboxStyle';
 import { inputValidStyle } from '../Input/inputValidStyle';
+import { type PreventableEvent } from '../PreventableEvent';
 import { Text } from '../Text/Text';
 import { type RadioProps } from './RadioProps';
 
@@ -19,7 +20,9 @@ export const Radio = JSX<RadioProps>(({ name, text, value, checked, onChange, cl
         value={value}
         name={name}
         checked={checked}
-        onChange={(_) => onChange?.(_.target.value)}
+        onChange={(_: PreventableEvent & { target: { value: string } }) =>
+          onChange?.(_.target.value)
+        }
         role="radio"
       />
       {text ? <Text color="text-primary-text">{text}</Text> : null}

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

@@ -5,11 +5,11 @@ export const Rating = () => {
   const [rating, setRating] = useState(0);
   const [hoverRating, setHoverRating] = useState(0);
 
-  const handleClick = (event: React.MouseEvent<HTMLSpanElement>) => {
+  const handleClick = (event: { currentTarget: { id: string } }) => {
     setRating(parseInt(event.currentTarget.id));
   };
 
-  const handleMouseEnter = (event: React.MouseEvent<HTMLSpanElement>) => {
+  const handleMouseEnter = (event: { currentTarget: { id: string } }) => {
     setHoverRating(parseInt(event.currentTarget.id));
   };
 

package/src/ui-kit/VerifyPhoneDialog/InputCode.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type PreventableEvent } from '../PreventableEvent';
 
 type InputCodeProps = {
   values: string[];
-  setValues: React.Dispatch<React.SetStateAction<string[]>>;
+  setValues: (_: string[]) => void;
   hasError?: boolean;
   errorText?: string;
 };
@@ -17,7 +18,7 @@ export const InputCode = JSX<InputCodeProps>(({ values, setValues, hasError, err
   }, [activeIndex]);
 
   const handleChange = useCallback(
-    (index: number) => (event: React.ChangeEvent<HTMLInputElement>) => {
+    (index: number) => (event: PreventableEvent & { currentTarget: { value: string } }) => {
       const { value } = event.currentTarget;
       const oneValue = value.slice(0, 1);
       setValues(values.map((_, i) => (i === index ? oneValue : _)));
@@ -27,7 +28,7 @@ export const InputCode = JSX<InputCodeProps>(({ values, setValues, hasError, err
   );
 
   const handleKeyDown = useCallback(
-    (currentIndex: number) => (event: React.KeyboardEvent<HTMLInputElement>) => {
+    (currentIndex: number) => (event: PreventableEvent & { key: string }) => {
       const { key } = event;
       if (key === 'Backspace' && !values[currentIndex]) {
         const previousIndex = currentIndex > 0 ? currentIndex - 1 : values.length - 1;
@@ -40,7 +41,7 @@ export const InputCode = JSX<InputCodeProps>(({ values, setValues, hasError, err
   );
 
   const handlePaste = useCallback(
-    (event: React.ClipboardEvent<HTMLInputElement>) => {
+    (event: PreventableEvent & { clipboardData: { getData: (v: string) => string } }) => {
       event.preventDefault();
       const pastedData = event.clipboardData.getData('text');
       const updatedValues = values.map((_, idx) => (idx < pastedData.length ? pastedData[idx] : _));

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

@@ -110,7 +110,7 @@ const renderTextButton = (textButton: string, isDisabled: boolean, handleSubmit:
 
 const renderText = (
   timeNextReq: number,
-  setTimeNextReq: React.Dispatch<React.SetStateAction<number>>,
+  setTimeNextReq: (value: number) => void,
   handleSendCode: () => void,
 ) =>
   timeNextReq ? (

package/src/ui-kit/YandexMap/renderSearchField.tsx

@@ -15,7 +15,7 @@ export const renderSearchField = (
   yandexMaps: ymaps.Map,
   updatePointsToRender: (any: MockPoints[] | null) => void,
 ) => {
-  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const onChange = (e: { target?: { value?: string } }) => {
     const value: string = e.target?.value ? e.target?.value.toLowerCase() : '';
     if (value) {
       const searchResult = points.filter((_: MockPoints) => {