@redneckz/wildless-cms-uni-blocks 0.14.961 → 0.14.962

package/mobile/src/ui-kit/Input/InputWrapper.tsx

@@ -30,6 +30,7 @@ export const InputWrapper = JSX<InputWrapperProps>(
     isOpen,
     onOpen,
     onClose,
+    required,
     onChange = noop,
     ...rest
   }) => {
@@ -57,7 +58,7 @@ export const InputWrapper = JSX<InputWrapperProps>(
           <Input
             type={type || 'text'}
             aria-label={label}
-            label={getRequiredLabel({ label, errors })}
+            label={getRequiredLabel({ label, required })}
             valid={Boolean(!error)}
             onChange={handleChange}
             placeholder={getPlaceholder({ placeholder, errors, label })}

package/mobile/src/ui-kit/RadioButtonGroup/RadioButtonGroupControl.tsx

@@ -5,9 +5,9 @@ import { renderErrorText } from '../Input/renderErrorText';
 import { RadioButtonGroup, type RadioButtonGroupProps } from './RadioButtonGroup';
 
 export const RadioButtonGroupControl = JSX<RadioButtonGroupProps>(
-  ({ className, label, error, ...rest }) => (
+  ({ className, label, required, error, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
-      <RadioButtonGroup label={getRequiredLabel({ label, errors: rest?.errors })} {...rest} />
+      <RadioButtonGroup label={getRequiredLabel({ label, required })} {...rest} />
       {renderErrorText(error)}
     </div>
   ),

package/mobile/src/ui-kit/Select/SelectControl.tsx

@@ -4,9 +4,9 @@ import { renderErrorText } from '../Input/renderErrorText';
 import { Select, type SelectProps } from './Select';
 
 export const SelectControl = JSX<SelectProps>(
-  ({ className = '', label, error, errors, ...rest }) => (
+  ({ className = '', label, error, required, ...rest }) => (
     <div className={className}>
-      <Select {...rest} valid={!error} label={getRequiredLabel({ label, errors })} />
+      <Select {...rest} valid={!error} label={getRequiredLabel({ label, required })} />
       {renderErrorText(error)}
     </div>
   ),

package/mobile/src/utils/getRequiredLabel.ts

@@ -1,5 +1,5 @@
 import type { DefaultControlType } from '../model/DefaultControlType';
 
 // TODO Базовая функицональность всех Control - надо вынести и привязать к required флагу
-export const getRequiredLabel = ({ label, errors }: DefaultControlType) =>
-  label && errors ? `${label}*` : label;
+export const getRequiredLabel = ({ label, required = false }: DefaultControlType) =>
+  label && required ? `${label}*` : label;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.961",
+  "version": "0.14.962",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationForm/getFormatData.tsx

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
-import { CLIENT_KEY, type ApplierType } from '../../ui-kit/FormField/Fields/ApplierTypeField';
-import { VED_TYPES } from '../../ui-kit/FormField/Fields/VedField';
+import { CLIENT_KEY, VED_TYPES, type ApplierType } from '../../ui-kit/FormField/constants';
 import { type Option } from '../../ui-kit/Select/Option';
 import { type FormState } from './getInitialFormState';
 import { getPartnerComments } from './getPartnerComments';

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -1,11 +1,11 @@
 import {
+  ACQUIRING_TYPES,
   FEEDBACK_METHOD,
   SERVICE_DIRECTIONS,
   SERVICE_TYPES,
+  VED_TYPES,
+  type ApplierType,
 } from '../../ui-kit/FormField/constants';
-import { ACQUIRING_TYPES } from '../../ui-kit/FormField/Fields/AcquiringField';
-import { type ApplierType } from '../../ui-kit/FormField/Fields/ApplierTypeField';
-import { VED_TYPES } from '../../ui-kit/FormField/Fields/VedField';
 import { type Option } from '../../ui-kit/Select/Option';
 import { type FieldDef } from './ApplicationFormContent';
 

package/src/model/DefaultControlType.ts

@@ -10,4 +10,5 @@ export interface DefaultControlType
     PlaceholderProps {
   error?: string;
   errors?: string[];
+  required?: boolean;
 }

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

@@ -12,9 +12,9 @@ export interface DatePickerControlProps extends DefaultControlType, ControlProps
 }
 
 export const DatePickerControl = JSX<DatePickerControlProps>(
-  ({ className, label, error, errors, ...rest }) => (
+  ({ className, label, error, required, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
-      <DatePicker label={getRequiredLabel({ label, errors })} valid={Boolean(!error)} {...rest} />
+      <DatePicker label={getRequiredLabel({ label, required })} valid={Boolean(!error)} {...rest} />
       {renderErrorText(error)}
     </div>
   ),

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

@@ -1,37 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
+import { ACQUIRING_TYPES } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-export const ACQUIRING_TYPES: Option[] = [
-  {
-    text: 'Торговый эквайринг',
-    key: 'trade',
-  },
-  {
-    text: 'СБП-эквайринг',
-    key: 'sbp',
-  },
-  {
-    text: 'Интернет-эквайринг',
-    key: 'internet',
-  },
-  {
-    text: 'SoftPOS',
-    key: 'softpos',
-  },
-  {
-    text: 'Все виды эквайринга',
-    key: 'all',
-  },
-];
-
 export const AcquiringField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Вид эквайринга"
     placeholder="Выберите эквайринг"
     options={ACQUIRING_TYPES}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));
 

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

@@ -36,6 +36,7 @@ export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, params
       }))}
       {...field(input?.name ?? '')}
       isSearch={true}
+      {...input}
     />
   );
 });

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

@@ -13,5 +13,6 @@ export const AmountField = JSX<CustomFieldProps>(({ field, input }) => (
     min={MIN_CREDIT_AMOUNT}
     max={MAX_CREDIT_AMOUNT}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

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

@@ -3,5 +3,5 @@ import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const AnnualRevenueField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl label="Годовая выручка, ₽" {...field(input?.name ?? '')} />
+  <InputControl label="Годовая выручка, ₽" {...field(input?.name ?? '')} {...input} />
 ));

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

@@ -3,5 +3,5 @@ import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const ApplicationDateField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl label="Дата и время обращения в Банк" {...field(input?.name ?? '')} />
+  <InputControl label="Дата и время обращения в Банк" {...input} {...field(input?.name ?? '')} />
 ));

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

@@ -1,26 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
+import { APPLIER_TYPES } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-export const CLIENT_KEY = 'client';
-export const REPRESENTATIVE_KEY = 'representative';
-
-export type ApplierType = Option & {
-  key: 'client' | 'representative';
-};
-
-export const APPLIER_TYPES: ApplierType[] = [
-  {
-    key: CLIENT_KEY,
-    text: 'Клиент',
-  },
-  {
-    key: REPRESENTATIVE_KEY,
-    text: 'Представитель клиента',
-  },
-];
-
 export const ApplierTypeField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Тип обратившегося"

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

@@ -6,5 +6,6 @@ export const BankEmpoleeField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ФИО или должность обслуживавшего Вас сотрудника Банка"
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

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

@@ -3,5 +3,9 @@ import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const BirthdayField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label={input?.label || 'Дата рождения'} {...field(input?.name ?? '')} />
+  <DatePickerControl
+    label={input?.label || 'Дата рождения'}
+    {...field(input?.name ?? '')}
+    {...input}
+  />
 ));

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

@@ -1,28 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
+import { CALLBACK_TIME } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-const CALLBACK_TIME: Option[] = [
-  {
-    key: 'Перезвонить сейчас',
-    text: 'Перезвонить сейчас',
-  },
-  /* Временно убрать, требование от бизнеса
-  {
-    key: 'Перезвонить через час',
-    text: 'Перезвонить через час',
-  },
-  {
-    key: 'Перезвонить через два часа',
-    text: 'Перезвонить через два часа',
-  },
-  {
-    key: 'Перезвонить завтра',
-    text: 'Перезвонить завтра',
-  }, */
-];
-
 export const CallbackTimeField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Когда перезвонить?"

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

@@ -7,5 +7,6 @@ export const CollectionCountField = JSX<CustomFieldProps>(({ field, input }) =>
     label="Количество объектов инкассации"
     isInteger={true}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

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

@@ -8,5 +8,6 @@ export const CommentField = JSX<CustomFieldProps>(({ field, input }) => (
     {...field(input?.name ?? '')}
     placeholder="Ваше сообщение"
     isTextarea={true}
+    {...input}
   />
 ));

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

@@ -106,6 +106,7 @@ export const DadataPartySelectField = JSX<CustomFieldProps>(({ field, input = {}
 
   return (
     <SelectControl
+      {...input}
       {...FIELD_CONFIG[fieldName]}
       options={getOptions}
       {...field(input.name ?? '')}

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

@@ -3,5 +3,5 @@ import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const DesiredMeetingDateField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label="Желаемая дата встречи" {...field(input?.name ?? '')} />
+  <DatePickerControl label="Желаемая дата встречи" {...field(input?.name ?? '')} {...input} />
 ));

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

@@ -8,5 +8,6 @@ export const FeedbackMethodField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Способ получения ответа"
     options={FEEDBACK_METHOD}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

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

@@ -27,6 +27,7 @@ export const FullRegionField = JSX<FullRegionFieldProps>(({ field, input, params
       placeholder="Выберите регион"
       options={regions as Option[]}
       {...field(input?.name ?? '')}
+      {...input}
     />
   );
 });

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

@@ -5,6 +5,7 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 export const IsClientField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     {...field(input?.name ?? '')}
+    {...input}
     text='Являюсь клиентом банка АО "Россельхозбанк"'
   />
 ));

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

@@ -29,6 +29,7 @@ export const LocalitiesField = JSX<RegionFieldProps>(({ field, input }) => {
       label="Населенный пункт"
       placeholder="Выберите город, где доступен сервис"
       options={localities}
+      {...input}
       {...field(input?.name ?? '')}
       isSearch={true}
     />

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

@@ -5,6 +5,6 @@ import { isAcquiringTrade } from './AcquiringField';
 
 export const OnlineCheckoutField = JSX<CustomFieldProps>(({ field, input }) =>
   isAcquiringTrade(field('acquiringType')?.value?.key as string) ? (
-    <SlideCheckbox type="radio" text="Хочу онлайн-кассу" {...field(input?.name ?? '')} />
+    <SlideCheckbox type="radio" text="Хочу онлайн-кассу" {...field(input?.name ?? '')} {...input} />
   ) : null,
 );

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

@@ -16,6 +16,7 @@ export const ProductField = UniBlock<ProductFieldProps>(({ field, input, source
     label="Продукт"
     options={arrayToOptions(source?.productList)}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));
 

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

@@ -1,25 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
+import { QUESTION_PRODUCT_TYPES } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 type RegionFieldProps = CustomFieldProps;
 
-const QUESTION_PRODUCT_TYPES: Option[] = [
-  {
-    key: 'Вопрос по действующему продукту',
-    text: 'Вопрос по действующему продукту',
-  },
-  {
-    key: 'Оформление нового продукта',
-    text: 'Оформление нового продукта',
-  },
-];
-
 export const QuestionProductField = JSX<RegionFieldProps>(({ field, input }) => (
   <SelectControl
     label="Какой у вас вопрос?"
     options={QUESTION_PRODUCT_TYPES}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

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

@@ -19,6 +19,7 @@ export const RegionField = JSX<CustomFieldProps>(({ field, input, params }) => {
         [regions],
       )}
       {...field(input?.name ?? '')}
+      {...input}
     />
   );
 });

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

@@ -9,5 +9,6 @@ export const ServiceDirectionField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="Выберите направление"
     options={SERVICE_DIRECTIONS}
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

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

@@ -1,27 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
+import { SUFFERED_FROM_TYPES } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-const SUFFERED_FROM_TYPES: Option[] = [
-  {
-    key: 'blg',
-    text: 'Белгородской области',
-  },
-  {
-    key: 'brnsk',
-    text: 'Брянской области',
-  },
-  {
-    key: 'krsk',
-    text: 'Курской области',
-  },
-  {
-    key: 'chs',
-    text: 'От стихийного бедствия ЧС',
-  },
-];
-
 export const SufferedFromField = JSX<CustomFieldProps>(({ field, input }) => (
   <SelectControl
     label="Пострадал в"

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

@@ -4,5 +4,10 @@ import { SERVICE_TYPES } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const UltraPremiumField = JSX<CustomFieldProps>(({ field, input }) => (
-  <SelectControl label="Тип обслуживания" options={SERVICE_TYPES} {...field(input?.name ?? '')} />
+  <SelectControl
+    label="Тип обслуживания"
+    options={SERVICE_TYPES}
+    {...field(input?.name ?? '')}
+    {...input}
+  />
 ));

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

@@ -1,15 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { RadioButtonGroup, type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
+import { RadioButtonGroup } from '../../RadioButtonGroup/RadioButtonGroup';
+import { VED_TYPES } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
-export const VED_TYPES: RadioButtonItem[] = [
-  { id: 'currencyControl', text: 'Валютный контроль' },
-  { id: 'documentOperations', text: 'Документарные операции' },
-  { id: 'conversionTransactions', text: 'Конверсионные операции' },
-  { id: 'otherIssues', text: 'Иные вопросы ВЭД' },
-];
-
 export const VedField = JSX<CustomFieldProps>(({ field, input }) => {
   const handleChange = useCallback((_: string | undefined) => {
     if (_ !== 'currencyControl') {
@@ -25,6 +19,7 @@ export const VedField = JSX<CustomFieldProps>(({ field, input }) => {
         orientation="horizontal"
         items={VED_TYPES}
         {...field(input?.name ?? '', { onChange: handleChange })}
+        {...input}
       />
     </div>
   );

package/src/ui-kit/FormField/Fields//320/241onsentToReceiveMaterialsField.tsx

@@ -6,5 +6,6 @@ export const ConsentToReceiveMaterialsField = JSX<CustomFieldProps>(({ field, in
   <Checkbox
     text="Согласен на получение информационных и аналитических материалов по электронной почте"
     {...field(input?.name ?? '')}
+    {...input}
   />
 ));

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

@@ -1,3 +1,4 @@
+import type { RadioButtonItem } from '../RadioButtonGroup/RadioButtonGroup';
 import { type Option } from '../Select/Option';
 
 export const SERVICE_TYPES: Option[] = [{ key: 'ULTRASERVICE', text: 'Ультра' }];
@@ -11,3 +12,88 @@ export const FEEDBACK_METHOD: Option[] = [
   { key: 'phone', text: 'Телефонный звонок' },
   { key: 'email', text: 'Электронное сообщение' },
 ];
+
+export const CLIENT_KEY = 'client';
+export const REPRESENTATIVE_KEY = 'representative';
+
+export const APPLIER_TYPES: ApplierType[] = [
+  {
+    key: CLIENT_KEY,
+    text: 'Клиент',
+  },
+  {
+    key: REPRESENTATIVE_KEY,
+    text: 'Представитель клиента',
+  },
+];
+
+export type ApplierType = Option & {
+  key: 'client' | 'representative';
+};
+
+export const ACQUIRING_TYPES: Option[] = [
+  {
+    text: 'Торговый эквайринг',
+    key: 'trade',
+  },
+  {
+    text: 'СБП-эквайринг',
+    key: 'sbp',
+  },
+  {
+    text: 'Интернет-эквайринг',
+    key: 'internet',
+  },
+  {
+    text: 'SoftPOS',
+    key: 'softpos',
+  },
+  {
+    text: 'Все виды эквайринга',
+    key: 'all',
+  },
+];
+
+export const CALLBACK_TIME: Option[] = [
+  {
+    key: 'Перезвонить сейчас',
+    text: 'Перезвонить сейчас',
+  },
+];
+
+export const QUESTION_PRODUCT_TYPES: Option[] = [
+  {
+    key: 'Вопрос по действующему продукту',
+    text: 'Вопрос по действующему продукту',
+  },
+  {
+    key: 'Оформление нового продукта',
+    text: 'Оформление нового продукта',
+  },
+];
+
+export const SUFFERED_FROM_TYPES: Option[] = [
+  {
+    key: 'blg',
+    text: 'Белгородской области',
+  },
+  {
+    key: 'brnsk',
+    text: 'Брянской области',
+  },
+  {
+    key: 'krsk',
+    text: 'Курской области',
+  },
+  {
+    key: 'chs',
+    text: 'От стихийного бедствия ЧС',
+  },
+];
+
+export const VED_TYPES: RadioButtonItem[] = [
+  { id: 'currencyControl', text: 'Валютный контроль' },
+  { id: 'documentOperations', text: 'Документарные операции' },
+  { id: 'conversionTransactions', text: 'Конверсионные операции' },
+  { id: 'otherIssues', text: 'Иные вопросы ВЭД' },
+];

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

@@ -6,11 +6,11 @@ import { type InputProps } from './InputProps';
 import { renderErrorText } from './renderErrorText';
 
 export const InputPhoneControl = JSX<InputProps>(
-  ({ className, label, disabled, error, ...rest }) => (
+  ({ className, label, required, disabled, error, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
       <PhoneInput
         aria-label={label}
-        label={getRequiredLabel({ label, errors: rest?.errors })}
+        label={getRequiredLabel({ label, required })}
         valid={Boolean(!error)}
         disabled={disabled}
         placeholder="+7 (___) ___-__-__"

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

@@ -6,11 +6,11 @@ import { type InputProps } from './InputProps';
 import { renderErrorText } from './renderErrorText';
 
 export const InputSnilsControl = JSX<InputProps>(
-  ({ className, label, value, error, onChange, onBlur, ...rest }) => (
+  ({ className, label, required, value, error, onChange, onBlur, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
       <SnilsInput
         aria-label={label}
-        label={getRequiredLabel({ label, errors: rest?.errors })}
+        label={getRequiredLabel({ label, required })}
         valid={Boolean(!error)}
         value={value}
         onChange={onChange}

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

@@ -30,6 +30,7 @@ export const InputWrapper = JSX<InputWrapperProps>(
     isOpen,
     onOpen,
     onClose,
+    required,
     onChange = noop,
     ...rest
   }) => {
@@ -57,7 +58,7 @@ export const InputWrapper = JSX<InputWrapperProps>(
           <Input
             type={type || 'text'}
             aria-label={label}
-            label={getRequiredLabel({ label, errors })}
+            label={getRequiredLabel({ label, required })}
             valid={Boolean(!error)}
             onChange={handleChange}
             placeholder={getPlaceholder({ placeholder, errors, label })}

package/src/ui-kit/RadioButtonGroup/RadioButtonGroupControl.tsx

@@ -5,9 +5,9 @@ import { renderErrorText } from '../Input/renderErrorText';
 import { RadioButtonGroup, type RadioButtonGroupProps } from './RadioButtonGroup';
 
 export const RadioButtonGroupControl = JSX<RadioButtonGroupProps>(
-  ({ className, label, error, ...rest }) => (
+  ({ className, label, required, error, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
-      <RadioButtonGroup label={getRequiredLabel({ label, errors: rest?.errors })} {...rest} />
+      <RadioButtonGroup label={getRequiredLabel({ label, required })} {...rest} />
       {renderErrorText(error)}
     </div>
   ),

package/src/ui-kit/Select/SelectControl.tsx

@@ -4,9 +4,9 @@ import { renderErrorText } from '../Input/renderErrorText';
 import { Select, type SelectProps } from './Select';
 
 export const SelectControl = JSX<SelectProps>(
-  ({ className = '', label, error, errors, ...rest }) => (
+  ({ className = '', label, error, required, ...rest }) => (
     <div className={className}>
-      <Select {...rest} valid={!error} label={getRequiredLabel({ label, errors })} />
+      <Select {...rest} valid={!error} label={getRequiredLabel({ label, required })} />
       {renderErrorText(error)}
     </div>
   ),