@redneckz/wildless-cms-uni-blocks 0.14.594 → 0.14.595

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

@@ -1,18 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
 import { renderErrorText } from '../Input/renderErrorText';
 import { Select, type SelectProps } from './Select';
 
-interface SelectControlProps extends SelectProps {
-  label?: string;
-  error?: string;
-  errors?: string[];
-  className?: string;
-}
-
-export const SelectControl = JSX<SelectControlProps>(
-  ({ className = '', label, error, ...rest }) => (
+export const SelectControl = JSX<SelectProps>(
+  ({ className = '', label, error, errors, ...rest }) => (
     <div className={className}>
-      <Select {...rest} valid={!error} label={rest?.errors ? `${label}*` : label} />
+      <Select {...rest} valid={!error} label={getRequiredLabel({ label, errors })} />
       {renderErrorText(error)}
     </div>
   ),

package/mobile/src/utils/getRequiredLabel.ts

@@ -0,0 +1,4 @@
+import type { DefaultControlType } from '../model/DefaultControlType';
+
+export const getRequiredLabel = ({ label, errors }: DefaultControlType) =>
+  label && errors ? `${label}*` : label;

package/package.json

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

package/src/model/DefaultControlType.ts

@@ -0,0 +1,7 @@
+export interface DefaultControlType {
+  className?: string;
+  label?: string;
+  error?: string;
+  errors?: string[];
+  placeholder?: string;
+}

package/src/ui-kit/Calculator/renderBinaryRadioButtonGroup.tsx

@@ -44,7 +44,7 @@ export const renderBinaryRadioButtonGroup = ({
     <RadioButtonGroup
       orientation={orientation}
       items={items}
-      checkedItem={items[value ? 0 : 1].id}
+      value={items[value ? 0 : 1].id}
       onChange={(_) => onChange && onChange(_ === items[0].id)}
       {...rest}
     />

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

@@ -1,25 +1,17 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type DefaultControlType } from '../../model/DefaultControlType';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
 import { style } from '../../utils/style';
+import { type ControlProps } from '../ControlProps';
 import { renderErrorText } from '../Input/renderErrorText';
 import { DatePicker } from './DatePicker';
 
-export interface DatePickerControlProps {
-  className?: string;
-  label: string;
-  value?: Date;
-  error?: string;
-  errors?: string[];
-  onChange?: (value: Date) => void;
-}
+export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {}
 
 export const DatePickerControl = JSX<DatePickerControlProps>(
-  ({ className, label, error, ...rest }) => (
+  ({ className, label, error, errors, ...rest }) => (
     <div className={style('shrink-0 w-full', className)}>
-      <DatePicker
-        label={label && rest?.errors ? `${label}*` : label}
-        valid={Boolean(!error)}
-        {...rest}
-      />
+      <DatePicker label={getRequiredLabel({ label, errors })} valid={Boolean(!error)} {...rest} />
       {renderErrorText(error)}
     </div>
   ),

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

@@ -1,22 +1,24 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { RadioButtonGroup, type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
+import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
+import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
 export const SEX_TYPES: RadioButtonItem[] = [
   { id: 'male', text: 'Мужской' },
   { id: 'female', text: 'Женский' },
 ];
 
-export const SexField = JSX<CustomFieldProps>(({ field }) => {
-  const { value, onChange } = field('sex');
-
+export const SexField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
-    <RadioButtonGroup
-      title="Пол"
-      orientation="horizontal"
-      items={SEX_TYPES}
-      checkedItem={value}
-      onChange={(_) => onChange && onChange(_)}
-    />
+    <div>
+      <RadioButtonGroupControl
+        label="Пол"
+        orientation="horizontal"
+        items={SEX_TYPES}
+        {...getValidation(field('sex'), validatorObj.sex, input?.required)}
+      />
+    </div>
   );
 });

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

@@ -25,7 +25,7 @@ export const VedField = JSX<CustomFieldProps>(({ field }) => {
         className="whitespace-normal"
         orientation="horizontal"
         items={VED_TYPES}
-        checkedItem={value}
+        value={value}
         onChange={(_) => onChange && onChange(_)}
       />
     </div>

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
 import { noop } from '../../utils/noop';
 import { style } from '../../utils/style';
 import { Input } from './Input';
@@ -44,7 +45,7 @@ export const InputControl = JSX<InputProps>(
           <Input
             type={type || 'text'}
             aria-label={label}
-            label={getLabel(errors, label)}
+            label={getRequiredLabel({ label, errors })}
             valid={Boolean(!error)}
             value={value}
             onChange={onChange}
@@ -59,7 +60,5 @@ export const InputControl = JSX<InputProps>(
   },
 );
 
-const getLabel = (errors?: string[], label?: string) => (label && errors ? `${label}*` : label);
-
 const getPlaceholder = (placeholder?: string, errors?: string[], label?: string) =>
   errors && !label ? `${placeholder}*` : placeholder;

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

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
 import { style } from '../../utils/style';
 import { PhoneInput } from '../PhoneInput/PhoneInput';
 import { type InputProps } from './InputProps';
@@ -8,7 +9,7 @@ export const InputPhoneControl = JSX<InputProps>(({ className, label, error, ...
   <div className={style('shrink-0 w-full', className)}>
     <PhoneInput
       aria-label={label}
-      label={rest?.errors ? `${label}*` : label}
+      label={getRequiredLabel({ label, errors: rest?.errors })}
       valid={Boolean(!error)}
       placeholder="+7 (___) ___-__-__"
       {...rest}

package/src/ui-kit/Input/InputProps.ts

@@ -1,14 +1,12 @@
-import { type LabelProps } from '../../model/HeadlineType';
+import { type DefaultControlType } from '../../model/DefaultControlType';
 import { type InputTypes } from '../../model/InputTypes';
 import { type ControlProps } from '../ControlProps';
 import { type PreventableEventWithTarget } from '../PreventableEvent';
 
-export interface InputProps<V = string> extends ControlProps<V>, LabelProps {
-  className?: string;
+export interface InputProps<V = string> extends DefaultControlType, ControlProps<V> {
   id?: string;
   name?: string;
   type?: InputTypes;
-  placeholder?: string;
   pattern?: string;
   onFocus?: (ev: PreventableEventWithTarget) => void;
   onBlur?: (ev?: PreventableEventWithTarget) => void;
@@ -16,7 +14,5 @@ export interface InputProps<V = string> extends ControlProps<V>, LabelProps {
   disabled?: boolean;
   autoFocus?: boolean;
   isTextarea?: boolean;
-  error?: string;
-  errors?: string[];
   dadata?: boolean;
 }

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

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
 import { style } from '../../utils/style';
 import { SnilsInput } from '../SnilsInput/SnilsInput';
 import { type InputProps } from './InputProps';
@@ -9,7 +10,7 @@ export const InputSnilsControl = JSX<InputProps>(
     <div className={style('shrink-0 w-full', className)}>
       <SnilsInput
         aria-label={label}
-        label={rest?.errors ? `${label}*` : label}
+        label={getRequiredLabel({ label, errors: rest?.errors })}
         valid={Boolean(!error)}
         value={value}
         onChange={onChange}

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

@@ -23,7 +23,7 @@ export default {
         </Text>
         <RadioButtonGroup
           items={items}
-          checkedItem={'Аннуитетный'}
+          value="Аннуитетный"
           onChange={(text) => console.log('Выбран пункт меню: ', text)}
         />
       </div>
@@ -34,7 +34,7 @@ export default {
         <RadioButtonGroup
           items={items}
           orientation="vertical"
-          checkedItem={'Аннуитетный'}
+          value="Аннуитетный"
           onChange={(text) => console.log('Выбран пункт меню: ', text)}
         />
       </div>

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

@@ -1,19 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type DefaultControlType } from '../../model/DefaultControlType';
 import { type TextProps } from '../../model/HeadlineType';
 import { type ListOrientation } from '../../model/ListOrientation';
 import { style } from '../../utils/style';
 import { Checkbox } from '../Checkbox/Checkbox';
+import { type ControlProps } from '../ControlProps';
 import { Text } from '../Text/Text';
 
 export type RadioButtonItem = TextProps & {
   id: string;
 };
 
-interface RadioButtonGroupProps {
-  title?: string;
+export interface RadioButtonGroupProps extends DefaultControlType, ControlProps<string> {
   items?: RadioButtonItem[];
-  checkedItem?: string;
-  className?: string;
   onChange?: (id: string) => void;
   disabled?: boolean;
   orientation?: ListOrientation;
@@ -26,19 +25,19 @@ const orientationStyleMap: Record<ListOrientation, string> = {
 
 export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
   ({
-    title,
+    label,
     items,
-    checkedItem,
+    value,
     className,
     onChange: onChangeCheckedItem,
     disabled = false,
     orientation = 'horizontal',
   }) => (
     <div className="grid gap-xs whitespace-nowrap">
-      {title ? (
-        <div role="radiogroup" aria-label={title}>
+      {label ? (
+        <div role="radiogroup" aria-label={label}>
           <Text color="text-secondary-text" font="font-light">
-            {title}
+            {label}
           </Text>
         </div>
       ) : null}
@@ -52,7 +51,7 @@ export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
             key={String(id)}
             isRadio
             text={text}
-            value={checkedItem === id}
+            value={value === id}
             onChange={() => onChangeCheckedItem && onChangeCheckedItem(id)}
             disabled={disabled}
           />

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

@@ -0,0 +1,18 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
+import { style } from '../../utils/style';
+import { renderErrorText } from '../Input/renderErrorText';
+import { RadioButtonGroup, type RadioButtonGroupProps } from './RadioButtonGroup';
+
+export const RadioButtonGroupControl = JSX<RadioButtonGroupProps>(
+  ({ className, label, onChange, error, ...rest }) => (
+    <div className={style('shrink-0 w-full', className)}>
+      <RadioButtonGroup
+        label={getRequiredLabel({ label, errors: rest?.errors })}
+        onChange={(_) => onChange && onChange(_)}
+        {...rest}
+      />
+      {renderErrorText(error)}
+    </div>
+  ),
+);

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

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { type LabelProps } from '../../model/HeadlineType';
+import { type DefaultControlType } from '../../model/DefaultControlType';
 import { type IconVersion } from '../../model/IconVersion';
 import { style } from '../../utils/style';
+import { type ControlProps } from '../ControlProps';
 import { Icon } from '../Icon/Icon';
 import { Input } from '../Input/Input';
 import { renderLabel } from '../Input/renderLabel';
@@ -11,21 +12,16 @@ import { formatOption } from './formatOption';
 import { type Option } from './Option';
 import { useSelectPopup } from './useSelectPopup';
 
-export type SelectProps = LabelProps & {
-  className?: string;
+export interface SelectProps extends DefaultControlType, ControlProps<Option> {
   options?: Option[];
-  value?: Option;
   valid?: boolean;
   isBorder?: boolean;
-  placeholder?: string;
   isSearch?: boolean;
-  onChange?: (value: Option) => void;
   iconVersion?: IconVersion;
   disabled?: boolean;
-};
+}
 
 export const Select = JSX<SelectProps>(
-  // eslint-disable-next-line complexity
   ({
     className,
     label,
@@ -37,11 +33,11 @@ export const Select = JSX<SelectProps>(
     isSearch = false,
     iconVersion = 'black',
     onChange,
-    disabled,
+    disabled = false,
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
     const [query, setQuery] = useState('');
-    const isDisabled = disabled || options.length === 0;
+    const isDisabled = getDisabled(disabled, options.length);
     const hasOpen = isOpen && !isDisabled;
 
     const handleClose = useCallback(() => {
@@ -101,3 +97,5 @@ const getStyle = (isBorder: boolean, valid: boolean, disabled: boolean) =>
     disabled ? 'bg-main-divider' : 'cursor-pointer ',
     valid ? 'border-gray' : 'border-error',
   );
+
+const getDisabled = (disabled: boolean, length: number) => disabled || length === 0;

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

@@ -1,18 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
 import { renderErrorText } from '../Input/renderErrorText';
 import { Select, type SelectProps } from './Select';
 
-interface SelectControlProps extends SelectProps {
-  label?: string;
-  error?: string;
-  errors?: string[];
-  className?: string;
-}
-
-export const SelectControl = JSX<SelectControlProps>(
-  ({ className = '', label, error, ...rest }) => (
+export const SelectControl = JSX<SelectProps>(
+  ({ className = '', label, error, errors, ...rest }) => (
     <div className={className}>
-      <Select {...rest} valid={!error} label={rest?.errors ? `${label}*` : label} />
+      <Select {...rest} valid={!error} label={getRequiredLabel({ label, errors })} />
       {renderErrorText(error)}
     </div>
   ),

package/src/utils/getRequiredLabel.ts

@@ -0,0 +1,4 @@
+import type { DefaultControlType } from '../model/DefaultControlType';
+
+export const getRequiredLabel = ({ label, errors }: DefaultControlType) =>
+  label && errors ? `${label}*` : label;