@redneckz/wildless-cms-uni-blocks 0.14.838 → 0.14.840

package/mobile/src/model/Picture.ts

@@ -1,4 +1,5 @@
 import { type IconName } from '../icons/IconName';
+import { type ComponentType } from './ComponentType';
 import { type IconVersion } from './IconVersion';
 import { type ImageSize } from './ImageSize';
 
@@ -36,10 +37,9 @@ export interface ImgSource {
 }
 
 /** @title Изображение */
-export interface Picture extends Img, ImgSource {
+export interface Picture extends Img, ImgSource, ComponentType {
   /** @title Другие форматы */
   sources?: ImgSource[];
-  className?: string;
 }
 
 export type IconProps = {

package/mobile/src/model/PlaceholderProps.ts

@@ -0,0 +1,3 @@
+export interface PlaceholderProps {
+  placeholder?: string;
+}

package/mobile/src/retail/components/DaDataInputControl/DaDataInputControl.tsx

@@ -1,13 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
-import { Input } from '../../../ui-kit/Input/Input';
 import { type InputProps } from '../../../ui-kit/Input/InputProps';
-import { renderErrorText } from '../../../ui-kit/Input/renderErrorText';
-import { getRequiredLabel } from '../../../utils/getRequiredLabel';
+import { InputWrapper } from '../../../ui-kit/Input/InputWrapper';
 import { noop } from '../../../utils/noop';
-import { style } from '../../../utils/style';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useInputPopup } from './useInputPopup';
 
@@ -19,38 +14,15 @@ export type DaDataInputProps = InputProps & {
 
 export const DaDataInputControl = JSX<DaDataInputProps>(
   ({
-    className,
-    label,
     value = '',
-    placeholder,
-    error,
-    errors,
     onChange = noop,
     onDaDataChange,
-    onBlur,
-    isTextarea,
-    type,
     name = '',
     daDataQueryPrefix,
-    isInteger = false,
-    maxLength,
     dadata = false,
-    disabled = false,
+    ...rest
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
-    const popupRef = useOutsideClick<HTMLDivElement>(close);
-
-    const handleChange = useCallback(
-      (v: string) => {
-        dadata && !isOpen && open();
-        maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
-      },
-      [isOpen, onChange],
-    );
-
-    useEffect(() => {
-      isInteger && value && onChange(normalizeInteger(value));
-    }, [value]);
 
     const inputRef = useInputPopup({
       isOpen: isOpen && dadata,
@@ -62,33 +34,15 @@ export const DaDataInputControl = JSX<DaDataInputProps>(
     });
 
     return (
-      <div
-        className={style('shrink-0 w-full', className)}
-        ref={popupRef}
-        onBlur={close}
-        onFocus={open}
-      >
-        <div ref={inputRef}>
-          <Input
-            disabled={disabled}
-            type={type || 'text'}
-            aria-label={label}
-            label={getRequiredLabel({ label, errors })}
-            valid={Boolean(!error)}
-            value={value}
-            onChange={handleChange}
-            onBlur={onBlur}
-            isTextarea={isTextarea}
-            placeholder={getPlaceholder(placeholder, errors, label)}
-          />
-        </div>
-        {renderErrorText(error)}
-      </div>
+      <InputWrapper
+        value={value}
+        onChange={onChange}
+        inputRef={inputRef}
+        isOpen={isOpen}
+        onOpen={open}
+        onClose={close}
+        {...rest}
+      />
     );
   },
 );
-
-const normalizeInteger = (val = '') => val.replace(/[^\d]+/g, '');
-
-const getPlaceholder = (placeholder?: string, errors?: string[], label?: string) =>
-  errors && !label ? `${placeholder}*` : placeholder;

package/mobile/src/retail/components/Fields/SelectField.tsx

@@ -1,3 +1,6 @@
+import { type DisabledProps } from '../../../model/DisabledProps';
+import { type LabelProps } from '../../../model/HeadlineType';
+import { type PlaceholderProps } from '../../../model/PlaceholderProps';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type Option } from '../../../ui-kit/Select/Option';
 import { SelectControl } from '../../../ui-kit/Select/SelectControl';
@@ -5,13 +8,15 @@ import { UniBlock } from '../../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
 import { type DictionaryItem } from '../../model/LeadFormData';
 
-export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
+export interface SelectFieldProps
+  extends CustomFieldProps,
+    UniBlockProps,
+    LabelProps,
+    DisabledProps,
+    PlaceholderProps {
   source?: DictionaryItem[];
-  label: string;
   fieldName: string;
-  placeholder?: string;
   isSearch?: boolean;
-  disabled?: boolean;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(

package/mobile/src/retail/components/VerifyPhoneDialog/SubmitButton.tsx

@@ -1,17 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type DisabledProps } from '../../../model/DisabledProps';
 import { Button } from '../../../ui-kit/Button/Button';
 import { Text } from '../../../ui-kit/Text/Text';
 
-interface SubmitButtonProps {
-  isDisabled: boolean;
+interface SubmitButtonProps extends DisabledProps {
   onClick: () => void;
   text?: string;
 }
 
-export const SubmitButton = JSX<SubmitButtonProps>(({ isDisabled, onClick, text }) => {
-  return (
-    <Button type="button" onClick={onClick} disabled={isDisabled}>
-      <Text font="font-normal">{text}</Text>
-    </Button>
-  );
-});
+export const SubmitButton = JSX<SubmitButtonProps>(({ disabled = false, onClick, text }) => (
+  <Button type="button" onClick={onClick} disabled={disabled}>
+    <Text font="font-normal">{text}</Text>
+  </Button>
+));

package/mobile/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -122,8 +122,8 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
   },
 );
 
-const renderNextButton = (isDisabled: boolean, onClick: () => void) => (
-  <SubmitButton text="Далее" isDisabled={isDisabled} onClick={onClick} />
+const renderNextButton = (disabled: boolean, onClick: () => void) => (
+  <SubmitButton text="Далее" disabled={disabled} onClick={onClick} />
 );
 
 const renderText = (timeNextReq: number, handleSendCode: () => void) =>

package/mobile/src/retail/model/RetailFormContent.ts

@@ -1,3 +1,4 @@
+import { type DisabledProps } from '../../model/DisabledProps';
 import { type LabelProps, type TextProps } from '../../model/HeadlineType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type NameFieldDef } from './NameFieldDef';
@@ -29,8 +30,8 @@ export type FieldRetailDef = Required &
   TextProps &
   LabelProps &
   ConditionFieldProps &
-  FilledByEsiaProps & {
+  FilledByEsiaProps &
+  DisabledProps & {
     name?: NameFieldDef;
     dadata?: boolean;
-    disabled?: boolean;
   };

package/mobile/src/ui-kit/BaseProductTile/BaseProductTileContent.ts

@@ -1,5 +1,6 @@
 import { type Align } from '../../model/Align';
 import { type BulletsProps } from '../../model/Bullets';
+import { type ComponentType } from '../../model/ComponentType';
 import { type HeadlineProps, type LabelProps } from '../../model/HeadlineType';
 import { type BenefitsListContent } from '../BenefitsList/BenefitsListContent';
 import { type ImageContent } from '../Img/ImgProps';
@@ -10,7 +11,7 @@ import { type TagsContent } from '../Tags/TagsContent';
 type UnitList = '₽' | '$' | '€' | '¥';
 
 /** @title Доп. настройки картинки */
-export interface TileImageOptions {
+export interface TileImageOptions extends ComponentType {
   /** @title Картинка справа/текст слева */
   directionRight?: boolean;
   /** @title Выравнивание изображения */
@@ -19,8 +20,6 @@ export interface TileImageOptions {
   isImageSecondary?: boolean;
   /** @title Изображение всегда справа */
   isImageAlwaysOnRight?: boolean;
-  /** @hidden */
-  className?: string;
 }
 
 /** @title Цены */

package/mobile/src/ui-kit/BaseTile/renderImageContainer.tsx

@@ -1,4 +1,5 @@
 import { type Align } from '../../model/Align';
+import { type ComponentType } from '../../model/ComponentType';
 import { type VNode } from '../../model/VNode';
 import { style } from '../../utils/style';
 
@@ -10,7 +11,7 @@ const imageAlignmentMap: Record<Align, string> = {
 
 export const renderImageContainer = (
   image: VNode | undefined,
-  { className, imageAlign }: { className?: string; imageAlign?: Align },
+  { className, imageAlign }: ComponentType & { imageAlign?: Align },
 ) =>
   image ? (
     <div

package/mobile/src/ui-kit/BenefitItem/BenefitItem.tsx

@@ -1,14 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ComponentType } from '../../model/ComponentType';
 import { type IconVersion } from '../../model/IconVersion';
 import { style } from '../../utils/style';
 import { type BenefitItemContent } from './BenefitItemContent';
 import { renderBenefitIcon } from './renderBenefitIcon';
 import { renderBenefitText } from './renderBenefitText';
 
-export type BenefitItemProps = BenefitItemContent & {
-  className?: string;
-  benefitsVersion?: IconVersion;
-};
+export type BenefitItemProps = BenefitItemContent &
+  ComponentType & {
+    benefitsVersion?: IconVersion;
+  };
 
 export const BenefitItem = JSX<BenefitItemProps>(({ className, benefitsVersion, ..._ }) => (
   <div className={style('flex gap-m min-w-56 items-center', className)} role="listitem">

package/mobile/src/ui-kit/BenefitsList/BenefitsListProps.ts

@@ -1,6 +1,6 @@
+import { type ComponentType } from '../../model/ComponentType';
 import { type BenefitsListContent } from './BenefitsListContent';
 
-export interface BenefitsListProps extends BenefitsListContent {
-  className?: string;
+export interface BenefitsListProps extends BenefitsListContent, ComponentType {
   descriptionClassName?: string;
 }

package/mobile/src/ui-kit/Button/Button.tsx

@@ -3,12 +3,13 @@ import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { handlerDecorator } from '../../external/handlerDecorator';
 import { type AspectsDef } from '../../model/AspectsProps';
 import { type ButtonVersion } from '../../model/ButtonVersion';
+import { type ComponentType } from '../../model/ComponentType';
 import { type ColorPalette } from '../../model/ContentPageBase';
+import { type DisabledProps } from '../../model/DisabledProps';
 import { getAspectsAttributes } from '../../utils/dataAttributes';
 import { noop } from '../../utils/noop';
 import { style } from '../../utils/style';
 import { type ARIAProps } from '../ARIAProps';
-import { type ControlStateProps } from '../ControlStateProps';
 import { type PreventableEvent } from '../PreventableEvent';
 
 export const themeStyle: Record<ButtonVersion, string> = {
@@ -33,8 +34,7 @@ const embeddedStyle = style(
 
 const disabledStyle = style('bg-main-gray text-main-disabled cursor-not-allowed');
 
-export interface ButtonProps extends ControlStateProps, ARIAProps {
-  className?: string;
+export interface ButtonProps extends DisabledProps, ARIAProps, ComponentType {
   type?: 'button' | 'submit' | 'reset';
   version?: ButtonVersion;
   shape?: 'default' | 'round' | 'square';

package/mobile/src/ui-kit/Button/ButtonTitle.tsx

@@ -1,11 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ComponentType } from '../../model/ComponentType';
 import { style } from '../../utils/style';
 
-interface ButtonTitleProps {
-  className?: string;
-}
-
-export const ButtonTitle = JSX<ButtonTitleProps>(({ className, children }) => (
+export const ButtonTitle = JSX<ComponentType>(({ className, children }) => (
   <span
     className={style(
       'inline-flex items-center text-start gap-s group-[]/btn-embedded:text-primary-main',

package/mobile/src/ui-kit/Calculator/CalculatorProps.ts

@@ -1,4 +1,5 @@
 import { type JSONRefObject } from '../../data/JSONRefObject';
+import { type ComponentType } from '../../model/ComponentType';
 import { type Footnote } from '../../model/Footnote';
 import { type TitleProps } from '../../model/HeadlineType';
 import { type ButtonsSectionContent } from '../LinkButton/ButtonsSectionContent';
@@ -22,8 +23,7 @@ export type RateProps = {
   rate: number;
 };
 
-export interface CalcCurrencyProps {
-  className?: string;
+export interface CalcCurrencyProps extends ComponentType {
   title?: string;
   value?: number | string;
   fractionDigits?: number;

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

@@ -1,3 +1,7 @@
+import { type ComponentType } from '../../model/ComponentType';
+import type { ControlProps } from '../../model/ControlProps';
+import { type DisabledProps } from '../../model/DisabledProps';
+import { type TitleProps } from '../../model/HeadlineType';
 import { type ListOrientation } from '../../model/ListOrientation';
 import {
   RadioButtonGroup,
@@ -5,14 +9,13 @@ import {
 } from '../../ui-kit/RadioButtonGroup/RadioButtonGroup';
 import { Text } from '../../ui-kit/Text/Text';
 
-export interface BinaryRadioButtonGroupProps {
+export interface BinaryRadioButtonGroupProps
+  extends ComponentType,
+    DisabledProps,
+    TitleProps,
+    ControlProps<boolean> {
   items: [truthy: RadioButtonItem, falsy: RadioButtonItem];
-  title?: string;
   orientation?: ListOrientation;
-  value?: boolean;
-  className?: string;
-  onChange?: (value: boolean) => void;
-  disabled?: boolean;
 }
 
 export const renderBinaryRadioButtonGroup = ({

package/mobile/src/ui-kit/Checkbox/CheckboxProps.ts

@@ -1,9 +1,5 @@
-export interface CheckboxProps {
-  className?: string;
-  value?: boolean;
-  text?: string;
-  disabled?: boolean;
+import { type CommonInputProps } from '../../model/CommonInputProps';
+
+export interface CheckboxProps extends CommonInputProps<boolean> {
   isRadio?: boolean;
-  onChange?: (value: boolean) => void;
-  error?: string;
 }

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

@@ -2,10 +2,12 @@ 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 { useElementSpace } from '../../hooks/useElementSpace';
+import { type ComponentType } from '../../model/ComponentType';
+import { type ControlProps } from '../../model/ControlProps';
+import { type DisabledProps } from '../../model/DisabledProps';
 import { type LabelProps } from '../../model/HeadlineType';
 import { type IconVersion } from '../../model/IconVersion';
 import { style } from '../../utils/style';
-import { type ControlProps } from '../ControlProps';
 import { Icon } from '../Icon/Icon';
 import { type IconName } from '../Icon/IconProps';
 import { renderLabel } from '../Input/renderLabel';
@@ -28,12 +30,10 @@ const SELECT_PROPS: { className: string; iconVersion: IconVersion; isBorder: boo
   isBorder: false,
 };
 
-interface DatePickerProps extends ControlProps<Date>, LabelProps {
-  className?: string;
+interface DatePickerProps extends ControlProps<Date>, ComponentType, LabelProps, DisabledProps {
   minDate?: Date;
   maxDate?: Date;
   valid?: boolean;
-  disabled?: boolean;
 }
 
 export const DatePicker = JSX<DatePickerProps>(

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

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ControlProps } from '../../model/ControlProps';
 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';
 

package/mobile/src/ui-kit/DatePicker/DatePickerInput.tsx

@@ -1,5 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type ComponentType } from '../../model/ComponentType';
+import { type DisabledProps } from '../../model/DisabledProps';
 import { type IconVersion } from '../../model/IconVersion';
 import { normalizeWithMask } from '../../utils/normalizeWithMask';
 import { style } from '../../utils/style';
@@ -14,14 +16,12 @@ const ICON_PROPS: { name: IconName; iconVersion: IconVersion; width: string; hei
   height: '24',
 };
 
-interface DatePickerInputProps {
+interface DatePickerInputProps extends ComponentType, DisabledProps {
   setSelectedMonth: (selectedMonth: number) => void;
   setSelectedYear: (selectedYear: number) => void;
-  className?: string;
   value?: string;
   onChange?: (value: Date) => void;
   onClick?: () => void;
-  disabled?: boolean;
 }
 
 interface UpdateSelectedDateProps {

package/mobile/src/ui-kit/DatePicker/renderDatePickerForm.tsx

@@ -1,3 +1,5 @@
+import { type ControlProps } from '../../model/ControlProps';
+import { type DisabledProps } from '../../model/DisabledProps';
 import { formatDate } from '../../utils/formatDate';
 import { style } from '../../utils/style';
 import { DatePickerInput } from './DatePickerInput';
@@ -14,15 +16,13 @@ export const renderDatePickerForm = ({
   setSelectedMonth,
   setSelectedYear,
   disabled = false,
-}: {
-  handleChangeVisibleCalendar: () => void;
-  value: Date | undefined;
-  valid: boolean;
-  setSelectedMonth: (selectedMonth: number) => void;
-  setSelectedYear: (selectedYear: number) => void;
-  onChange?: (value: Date) => void;
-  disabled?: boolean;
-}) => (
+}: DisabledProps &
+  ControlProps<Date> & {
+    handleChangeVisibleCalendar: () => void;
+    valid: boolean;
+    setSelectedMonth: (selectedMonth: number) => void;
+    setSelectedYear: (selectedYear: number) => void;
+  }) => (
   <DatePickerInput
     onChange={onChange}
     disabled={disabled}

package/mobile/src/ui-kit/DatePicker/useDatePickerManager.ts

@@ -1,5 +1,6 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
+import { type ControlProps } from '../../model/ControlProps';
 import { type Option } from '../Select/Option';
 import { getYears } from './getYears';
 import { months } from './months';
@@ -10,15 +11,13 @@ const YEARS_OPTIONS = getYears()
   .reverse()
   .map((key) => ({ key: String(key) }));
 
-interface UseDatePickerManagerParams {
+interface UseDatePickerManagerParams extends ControlProps<Date> {
   onShowCalendar: (bool: boolean) => void;
   showCalendar: boolean;
   selectedMonth: number;
   onMonthSelect: (num: number) => void;
   selectedYear: number;
   onYearSelect: (num: number) => void;
-  onChange?: (date: Date) => void;
-  value?: Date;
 }
 
 export const useDatePickerManager = ({
@@ -108,12 +107,10 @@ const handleChangeMonth = ({
   selectedMonth,
   value,
   onChange,
-}: {
+}: ControlProps<Date> & {
   maxDateOfMonth: number;
   selectedYear: number;
   selectedMonth: number;
-  value?: Date;
-  onChange?: (value: Date) => void;
 }) => {
   value &&
     onChange?.(new Date(selectedYear, selectedMonth, Math.min(maxDateOfMonth, value.getDate())));

package/mobile/src/ui-kit/DialogManager/CloseButton.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ComponentType } from '../../model/ComponentType';
 import { style } from '../../utils/style';
 import { Icon } from '../Icon/Icon';
 import { type PreventableEvent } from '../PreventableEvent';
 
-interface CloseButtonProps {
-  className?: string;
+interface CloseButtonProps extends ComponentType {
   onClose?: (ev: PreventableEvent) => void;
 }
 

package/mobile/src/ui-kit/DialogManager/Dialog.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ComponentType } from '../../model/ComponentType';
 import { type VNode } from '../../model/VNode';
 import { style } from '../../utils/style';
 import { type PreventableEvent } from '../PreventableEvent';
 import { CloseButton } from './CloseButton';
 
-export interface DialogProps {
-  className?: string;
+export interface DialogProps extends ComponentType {
   head?: VNode;
   onClose?: () => void;
   onClick?: (e: PreventableEvent) => void;

package/mobile/src/ui-kit/Foldable/Foldable.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ComponentType } from '../../model/ComponentType';
 import { style } from '../../utils/style';
 import { type ARIAProps } from '../ARIAProps';
 
-export interface FoldableProps extends ARIAProps {
-  className?: string;
-}
+export interface FoldableProps extends ARIAProps, ComponentType {}
 
 // TODO Не особо полезно, в итоге
 export const Foldable = JSX<FoldableProps>(({ className, role = 'tablist', children }) => (

package/mobile/src/ui-kit/Foldable/FoldableSection.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useRef } from '@redneckz/uni-jsx/lib/hooks';
 import { useResizeObserver } from '../../hooks/useResizeObserver';
+import { type ComponentType } from '../../model/ComponentType';
 import { style } from '../../utils/style';
 
-export interface FoldableSectionProps {
-  className?: string;
+export interface FoldableSectionProps extends ComponentType {
   isUnfolded?: boolean;
 }
 

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -30,7 +30,7 @@ export const validatorObj: Record<string, Validator> = {
   sufferedFrom: defaultValidator(),
   applierType: defaultValidator(),
   surname: nameValidator('Укажите свою фамилию на кириллице'),
-  name: nameValidator('Укажите своё имя на кириллице'),
+  name: nameValidator('Укажите своё имя на кириллице (без сокращений)'),
   middleName: nameValidator('Укажите своё отчество на кириллице'),
   birthday: defaultValidator('Укажите дату рождения'),
   phone: phoneValidator('Укажите номер телефона'),

package/mobile/src/ui-kit/Heading/HeadingProps.ts

@@ -1,3 +1,4 @@
+import { type ComponentType } from '../../model/ComponentType';
 import { type TitleProps } from '../../model/HeadlineType';
 
 /**
@@ -17,7 +18,4 @@ export interface HeadingCommonProps extends TitleProps {
   headingType?: HeadingType;
 }
 
-export interface HeadingProps extends HeadingCommonProps {
-  /** @hidden */
-  className?: string;
-}
+export interface HeadingProps extends HeadingCommonProps, ComponentType {}

package/mobile/src/ui-kit/Icon/Icon.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useRouter } from '../../external/useRouter';
+import { type ComponentType } from '../../model/ComponentType';
 import { type IconVersion } from '../../model/IconVersion';
 import { projectSettings } from '../../ProjectSettings';
 import { adjustHref } from '../../utils/adjustHref';
@@ -87,7 +88,7 @@ const getInlineStyle = (className?: string, height?: string) =>
     : { height: isOnlyDigits(height) ? `${height}px` : height, width: 'auto' };
 
 // TODO И это тоже
-const Background = JSX<{ className?: string }>(({ className, children }) =>
+const Background = JSX<ComponentType>(({ className, children }) =>
   className ? (
     <div role="img" className={className}>
       {children}

package/mobile/src/ui-kit/Icon/IconProps.ts

@@ -1,4 +1,5 @@
 import { type IconName } from '../../icons/IconName';
+import { type ComponentType } from '../../model/ComponentType';
 import { type IconVersion } from '../../model/IconVersion';
 
 export type { IconName };
@@ -38,9 +39,9 @@ export interface IconCompatibilityFields {
   height?: string;
 }
 
-export type IconProps = IconCompatibilityFields & {
-  className?: string;
-  imageClassName?: string;
-  name?: IconName;
-  iconVersion?: IconVersion;
-};
+export type IconProps = IconCompatibilityFields &
+  ComponentType & {
+    imageClassName?: string;
+    name?: IconName;
+    iconVersion?: IconVersion;
+  };

package/mobile/src/ui-kit/Img/ImgProps.ts

@@ -1,3 +1,4 @@
+import { type ComponentType } from '../../model/ComponentType';
 import { type Picture } from '../../model/Picture';
 import { type IconCompatibilityFields } from '../Icon/IconProps';
 
@@ -5,7 +6,6 @@ export interface ImageContent {
   image?: Picture;
 }
 
-export interface ImageProps extends ImageContent, IconCompatibilityFields {
-  className?: string;
+export interface ImageProps extends ImageContent, IconCompatibilityFields, ComponentType {
   imageClassName?: string;
 }