@redneckz/wildless-cms-uni-blocks 0.14.729 → 0.14.731

package/src/services/retail/model/RetailFormContent.ts

@@ -1,6 +1,3 @@
-/* eslint-disable max-lines */
-/* eslint-disable max-len */
-
 import { type LabelProps, type LinkButtonVersion, type TextProps } from '../external/types';
 import { type NameFieldDef } from './LeadFormState';
 
@@ -45,22 +42,6 @@ export type FieldCommonDef = FieldDefaultDef & {
   fieldType: 'common';
 };
 
-/**
- * @title Значение по умолчанию
- * @enumNames ["Валютный контроль","Документарные операции","Конверсионные операции","Иные вопросы ВЭД"]
- */
-type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactions' | 'otherIssues';
-
-/**
- * @title Поле ввода ВЭД
- * @default {"fieldType": "ved", "name": "vedTypes", "defaultValue": "currencyControl"}
- */
-export type FieldVedDef = FieldDefaultDef & {
-  /** @default "ved" */
-  fieldType: 'ved';
-  defaultValue?: VedTypes;
-};
-
 /**
  * @title Текст для отображения в карточке информации
  * @default {"fieldType": "info"}
@@ -76,26 +57,4 @@ export type FieldInfoDef = FieldDefaultDef &
  * @default { "fieldType": "common" }
  */
 
-export type FieldDef = FieldCommonDef | FieldVedDef | FieldInfoDef;
-
-/** @hidden */
-export type TypeFormFieldDef =
-  | ''
-  | 'ACQR'
-  | 'ANALITIC'
-  | 'ANTIFRAUD'
-  | 'BCRD'
-  | 'BROK'
-  | 'BROKACCOUNT'
-  | 'COLLECTION'
-  | 'CORRUPTION'
-  | 'CRED'
-  | 'DPST'
-  | 'PRODUCT'
-  | 'SELFCOLLECTION'
-  | 'KVED'
-  | 'ULTRASERVICE'
-  | 'PREMIUMSERVICE'
-  | 'FEEDBACK'
-  | 'FEEDBACK_QS'
-  | 'OUTSERVICE';
+export type FieldRetailDef = FieldCommonDef | FieldInfoDef;

package/src/services/retail/utils/calculateInputs.ts

@@ -1,10 +1,11 @@
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { type Option } from '../../../ui-kit/Select/Option';
 import { type LeadFormState } from '../model/LeadFormState';
-import { type FieldDef } from '../model/RetailFormContent';
+import { type FieldRetailDef } from '../model/RetailFormContent';
 
 export type GetValue = <K extends keyof LeadFormState>(name: K) => LeadFormState[K];
 
-export const calculateInputs = (getValue: GetValue) => (inputs: FieldDef[], step: number) =>
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[], step: number) =>
   inputs
     .filter((_) => _)
     .map((_) => {

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

@@ -24,6 +24,13 @@ interface DatePickerInputProps {
   disabled?: boolean;
 }
 
+interface UpdateSelectedDateProps {
+  inputValue: string;
+  setSelectedMonth: (month: number) => void;
+  setSelectedYear: (year: number) => void;
+  onChange?: (value: Date) => void;
+}
+
 export const DatePickerInput = JSX<DatePickerInputProps>(
   ({ setSelectedMonth, setSelectedYear, className, value, disabled, onChange, onClick }) => {
     const ref = useRef<HTMLInputElement | null>(null);
@@ -38,10 +45,7 @@ export const DatePickerInput = JSX<DatePickerInputProps>(
 
     const onBlur = () => {
       if (checkIsValidDate(inputValue)) {
-        const [day, month, year] = inputValue.split('.');
-        onChange?.(new Date(Number(year), Number(month) - 1, Number(day)));
-        setSelectedMonth(Number(month) - 1);
-        setSelectedYear(Number(year));
+        updateSelectedDate({ inputValue, setSelectedMonth, setSelectedYear, onChange });
       } else {
         setInputValue(value || '');
       }
@@ -58,6 +62,10 @@ export const DatePickerInput = JSX<DatePickerInputProps>(
       setInputValue(value || '');
     }, [value]);
 
+    useEffect(() => {
+      updateSelectedDate({ inputValue, setSelectedMonth, setSelectedYear, onChange });
+    }, [inputValue]);
+
     return (
       <div onClick={onInputClick} className={style('relative', className)}>
         <input
@@ -92,11 +100,33 @@ const checkIsValidDate = (date: string) => {
         maxDateOfMonth++;
       }
 
-      if (Number(day) > 0 && Number(day) <= maxDateOfMonth) {
-        return true;
-      }
+      return Number(day) > 0 && Number(day) <= maxDateOfMonth;
     }
   }
 
   return false;
 };
+
+const parseDate = (inputValue: string) => {
+  const [dayStr, monthStr, yearStr] = inputValue.split('.');
+
+  return {
+    day: Number(dayStr),
+    month: Number(monthStr) - 1,
+    year: Number(yearStr),
+  };
+};
+
+const updateSelectedDate = ({
+  inputValue,
+  setSelectedMonth,
+  setSelectedYear,
+  onChange,
+}: UpdateSelectedDateProps) => {
+  if (checkIsValidDate(inputValue)) {
+    const { day, month, year } = parseDate(inputValue);
+    setSelectedMonth(month);
+    setSelectedYear(year);
+    onChange?.(new Date(year, month, day));
+  }
+};

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

@@ -1,13 +1,14 @@
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
-import {
-  type FieldDef,
-  type TypeFormFieldDef,
-} from '../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 
 export interface CustomFieldProps {
   field: FormFieldRegisterer<any>;
   input?: FieldDef;
   url?: string;
   params?: Record<string, any>;
-  typeForm?: TypeFormFieldDef;
+}
+
+export interface CustomFieldPropsWithTypeForm extends CustomFieldProps {
+  typeForm?: FormTypeFieldDef;
 }

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

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useBranches } from '../../../hooks/useBranches';
 import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
-import { type TypeFormFieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../../model/FormTypeFieldDef';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -14,7 +14,7 @@ interface RegionFieldProps extends CustomFieldProps {
 }
 
 export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, params }) => {
-  const isPremium = getPremium(params?.typeForm as TypeFormFieldDef);
+  const isPremium = getPremium(params?.typeForm as FormTypeFieldDef);
 
   const fieldRegion = field('region');
   const regionKey = fieldRegion?.value?.key as string;

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';

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

@@ -1,4 +1,4 @@
-import type { FieldDef } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 
 export const getConsentDataProcessing = (inputs: FieldDef[]) =>
   inputs?.find((_) => _?.name === 'consentDataProcessing');

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

@@ -1,9 +1,7 @@
 //TODO: Убрать обращение к компонентам т.к. ApplicationForm
-import {
-  type FieldDef,
-  type TypeFormFieldDef,
-} from '../../components/ApplicationForm/ApplicationFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 import { type VNode } from '../../model/VNode';
 import { InputControl } from '../Input/InputControl';
 import { type CustomFieldProps } from './CustomFieldProps';
@@ -70,7 +68,7 @@ const InputsMap = {
     <InputControl label="Дата и время обращения в Банк" {...props} />
   ),
   region: (props: CustomFieldProps) =>
-    getPremium(props?.params?.typeForm as TypeFormFieldDef) ? (
+    getPremium(props?.params?.typeForm as FormTypeFieldDef) ? (
       <RegionPremiumField {...props} />
     ) : (
       <RegionField {...props} />

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

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 
 export const getNamesFromInput = (inputs: FieldDef[]) =>
   Object.values(inputs.filter((_) => _))?.map((_) => _.name);

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

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type Validator } from '../../validation/validator';
 import { getNamesFromInput } from './getNamesFromInput';
 import {

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

@@ -1,3 +1,3 @@
-import { type TypeFormFieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 
-export const getPremium = (typeForm: TypeFormFieldDef = ''): boolean => typeForm === 'ULTRASERVICE';
+export const getPremium = (typeForm: FormTypeFieldDef = ''): boolean => typeForm === 'ULTRASERVICE';