@redneckz/wildless-cms-uni-blocks 0.14.201 → 0.14.203

package/src/components/ApplicationForm/ApplicationForm.fixture.mobile.tsx

@@ -28,10 +28,6 @@ const ApplicationFormAcquiring: ApplicationFormContent = {
   formBlock: { ...formBlockProps, formType: 'ApplicationFormAcquiring' },
 };
 
-const ApplicationFormBusinessCard: ApplicationFormContent = {
-  formBlock: { ...formBlockProps, formType: 'ApplicationFormBusinessCard' },
-};
-
 const ApplicationFormDeposit: ApplicationFormContent = {
   formBlock: { ...formBlockProps, formType: 'ApplicationFormDeposit' },
 };
@@ -62,14 +58,6 @@ const ApplicationFormFeedback: ApplicationFormContent = {
   formBlock: { ...formBlockProps, formType: 'ApplicationFormFeedback' },
 };
 
-const ApplicationFormSelfCollection: ApplicationFormContent = {
-  formBlock: {
-    ...formBlockProps,
-    formType: 'ApplicationFormSelfCollection',
-    title: 'Факты коррупции',
-  },
-};
-
 const ApplicationFormUltraPremium: ApplicationFormContent = {
   formBlock: {
     ...formBlockProps,
@@ -91,13 +79,6 @@ export default {
       <PopupManager />
     </div>
   ),
-  'business-card': (
-    <div className="container grid grid-cols-12">
-      <ApplicationForm className="col-span-12" {...ApplicationFormBusinessCard} />
-      <PopupManager />
-    </div>
-  ),
-
   deposit: (
     <div className="container grid grid-cols-12">
       <ApplicationForm className="col-span-12" {...ApplicationFormDeposit} />
@@ -128,12 +109,6 @@ export default {
       <PopupManager />
     </div>
   ),
-  'self-collection': (
-    <div className="container grid grid-cols-12">
-      <ApplicationForm className="col-span-12" {...ApplicationFormSelfCollection} />
-      <PopupManager />
-    </div>
-  ),
   'ultra-premium': (
     <div className="container grid grid-cols-12">
       <ApplicationForm className="col-span-12" {...ApplicationFormUltraPremium} />

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -28,10 +28,6 @@ const ApplicationFormAcquiring: ApplicationFormContent = {
   formBlock: { ...formBlockProps, formType: 'ApplicationFormAcquiring' },
 };
 
-const ApplicationFormBusinessCard: ApplicationFormContent = {
-  formBlock: { ...formBlockProps, formType: 'ApplicationFormBusinessCard' },
-};
-
 const ApplicationFormDeposit: ApplicationFormContent = {
   formBlock: { ...formBlockProps, formType: 'ApplicationFormDeposit' },
 };
@@ -62,14 +58,6 @@ const ApplicationFormFeedback: ApplicationFormContent = {
   formBlock: { ...formBlockProps, formType: 'ApplicationFormFeedback', title: 'Обратная связь' },
 };
 
-const ApplicationFormSelfCollection: ApplicationFormContent = {
-  formBlock: {
-    ...formBlockProps,
-    formType: 'ApplicationFormSelfCollection',
-    title: 'Самоинкассация (ЮЛ) ',
-  },
-};
-
 const ApplicationFormUltraPremium: ApplicationFormContent = {
   formBlock: {
     ...formBlockProps,
@@ -86,12 +74,6 @@ export default {
       <PopupManager />
     </div>
   ),
-  'business-card': (
-    <div className="container grid grid-cols-12">
-      <ApplicationForm className="col-span-12" {...ApplicationFormBusinessCard} />
-      <PopupManager />
-    </div>
-  ),
   credit: (
     <div className="container grid grid-cols-12">
       <ApplicationForm className="col-span-12" {...ApplicationFormCredit} />
@@ -122,12 +104,6 @@ export default {
       <PopupManager />
     </div>
   ),
-  'self-collection': (
-    <div className="container grid grid-cols-12">
-      <ApplicationForm className="col-span-12" {...ApplicationFormSelfCollection} />
-      <PopupManager />
-    </div>
-  ),
   wed: (
     <div className="container grid grid-cols-12">
       <ApplicationForm className="col-span-12" {...ApplicationFormWed} />

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -32,7 +32,7 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
 
     return (
       <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
-        <div className="container max-w-[978px] space-y-lg">
+        <div className="container max-w-[978px] space-y-m">
           {formBlock?.title ? (
             <Heading headingType="h3" title={formBlock.title} className="@xl:text-center" />
           ) : null}

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -25,15 +25,6 @@ export type CommonApplicationFormProps = TitleProps & {
  */
 export type UltraPremiumTypeProps = 'ULTRASERVICE' | 'PREMIUMSERVICE';
 
-/**
- * @title Бизнес-карта
- */
-export type BusinessCardFormParamsDef = TitleProps &
-  CommonApplicationFormProps & {
-    /** @default ApplicationFormBusinessCard */
-    formType: 'ApplicationFormBusinessCard';
-  };
-
 /**
  * @title ВЭД
  */
@@ -101,15 +92,6 @@ export type FeedbackFormParamsDef = TitleProps &
     formType: 'ApplicationFormFeedback';
   };
 
-/**
- * @title Самоинкассация (ЮЛ)
- */
-export type SelfCollectionFormParamsDef = TitleProps &
-  CommonApplicationFormProps & {
-    /** @default ApplicationSelfCollection */
-    formType: 'ApplicationFormSelfCollection';
-  };
-
 /**
  * @title Заявка Ультра и Премиум
  */
@@ -124,7 +106,6 @@ export type UltraPremiumFormParamsDef = TitleProps &
  * @title Настройки формы
  */
 export type ApplicationFormBlockDef =
-  | BusinessCardFormParamsDef
   | WedFormParamsDef
   | DepositFormParamsDef
   | CreditFormParamsDef
@@ -132,7 +113,6 @@ export type ApplicationFormBlockDef =
   | GrantSupportFormParamsDef
   | IndividualsFormParamsDef
   | FeedbackFormParamsDef
-  | SelfCollectionFormParamsDef
   | UltraPremiumFormParamsDef;
 
 /**

package/src/components/ApplicationForm/ApplicationFormFeedback.tsx

@@ -5,6 +5,7 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { InputControl } from '../../ui-kit/Input/InputControl';
 import { type Option } from '../../ui-kit/Select/Option';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess, type Validator } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
@@ -17,7 +18,6 @@ import { PhoneInputControl } from './PhoneInputControl';
 import { RegionField } from './RegionField';
 import { renderAgreementSubmit } from './renderAgreementSubmit';
 import { initialUserFormState, renderUserData, type UserDataState } from './renderUserData';
-import { SelectControl } from './SelectControl';
 import {
   checkboxValidator,
   defaultValidator,

package/src/components/ApplicationForm/ApplicationFormGrantSupport.tsx

@@ -2,9 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getRegularButtonClasses } from '../../ui-kit/LinkButton/getRegularButtonClasses';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { style } from '../../utils/style';
 import { type ApplicationFormsProps } from './ApplicationFormsProps';
-import { SelectControl } from './SelectControl';
 
 export const ApplicationFormGrantSupport = JSX<ApplicationFormsProps>((props) => {
   const { button, regionSource } = props;

package/src/components/ApplicationForm/ApplicationFormIndividuals.tsx

@@ -1,13 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
+import { DatePickerControl } from '../../ui-kit/DatePicker/DatePickerControl';
 import { InputControl } from '../../ui-kit/Input/InputControl';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
 import { ApplicationFieldsetLayout, formChildrenStyle } from './ApplicationFieldsetLayout';
 import { type ApplicationFormsProps } from './ApplicationFormsProps';
-import { DatePickerControl } from './DatePickerControl';
 import { formStyle } from './formStyle';
 import { PhoneInputControl } from './PhoneInputControl';
 import { renderAgreementSubmit } from './renderAgreementSubmit';

package/src/components/ApplicationForm/ApplicationFormUltraPremium.tsx

@@ -3,6 +3,7 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { InputControl } from '../../ui-kit/Input/InputControl';
 import { type Option } from '../../ui-kit/Select/Option';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
@@ -14,7 +15,6 @@ import { PhoneInputControl } from './PhoneInputControl';
 import { RegionPremiumField } from './RegionPremiumField';
 import { renderAgreementSubmit } from './renderAgreementSubmit';
 import { initialUserFormState, type UserDataState } from './renderUserData';
-import { SelectControl } from './SelectControl';
 import { checkboxValidator, defaultValidator, nameValidator, phoneValidator } from './validators';
 
 export const SERVICE_TYPES: Option[] = [

package/src/components/ApplicationForm/ApplicationFormWed.tsx

@@ -91,7 +91,7 @@ export const ApplicationFormWed = JSX<ApplicationFormsProps>((props) => {
   const [, { field, ...formProps }] = useForm(initialFormState, { onSubmit: handleSubmit });
 
   return (
-    <form className="container space-y-lg" onSubmit={formProps.onSubmit}>
+    <form className="container space-y-m" onSubmit={formProps.onSubmit}>
       {renderQuestionsInterested(field)}
       <Heading headingType="h6" title="Данные организации" className="@xl:text-center" />
       {renderWedDataOrganization({ field })}

package/src/components/ApplicationForm/EmbeddableForms.tsx

@@ -1,16 +1,13 @@
 import { ApplicationFormAcquiring } from './ApplicationFormAcquiring';
-import { ApplicationFormBusinessCard } from './ApplicationFormBusinessCard';
 import { ApplicationFormCredit } from './ApplicationFormCredit';
 import { ApplicationFormDeposit } from './ApplicationFormDeposit';
 import { ApplicationFormFeedback } from './ApplicationFormFeedback';
 import { ApplicationFormGrantSupport } from './ApplicationFormGrantSupport';
 import { ApplicationFormIndividuals } from './ApplicationFormIndividuals';
-import { ApplicationFormSelfCollection } from './ApplicationFormSelfCollection';
 import { ApplicationFormUltraPremium } from './ApplicationFormUltraPremium';
 import { ApplicationFormWed } from './ApplicationFormWed';
 
 export const EmbeddableForms = {
-  ApplicationFormBusinessCard,
   ApplicationFormWed,
   ApplicationFormDeposit,
   ApplicationFormCredit,
@@ -18,6 +15,5 @@ export const EmbeddableForms = {
   ApplicationFormGrantSupport,
   ApplicationFormIndividuals,
   ApplicationFormFeedback,
-  ApplicationFormSelfCollection,
   ApplicationFormUltraPremium,
 };

package/src/components/ApplicationForm/RegionField.tsx

@@ -1,12 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { useRegions } from '../../hooks/useRegions';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { withValidator } from '../../validation/withValidator';
-import { SelectControl } from './SelectControl';
-import { defaultSelectValidator } from './validators';
+import { type FieldDef } from '../ApplicationFormCustom/ApplicationFormCustomContent';
+import { validatorObj } from '../ApplicationFormCustom/getObjectValidator';
 
 interface RegionFieldProps {
   field: FormFieldRegisterer<any>;
+  input?: FieldDef;
 }
 
 export const RegionField = JSX<RegionFieldProps>(({ field }) => {
@@ -19,7 +21,7 @@ export const RegionField = JSX<RegionFieldProps>(({ field }) => {
       placeholder="Выберите филиал"
       isSearch={true}
       options={regions.map(({ code = '', name = '' }) => ({ key: code, text: name }))}
-      {...withValidator(field('region'), defaultSelectValidator)}
+      {...withValidator(field('region'), validatorObj.region)}
     />
   );
 });

package/src/components/ApplicationForm/RegionPremiumField.tsx

@@ -2,8 +2,8 @@ import { JSX } from '@redneckz/uni-jsx';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { usePremiumBranchesByRegions } from '../../hooks/usePremiumBranchesByRegions';
 import { type Option } from '../../ui-kit/Select/Option';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { withValidator } from '../../validation/withValidator';
-import { SelectControl } from './SelectControl';
 import { defaultValidator } from './validators';
 
 interface RegionFieldProps {

package/src/components/ApplicationForm/formStyle.ts

@@ -1,3 +1,3 @@
-export const formStyle = 'container space-y-lg';
+export const formStyle = 'container space-y-m';
 
 export const oneColumnFormStyle = 'w-full max-w-xl space-y-s m-auto';

package/src/components/ApplicationForm/renderAcquiringRegion.tsx

@@ -1,10 +1,10 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { withValidator } from '../../validation/withValidator';
 import { ACQUIRING_TYPES } from './acquiringTypes';
 import { ApplicationFieldsetLayout, formChildrenStyle } from './ApplicationFieldsetLayout';
 import { type AcquiringFormState } from './ApplicationFormAcquiring';
 import { RegionField } from './RegionField';
-import { SelectControl } from './SelectControl';
 import { defaultValidator } from './validators';
 
 interface AcquiringRegionProps {

package/src/components/ApplicationForm/renderAgreementSubmit.tsx

@@ -8,7 +8,7 @@ import { Footnote } from './Footnote';
 import { renderSubmitButton } from './renderSubmitButton';
 import { checkboxValidator } from './validators';
 
-const agreementText = 'Нажимая кнопку, вы подтверждаете согласие с';
+const agreementText = 'Нажимая кнопку, вы подтверждаете согласие с ';
 export const renderAgreementSubmit = (
   consentDataProcessing?: FieldProps<boolean>,
   link?: LinkProps,

package/src/components/ApplicationForm/renderQuestionsInterested.tsx

@@ -8,7 +8,7 @@ export const renderQuestionsInterested = (field: FormFieldRegisterer<WedFormStat
 
   return (
     <ApplicationFieldsetLayout>
-      <div className="gap-xl grid @xl:flex @xl:items-center">
+      <div className="gap-m grid @xl:flex @xl:items-center">
         <Radio
           name="vedTypes"
           text="Валютный контроль"

package/src/components/ApplicationForm/renderUserData.tsx

@@ -1,8 +1,8 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { DatePickerControl } from '../../ui-kit/DatePicker/DatePickerControl';
 import { InputControl } from '../../ui-kit/Input/InputControl';
 import { withValidator } from '../../validation/withValidator';
 import { type FeedbackFormState } from './ApplicationFormFeedback';
-import { DatePickerControl } from './DatePickerControl';
 import { defaultValidator, nameValidator } from './validators';
 
 export interface UserDataState {

package/src/components/ApplicationForm/renderWedDataOrganization.tsx

@@ -16,7 +16,7 @@ export const renderWedDataOrganization = ({ field }: WedDataOrganizationProps) =
   return (
     <div className="space-y-s">
       {isCurrencyControl ? <RegionField field={field} /> : null}
-      <div className="grid @xl:grid-cols-2 @xl:gap-x-lg gap-s">
+      <div className="grid @xl:grid-cols-2 @xl:gap-x-m gap-s">
         {isCurrencyControl ? (
           <InputControl label="ИНН" {...withValidator(field('inn'), innValidator)} />
         ) : null}