@redneckz/wildless-cms-uni-blocks 0.9.16 → 0.10.0

package/src/components/ApplicationForm/ApplicationFormBusinessCard.tsx

@@ -1,16 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { Region } from '../../hooks/useRegions';
 import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
-import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import type { HandleFormStateChange } from './models';
-import { normalizeSelectedRegion } from './normalizeSelectedRegion';
+import { renderBusinessCardDataOrganization } from './renderBusinessCardDataOrganization';
+import { renderRegion } from './renderRegion';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useFormHandlers } from './useFormHandlers';
-import { WrapperSelect } from './WrapperSelect';
+import { useForm } from './useForm';
 
 export interface BusinessCardFormState {
   region: string;
@@ -20,128 +16,61 @@ export interface BusinessCardFormState {
   mail: string;
 }
 
+const initialFormState = {
+  region: '',
+  name: '',
+  phone: '',
+  inn: '',
+  mail: '',
+};
+
 export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
 
-  const [formState, setFormState] = useState<BusinessCardFormState>({
-    region: '',
-    name: '',
-    phone: '',
-    inn: '',
-    mail: '',
-  });
+  const { formState, errors, handleChange, handleChangeErrors, sendForm } =
+    useForm<BusinessCardFormState>({
+      initialFormState,
+      errorsInitialState: initialFormState,
+      handleSubmit,
+    });
 
   const { region, name, phone, inn, mail } = formState;
 
   const regions = useGetRegions();
 
-  const { handleChange } = useFormHandlers<BusinessCardFormState>({
-    setFormState,
-  });
-
-  const selectedRegion = normalizeSelectedRegion(region, regions);
-
-  const onSubmit = async (e: PreventableEvent) => {
+  const onSubmit = (e: PreventableEvent) => {
     e.preventDefault();
 
-    handleSubmit &&
-      (await handleSubmit({
-        typeForm: 'bcrd',
-        region: regions.find((_) => _.code === selectedRegion)?.name || '',
-        name,
-        phone,
-        inn,
-        mail,
-      }));
+    sendForm({
+      typeForm: 'bcrd',
+      region: regions.find((_) => _.code === region)?.name || '',
+      name,
+      phone,
+      inn,
+      mail,
+    });
   };
 
   return (
     <form onSubmit={onSubmit} className="container">
       {renderRegion({
         regions,
-        region: selectedRegion,
+        region,
+        handleChange,
+        errors,
+        handleChangeErrors,
+      })}
+      {renderBusinessCardDataOrganization({
+        name,
+        phone,
+        inn,
+        mail,
         handleChange,
+        errors,
+        handleChangeErrors,
       })}
-      {renderDataOrganization({ name, phone, inn, mail, handleChange })}
       {renderSubmitButton(button, 'mb-4')}
       <Footnote link={link} />
     </form>
   );
 });
-
-interface RenderDataOrganizationProps {
-  name: string;
-  phone: string;
-  mail: string;
-  inn: string;
-  handleChange: HandleFormStateChange<BusinessCardFormState>;
-}
-
-const renderDataOrganization = ({
-  name,
-  phone,
-  mail,
-  inn,
-  handleChange,
-}: RenderDataOrganizationProps) => (
-  <div className="flex justify-between gap-5">
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="Контактное лицо"
-        label="Контактное лицо"
-        value={name}
-        onChange={(value) => handleChange({ name: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="ИНН"
-        label="ИНН"
-        value={inn}
-        onChange={(value) => handleChange({ inn: value })}
-      />
-    </div>
-    <div className="w-1/2">
-      <Input
-        className="shrink-0 text-l w-full mb-5"
-        type="text"
-        aria-label="Телефон"
-        label="Телефон"
-        value={phone}
-        onChange={(value) => handleChange({ phone: value })}
-      />
-      <Input
-        className="shrink-0 text-l w-full "
-        type="text"
-        aria-label="Электронная почта"
-        label="Электронная почта"
-        value={mail}
-        onChange={(value) => handleChange({ mail: value })}
-      />
-    </div>
-  </div>
-);
-
-interface RenderRegionProps {
-  regions: Region[];
-  region: string;
-  handleChange: HandleFormStateChange<BusinessCardFormState>;
-}
-
-const renderRegion = ({ regions, region, handleChange }: RenderRegionProps) => (
-  <div className="flex justify-between gap-5 mb-5">
-    <div className="w-full">
-      <WrapperSelect
-        data={regions}
-        fieldValue="code"
-        fieldLabel="name"
-        selected={region}
-        setSelected={(value) => handleChange({ region: value })}
-        label="Регион"
-        placeholder="Выберите регион"
-      />
-    </div>
-  </div>
-);

package/src/components/ApplicationForm/ApplicationFormCredit.tsx

@@ -1,18 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBranches } from '../../hooks/useBranches';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
-import { MIN_CREDIT_AMOUNT, MIN_CREDIT_TERM } from './CreditParameters';
+import { MIN_CREDIT_AMOUNT } from './CreditParameters';
 import { Footnote } from './Footnote';
-import { normalizeSelectedRegion } from './normalizeSelectedRegion';
-import { renderBankOffices } from './renderBankOffices';
+import { renderCreditDataOrganization } from './renderCreditDataOrganization';
 import { renderCreditParameters } from './renderCreditParameters';
-import { renderDataOrganization } from './renderDataOrganization';
+import { renderRegionDepartment } from './renderRegionDepartment';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useFormHandlers } from './useFormHandlers';
+import { useForm } from './useForm';
 
 export interface CreditFormState {
   amount: number;
@@ -27,76 +25,89 @@ export interface CreditFormState {
   annualRevenue: string;
 }
 
-export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
-  const { button, link, handleSubmit } = props;
+const initialFormState = {
+  amount: MIN_CREDIT_AMOUNT,
+  term: 12,
+  fullName: '',
+  inn: '',
+  name: '',
+  phone: '',
+  mail: '',
+  region: '',
+  department: '',
+  annualRevenue: '',
+};
 
-  const [formState, setFormState] = useState<CreditFormState>({
-    amount: MIN_CREDIT_AMOUNT,
-    term: MIN_CREDIT_TERM,
-    fullName: '',
-    inn: '',
-    name: '',
-    phone: '',
-    mail: '',
-    region: '',
-    department: '',
-    annualRevenue: '',
-  });
+const errorsInitialState = {
+  annualRevenue: '',
+  inn: '',
+  name: '',
+  phone: '',
+  region: '',
+  department: '',
+};
 
-  const { amount, term, fullName, inn, name, phone, mail, region, department, annualRevenue } =
-    formState;
+export const ApplicationFormCredit = JSX<ApplicationFormsProps>(
+  ({ button, link, handleSubmit }) => {
+    const regions = useGetRegions();
 
-  const regions = useGetRegions();
+    const { formState, errors, handleChange, handleChangeErrors, sendForm } =
+      useForm<CreditFormState>({
+        initialFormState,
+        errorsInitialState,
+        handleSubmit,
+      });
 
-  const { handleChange } = useFormHandlers<CreditFormState>({
-    setFormState,
-  });
+    const { amount, term, fullName, inn, name, phone, mail, region, department, annualRevenue } =
+      formState;
 
-  const selectedRegion = normalizeSelectedRegion(region, regions);
+    const branches = useBranches(region).filter((branch) => branch.address);
 
-  const branches = useBranches(selectedRegion).filter((branch) => branch.address);
+    const onSubmit = (e: PreventableEvent) => {
+      e.preventDefault();
 
-  useEffect(() => {
-    handleChange({
-      department: '',
-    });
-  }, [formState.region, handleChange]);
-
-  const onSubmit = async (e: PreventableEvent) => {
-    e.preventDefault();
-
-    const partnerComments = `Сумма=${amount}/Срок=${term}/Выручка=${annualRevenue}`;
-
-    handleSubmit &&
-      (await handleSubmit({
+      sendForm({
         typeForm: 'cred',
         fullName,
         inn,
         name,
         phone,
         mail,
-        region: regions.find((_) => _.code === selectedRegion)?.name || '',
+        region: regions.find((_) => _.code === region)?.name || '',
         department: branches.find((_) => _.branchCode === department)?.address || '',
-        partnerComments,
-      }));
-  };
+        partnerComments: `Сумма=${amount}/Срок=${term}/Выручка=${annualRevenue}`,
+      });
+    };
 
-  return (
-    <form onSubmit={onSubmit} className="container">
-      <Heading headingType="h6" title="Параметры кредита" className="text-center mb-4" />
-      {renderCreditParameters({ amount, term, handleChange })}
-      <Heading headingType="h6" title="Данные организации" className="text-center mb-4" />
-      {renderDataOrganization({ fullName, inn, name, phone, mail, annualRevenue, handleChange })}
-      <Heading headingType="h6" title="Офис Банка" className="text-center mb-4" />
-      {renderBankOffices({
-        regions,
-        region: selectedRegion,
-        branches,
-        department,
-        handleChange,
-      })}
-      {renderSubmitButton(button, 'mb-4')}
-      <Footnote link={link} />
-    </form>
-  );
-});
+    return (
+      <form onSubmit={onSubmit} className="container">
+        <Heading headingType="h6" title="Параметры кредита" className="text-center mb-4" />
+        {renderCreditParameters({ amount, term, handleChange })}
+        <Heading headingType="h6" title="Данные организации" className="text-center mb-4" />
+        {renderCreditDataOrganization({
+          fullName,
+          inn,
+          name,
+          phone,
+          mail,
+          annualRevenue,
+          handleChange,
+          errors,
+          handleChangeErrors,
+        })}
+        <Heading headingType="h6" title="Офис банка" className="text-center mb-4" />
+        {renderRegionDepartment({
+          regions,
+          region,
+          branches,
+          department,
+          handleChange,
+          errors,
+          handleChangeErrors,
+        })}
+        {renderSubmitButton(button, 'mb-4')}
+        <Footnote link={link} />
+      </form>
+    );
+  },
+);

package/src/components/ApplicationForm/ApplicationFormDeposit.tsx

@@ -1,42 +1,44 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Input } from '../../ui-kit/Input/Input';
 import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import type { HandleFormStateChange } from './models';
+import { InputControl } from './InputControl';
+import type { DataOrganization } from './models';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useFormHandlers } from './useFormHandlers';
+import { useForm } from './useForm';
+import { validate } from './validate';
 
 export interface DepositFormState {
   name: string;
   phone: string;
 }
 
+const initialFormState = {
+  name: '',
+  phone: '',
+};
+
 export const ApplicationFormDeposit = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
 
-  const [formState, setFormState] = useState<DepositFormState>({
-    name: '',
-    phone: '',
-  });
+  const { formState, errors, handleChange, handleChangeErrors, sendForm } =
+    useForm<DepositFormState>({
+      initialFormState,
+      errorsInitialState: initialFormState,
+      handleSubmit,
+    });
 
   const { name, phone } = formState;
 
-  const { handleChange } = useFormHandlers<DepositFormState>({
-    setFormState,
-  });
-
-  const onSubmit = async (e: PreventableEvent) => {
+  const onSubmit = (e: PreventableEvent) => {
     e.preventDefault();
 
-    handleSubmit &&
-      (await handleSubmit({
-        typeForm: 'dpst',
-        name,
-        phone,
-      }));
+    sendForm({
+      typeForm: 'dpst',
+      name,
+      phone,
+    });
   };
 
   return (
@@ -46,7 +48,13 @@ export const ApplicationFormDeposit = JSX<ApplicationFormsProps>((props) => {
         title="Оставьте заявку и мы ответим на любые вопросы по депозитам"
         className="text-center mb-4"
       />
-      {renderDataOrganization({ name: formState.name, phone: formState.phone, handleChange })}
+      {renderDataOrganization({
+        name,
+        phone,
+        handleChange,
+        errors,
+        handleChangeErrors,
+      })}
       <div className="flex justify-between items-center max-w-[560px] m-auto">
         <div className="flex-1">
           <Footnote link={link} />
@@ -57,29 +65,34 @@ export const ApplicationFormDeposit = JSX<ApplicationFormsProps>((props) => {
   );
 });
 
-interface RenderDataOrganizationProps {
+interface RenderDataOrganizationProps extends DataOrganization<DepositFormState> {
   name: string;
   phone: string;
-  handleChange: HandleFormStateChange<DepositFormState>;
 }
 
-const renderDataOrganization = ({ name, phone, handleChange }: RenderDataOrganizationProps) => (
+const renderDataOrganization = ({
+  name,
+  phone,
+  handleChange,
+  errors,
+  handleChangeErrors,
+}: RenderDataOrganizationProps) => (
   <div className="max-w-[560px] m-auto">
-    <Input
-      className="shrink-0 text-l w-full mb-5"
-      type="text"
-      aria-label="Имя"
+    <InputControl
+      className="shrink-0 text-l w-full mb-3"
       label="Имя"
+      error={errors['name']}
       value={name}
       onChange={(value) => handleChange({ name: value })}
+      onBlur={(value) => handleChangeErrors({ name: validate('name', value) })}
     />
-    <Input
-      className="shrink-0 text-l w-full mb-5"
-      type="text"
-      aria-label="Телефон"
+    <InputControl
+      className="shrink-0 text-l w-full mb-3"
       label="Телефон"
+      error={errors['phone']}
       value={phone}
       onChange={(value) => handleChange({ phone: value })}
+      onBlur={(value) => handleChangeErrors({ phone: validate('phone', value) })}
     />
   </div>
 );

package/src/components/ApplicationForm/ApplicationFormWed.tsx

@@ -1,15 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Input } from '../../ui-kit/Input/Input';
 import type { PreventableEvent } from '../../ui-kit/PreventableEvent';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import type { HandleFormStateChange } from './models';
 import { renderContacts } from './renderContacts';
 import { renderQuestionsInterested } from './renderQuestionsInterested';
 import { renderSubmitButton } from './renderSubmitButton';
-import { useFormHandlers } from './useFormHandlers';
+import { renderWedDataOrganization } from './renderWedDataOrganization';
+import { useForm } from './useForm';
 
 export interface WedFormState {
   fullName: string;
@@ -22,18 +20,32 @@ export interface WedFormState {
   text: string;
 }
 
+const initialFormState = {
+  fullName: '',
+  name: '',
+  phone: '',
+  mail: '',
+  currencyControl: false,
+  documentaryOperations: false,
+  conversionOperations: false,
+  text: '',
+};
+
+const errorsInitialState = {
+  fullName: '',
+  name: '',
+  phone: '',
+  mail: '',
+  text: '',
+};
+
 export const ApplicationFormWed = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
 
-  const [formState, setFormState] = useState<WedFormState>({
-    fullName: '',
-    name: '',
-    phone: '',
-    mail: '',
-    currencyControl: false,
-    documentaryOperations: false,
-    conversionOperations: false,
-    text: '',
+  const { formState, errors, handleChange, handleChangeErrors, sendForm } = useForm<WedFormState>({
+    initialFormState,
+    errorsInitialState,
+    handleSubmit,
   });
 
   const {
@@ -47,30 +59,31 @@ export const ApplicationFormWed = JSX<ApplicationFormsProps>((props) => {
     text,
   } = formState;
 
-  const { handleChange } = useFormHandlers<WedFormState>({
-    setFormState,
-  });
-
-  const onSubmit = async (e: PreventableEvent) => {
+  const onSubmit = (e: PreventableEvent) => {
     e.preventDefault();
 
-    const partnerComments = `Валютный контроль=${currencyControl}/Документарные операции=${documentaryOperations}/Конверсионные операции=${conversionOperations}/Доп инф=${text}`;
-
-    handleSubmit &&
-      (await handleSubmit({
-        typeForm: 'kved',
-        fullName,
-        name,
-        phone,
-        mail,
-        partnerComments,
-      }));
+    sendForm({
+      typeForm: 'kved',
+      fullName,
+      name,
+      phone,
+      mail,
+      partnerComments: `Валютный контроль=${currencyControl}/Документарные операции=${documentaryOperations}/Конверсионные операции=${conversionOperations}/Доп инф=${text}`,
+    });
   };
 
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Данные организации" className="text-center mb-4" />
-      {renderDataOrganization({ fullName, name, phone, mail, handleChange })}
+      {renderWedDataOrganization({
+        fullName,
+        name,
+        phone,
+        mail,
+        handleChange,
+        errors,
+        handleChangeErrors,
+      })}
       <Heading headingType="h6" title="Интересующий вопрос" className="text-center mb-4" />
       {renderQuestionsInterested({
         currencyControl,
@@ -92,66 +105,3 @@ export const ApplicationFormWed = JSX<ApplicationFormsProps>((props) => {
     </form>
   );
 });
-
-interface RenderDataOrganizationProps {
-  fullName: string;
-  name: string;
-  phone: string;
-  mail: string;
-  handleChange: HandleFormStateChange<WedFormState>;
-}
-
-const renderDataOrganization = ({
-  fullName,
-  name,
-  phone,
-  mail,
-  handleChange,
-}: RenderDataOrganizationProps) => (
-  <div>
-    <div className="flex justify-between gap-5 mb-5">
-      <div className="w-1/2">
-        <Input
-          className="shrink-0 text-l w-full"
-          type="text"
-          aria-label="Наименование организации"
-          label="Наименование организации"
-          value={fullName}
-          onChange={(value) => handleChange({ fullName: value })}
-        />
-      </div>
-      <div className="w-1/2">
-        <Input
-          className="shrink-0 text-l w-full"
-          type="text"
-          aria-label="ФИО"
-          label="ФИО"
-          value={name}
-          onChange={(value) => handleChange({ name: value })}
-        />
-      </div>
-    </div>
-    <div className="flex justify-between gap-5 mb-7">
-      <div className="w-1/2">
-        <Input
-          className="shrink-0 text-l w-full"
-          type="text"
-          aria-label="Телефон"
-          label="Телефон"
-          value={phone}
-          onChange={(value) => handleChange({ phone: value })}
-        />
-      </div>
-      <div className="w-1/2">
-        <Input
-          className="shrink-0 text-l w-full"
-          type="text"
-          aria-label="Электронная почта"
-          label="Электронная почта"
-          value={mail}
-          onChange={(value) => handleChange({ mail: value })}
-        />
-      </div>
-    </div>
-  </div>
-);