@redneckz/wildless-cms-uni-blocks 0.14.673 → 0.14.675

package/src/components/ApplicationLeadForm/ApplicationLeadForm.example.json

@@ -57,17 +57,16 @@
               },
               {
                 "fieldType": "common",
-                "name": "consentPfrFlg"
+                "name": "consentOthersFlg",
+                "required": true
               },
               {
                 "fieldType": "common",
-                "name": "consentInformFlg",
-                "required": true
+                "name": "consentInformFlg"
               },
               {
                 "fieldType": "common",
-                "name": "consentOthersFlg",
-                "required": true
+                "name": "consentPfrFlg"
               }
             ]
           }

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -32,9 +32,9 @@ export default {
           {
             inputs: [
               { fieldType: 'common', name: 'processPersonalDataFlg', required: true },
-              { fieldType: 'common', name: 'consentInformFlg', required: true },
               { fieldType: 'common', name: 'consentProviderFlg', required: true },
               { fieldType: 'common', name: 'consentOthersFlg', required: true },
+              { fieldType: 'common', name: 'consentInformFlg' },
               { fieldType: 'common', name: 'consentPfrFlg' },
             ],
           },

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -17,7 +17,7 @@ const WIZARD_TITLES = [
   'Параметры карты',
   'Персональные данные',
   'Данные о трудоустройстве',
-  'Данные о доходах и расходах',
+  'Семейное положение и доход',
   'Дополнительные сведения',
   'Выбор способа получения',
 ];

package/src/components/CreditCardForm/StepsNavigationButtons.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
-import { style } from '../../utils/style';
 
 export interface StepsNavigationButtonsProps {
   step: number;
@@ -9,21 +8,14 @@ export interface StepsNavigationButtonsProps {
 
 export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step, onPrevStep }) => {
   const isFirstStep = step === 0;
+  const isFinalStep = step === 6;
 
   return (
     <div className="flex justify-between gap-m">
-      <Button
-        onClick={onPrevStep}
-        className={style('w-full @xl:w-auto')}
-        type="button"
-        version="secondary"
-        disabled={isFirstStep}
-      >
+      <Button onClick={onPrevStep} type="button" version="secondary" disabled={isFirstStep}>
         Назад
       </Button>
-      <Button className="w-full @xl:w-auto" type="submit">
-        Далее
-      </Button>
+      <Button type="submit">{isFinalStep ? 'Отправить заявку' : 'Далее'}</Button>
     </div>
   );
 });

package/src/components/CreditForm/CreditForm.tsx

@@ -18,7 +18,7 @@ const WIZARD_TITLES = [
   '',
   'Персональные данные',
   'Данные о трудоустройстве',
-  'Данные о доходах и расходах',
+  'Семейное положение и доход',
   'Дополнительные сведения',
   'Отделение Банка',
 ];

package/src/components/CreditForm/StepsNavigationButtons.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
-import { style } from '../../utils/style';
 
 export interface StepsNavigationButtonsProps {
   step: number;
@@ -9,21 +8,14 @@ export interface StepsNavigationButtonsProps {
 
 export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(({ step, onPrevStep }) => {
   const isFirstStep = step === 0;
+  const isFinalStep = step === 5;
 
   return (
-    <div className={'flex justify-between'}>
-      <Button
-        onClick={onPrevStep}
-        className={style('w-full @xl:w-auto')}
-        type="button"
-        version="secondary"
-        disabled={isFirstStep}
-      >
+    <div className={'flex justify-between gap-m'}>
+      <Button onClick={onPrevStep} type="button" version="secondary" disabled={isFirstStep}>
         Назад
       </Button>
-      <Button className={style('w-full @xl:w-auto')} type="submit">
-        Далее
-      </Button>
+      <Button type="submit">{isFinalStep ? 'Отправить заявку' : 'Далее'}</Button>
     </div>
   );
 });

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

@@ -15,7 +15,7 @@ export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
     if (value) {
       field('addressFact')?.onChange?.(field('addressRegistration').value);
     }
-  }, [value]);
+  }, [value, field('addressRegistration').value]);
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.(fieldName)?.onChange?.({

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

@@ -5,6 +5,8 @@ import { validator } from '../../validation/validator';
 
 const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
+const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
+
 export const defaultValidator = (errorMsg?: string) => required(errorMsg ?? ERROR_MESSAGE);
 
 export const defaultSelectValidator = (errorMsg?: string) =>
@@ -16,7 +18,9 @@ export const jobNumberValidator = (errorMsg?: string) =>
   );
 
 export const nameValidator = (errorMsg?: string) =>
-  validator((_) => typeof _ === 'string' && _.length > 1)(errorMsg ?? ERROR_MESSAGE);
+  validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
 
 export const lengthStringValidator = (inputLength: number, errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(
@@ -69,16 +73,18 @@ export const emailValidator = (errorMsg: string) =>
 const addressDaDataValidate = (address: Address) =>
   Boolean(address.region && address.city && address.house);
 
-export const addressDaDataValidator = () =>
-  validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');
+export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
 
 export const addressOrganizationValidator = () =>
   validator((address: Address) => Boolean(address.fiasCode && address.city && address.house))(
-    'Укажите регион, город/населенный пункт, улицу, дом',
+    ADDRESS_ERROR_MESSAGE,
   );
 
 export const codeWordValidator = (errorMsg?: string) =>
-  validator(
-    (_) =>
-      typeof _ === 'string' && _.length >= 3 && _.length <= 21 && /^[\u0400-\u04FF\d]+$/u.test(_),
-  )(errorMsg ?? ERROR_MESSAGE);
+  validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
+
+const cyrillicPattern = /^[\u0400-\u04FF\d]+$/u;
+
+const isCyrillic = (_ = '') => cyrillicPattern.test(_);

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

@@ -33,8 +33,11 @@ export const InputControl = JSX<InputProps>(
     const popupRef = useOutsideClick<HTMLDivElement>(close);
 
     const handleChange = useCallback(
-      (v: string) => (maxLength ? v.length <= maxLength && onChange(v) : onChange(v)),
-      [onChange],
+      (v: string) => {
+        dadata && !isOpen && open();
+        maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
+      },
+      [dadata, isOpen, onChange],
     );
 
     const inputRef = useInputPopup({