@redneckz/wildless-cms-uni-blocks 0.14.723 → 0.14.724

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

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentWages = field('wages')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentWages || 0);
-
-      field('retirementIncome')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentWages],
-  );
-
-  return (
-    <InputControl
-      label="Пенсионные доходы"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Пенсионные доходы"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
+    {...input}
+  />
+));

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

@@ -1,31 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const WagesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const currentRetirementIncome = field('retirementIncome')?.value;
-
-  const onChange = useCallback(
-    (_: string) => {
-      const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
-
-      field('wages')?.onChange?.(_);
-      field('incomeAverage')?.onChange?.(String(incomesSum));
-    },
-    [currentRetirementIncome],
-  );
-
-  return (
-    <InputControl
-      label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
-      placeholder="Введите значение"
-      isInteger={true}
-      {...getValidation(field('wages'), validatorObj.wages, input?.required)}
-      {...input}
-      onChange={onChange}
-    />
-  );
-});
+export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
+    placeholder="Введите значение"
+    isInteger={true}
+    {...getValidation(field('wages'), validatorObj.wages, input?.required)}
+    {...input}
+  />
+));

package/src/ui-kit/FormField/NameFieldDef.ts

@@ -77,7 +77,6 @@ export type NameFieldDef =
   | 'participantDateRegistration'
   | 'retirementIncome'
   | 'otherIncome'
-  | 'incomeAverage'
   | 'mandatoryPayments'
   | 'additionalIncome'
   | 'otherPayments'