@redneckz/wildless-cms-uni-blocks 0.16.3-isr → 0.16.4-credit

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;
 }

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

@@ -1,21 +1,20 @@
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type JSONRefObject } from '../../data/JSONRefObject';
+import type { OnClickProps } from '../../model/OnClickProps';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { Text } from '../Text/Text';
 import { InnerTableBody } from './InnerTableBody';
-import { TableInnerButton } from './InnerTableButton';
 import { InnerTableHeader } from './InnerTableHeader';
 import { type TableFetchData, type TariffsTableInnerContent } from './InnerTableProps';
 
-export interface InnerTableProps extends TariffsTableInnerContent, UniBlockProps {
-  onClick?: () => void;
+export interface InnerTableProps extends TariffsTableInnerContent, UniBlockProps, OnClickProps {
   tableSource?: JSONRefObject & TableFetchData;
 }
 
 const EMPTY_DATA = 'Данных нет';
 
-export const InnerTable = UniBlock<InnerTableProps>(({ tableSource, pdfUrl, onClick }) => {
+export const InnerTable = UniBlock<InnerTableProps>(({ tableSource }) => {
   const tableData = tableSource?.tableData;
   const [activeTabIndex, setActiveTabIndex] = useState(0);
   const handleActiveTabIndex = useCallback((_: number) => setActiveTabIndex(_), []);
@@ -28,15 +27,12 @@ export const InnerTable = UniBlock<InnerTableProps>(({ tableSource, pdfUrl, onCl
         currencies={currencies}
         activeTabIndex={activeTabIndex}
         setActiveTabIndex={handleActiveTabIndex}
-        linkToPDF={pdfUrl} //TODO: need link to service
       />
       <InnerTableBody activeTabIndex={activeTabIndex} items={items} />
-      <TableInnerButton className="mt-xl" onClick={onClick} isOpen />
     </div>
   ) : (
-    <div className="my-lg space-y-m text-center">
+    <div className="space-y-m text-center">
       <Text size="text-h6">{EMPTY_DATA}</Text>
-      <TableInnerButton onClick={onClick} isOpen />
     </div>
   );
 });

package/mobile/src/ui-kit/InnerTable/InnerTableBody.tsx

@@ -8,27 +8,25 @@ export interface InnerTableBodyProps {
   items: DataItem[];
 }
 
-export const InnerTableBody = JSX<InnerTableBodyProps>(({ activeTabIndex, items }) => {
-  return (
-    <div>
-      {items.map((_, tableIdx) => {
-        const key = `activeTabIdx:${activeTabIndex}-tableIdx:${tableIdx}`;
+export const InnerTableBody = JSX<InnerTableBodyProps>(({ activeTabIndex, items }) => (
+  <div>
+    {items.map((_, tableIdx) => {
+      const key = `activeTabIdx:${activeTabIndex}-tableIdx:${tableIdx}`;
 
-        return (
-          <div key={key} className="w-full @container">
-            <div className="flex py-m sm:px-m bg-white @4xl:bg-gray relative">
-              <Text size="text-xl" align="text-left">
-                {_.title}
-              </Text>
-            </div>
-            <div className="w-full sm:pl-xs overflow-hidden transition-height duration-500 ease-in-out">
-              <div className="relative">
-                <InnerTableBodyItem rows={_.rowsData} />
-              </div>
+      return (
+        <div key={key} className="w-full @container">
+          <div className="flex py-m px-m bg-white @4xl:bg-gray relative">
+            <Text size="text-xl" align="text-left">
+              {_.title}
+            </Text>
+          </div>
+          <div className="w-full sm:pl-xs overflow-hidden transition-height duration-500 ease-in-out">
+            <div className="relative">
+              <InnerTableBodyItem rows={_.rowsData} />
             </div>
           </div>
-        );
-      })}
-    </div>
-  );
-});
+        </div>
+      );
+    })}
+  </div>
+));

package/mobile/src/ui-kit/InnerTable/InnerTableButton.tsx

@@ -1,14 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type TariffsTableCellIndexProps } from '../../components/TariffsTable/TariffsTableContent';
+import { type ComponentType } from '../../model/ComponentType';
+import { type OnClickProps } from '../../model/onClick';
 import { DefaultFoldButton } from '../Foldable/DefaultFoldButton';
 import { type TariffsTableInnerContent } from './InnerTableProps';
 
 export interface InnerTableButtonProps
-  extends Partial<TariffsTableCellIndexProps>,
-    TariffsTableInnerContent {
-  onClick?: () => void;
+  extends TariffsTableInnerContent,
+    ComponentType,
+    OnClickProps {
   isOpen?: boolean;
-  className?: string;
 }
 
 export const TableInnerButton = JSX<InnerTableButtonProps>(

package/mobile/src/ui-kit/InnerTable/InnerTableProps.ts

@@ -19,9 +19,7 @@ export type TableFetchData = {
   tableData?: TableData[];
 };
 
-export interface TariffsTableInnerContent {
+export type TariffsTableInnerContent = {
   /** @title Справочник */
   tableSource?: JSONRefObject;
-  /** @title Ссылка PDF-файл */
-  pdfUrl?: string;
-}
+};

package/mobile/src/ui-kit/InnerTable/renderInnerTableRow.tsx

@@ -17,7 +17,7 @@ export const renderInnerTableRow =
     return (
       <div key={String(rowIdx)} className="flex border-main-divider border-b border-solid h-full">
         {headerColumn?.data ? (
-          <div className="whitespace-pre-wrap sm:whitespace-normal w-48 sm:w-56 sm:min-w-56 py-lg pr-lg sm:pr-0">
+          <div className="whitespace-pre-wrap sm:whitespace-normal w-48 min-w-48 sm:w-56 sm:min-w-56 py-lg pr-lg sm:pr-0">
             <Text size="text-xl" font="font-light">
               {headerColumn.data}
             </Text>

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

@@ -1,73 +1,10 @@
 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 { getRequiredLabel } from '../../utils/getRequiredLabel';
-import { noop } from '../../utils/noop';
-import { style } from '../../utils/style';
-import { Input } from './Input';
 import { type InputProps } from './InputProps';
-import { renderErrorText } from './renderErrorText';
+import { InputWrapper } from './InputWrapper';
 
-export const InputControl = JSX<InputProps>(
-  ({
-    className,
-    label,
-    value = '',
-    placeholder,
-    error,
-    errors,
-    onChange = noop,
-    onBlur,
-    isTextarea,
-    type,
-    isInteger = false,
-    maxLength,
-    disabled = false,
-  }) => {
-    const [isOpen, { setFalse: close, setTrue: open }] = useBool();
-    const popupRef = useOutsideClick<HTMLDivElement>(close);
+export const InputControl = JSX<InputProps>((props) => {
+  const [isOpen, { setFalse: close, setTrue: open }] = useBool();
 
-    const handleChange = useCallback(
-      (v: string) => {
-        !isOpen && open();
-        maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
-      },
-      [isOpen, onChange],
-    );
-
-    useEffect(() => {
-      isInteger && value ? onChange(normalizeInteger(value)) : null;
-    }, [value]);
-
-    return (
-      <div
-        className={style('shrink-0 w-full', className)}
-        ref={popupRef}
-        onBlur={close}
-        onFocus={open}
-      >
-        <div>
-          <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>
-    );
-  },
-);
-
-const normalizeInteger = (val = '') => val.replace(/[^\d]+/g, '');
-
-const getPlaceholder = (placeholder?: string, errors?: string[], label?: string) =>
-  errors && !label ? `${placeholder}*` : placeholder;
+  return <InputWrapper isOpen={isOpen} onOpen={open} onClose={close} {...props} />;
+});

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

@@ -1,6 +1,6 @@
+import { type ControlProps } from '../../model/ControlProps';
 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 DefaultControlType, ControlProps<V> {
@@ -11,9 +11,9 @@ export interface InputProps<V = string> extends DefaultControlType, ControlProps
   onFocus?: (ev: PreventableEventWithTarget) => void;
   onBlur?: (ev?: PreventableEventWithTarget) => void;
   valid?: boolean;
-  disabled?: boolean;
   autoFocus?: boolean;
   isTextarea?: boolean;
   maxLength?: number;
   isInteger?: boolean;
+  inputRef?: { current: HTMLDivElement | null };
 }

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

@@ -0,0 +1,78 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
+import { type DefaultControlType } from '../../model/DefaultControlType';
+import { getRequiredLabel } from '../../utils/getRequiredLabel';
+import { noop } from '../../utils/noop';
+import { style } from '../../utils/style';
+import { Input } from './Input';
+import { type InputProps } from './InputProps';
+import { renderErrorText } from './renderErrorText';
+
+type InputWrapperProps = InputProps & {
+  isOpen: boolean;
+  onOpen: () => void;
+  onClose: () => void;
+};
+
+export const InputWrapper = JSX<InputWrapperProps>(
+  ({
+    className,
+    label,
+    value = '',
+    error,
+    errors,
+    type,
+    isInteger,
+    placeholder,
+    maxLength,
+    inputRef,
+    isOpen,
+    onOpen,
+    onClose,
+    onChange = noop,
+    ...rest
+  }) => {
+    const popupRef = useOutsideClick<HTMLDivElement>(onClose);
+
+    const handleChange = useCallback(
+      (v: string) => {
+        const isOverMax = maxLength && v.length > maxLength;
+        !isOpen && onOpen();
+        if (!isOverMax) {
+          onChange(normalizeInteger(v, isInteger));
+        }
+      },
+      [isOpen, onChange],
+    );
+
+    return (
+      <div
+        className={style('shrink-0 w-full', className)}
+        ref={popupRef}
+        onBlur={onClose}
+        onFocus={onOpen}
+      >
+        <div ref={inputRef}>
+          <Input
+            type={type || 'text'}
+            aria-label={label}
+            label={getRequiredLabel({ label, errors })}
+            valid={Boolean(!error)}
+            onChange={handleChange}
+            placeholder={getPlaceholder({ placeholder, errors, label })}
+            value={value}
+            {...rest}
+          />
+        </div>
+        {renderErrorText(error)}
+      </div>
+    );
+  },
+);
+
+const normalizeInteger = (val = '', isInteger = false) =>
+  isInteger && val ? val.replace(/[^\d]+/g, '') : val;
+
+const getPlaceholder = ({ placeholder, errors, label }: DefaultControlType) =>
+  errors && !label ? `${placeholder}*` : placeholder;

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

@@ -53,7 +53,7 @@ export const InputRange = JSX<InputRangeProps>((props) => {
         <input
           className={style(
             'text-h3 w-full h-14',
-            'pl-m mt-xs box-border',
+            'pl-m box-border',
             'text-primary-text',
             inputValidStyle,
             inputDisabledStyle,

package/mobile/src/ui-kit/InputRange/InputRangeProps.ts

@@ -1,12 +1,12 @@
+import { type DisabledProps } from '../../model/DisabledProps';
+import { type TitleProps } from '../../model/HeadlineType';
 import { type InputProps } from '../Input/InputProps';
 
-export interface InputRangeProps extends InputProps<number> {
+export interface InputRangeProps extends InputProps<number>, DisabledProps, TitleProps {
   items?: string[];
   min?: number;
   max?: number;
   list?: number[];
   step?: number;
-  title?: string;
-  disabled?: boolean;
   onChange?: (value: number) => void;
 }

package/mobile/src/ui-kit/InputRange/renderRangeWithTicks.tsx

@@ -1,14 +1,13 @@
+import { type ControlProps } from '../../model/ControlProps';
+import { type DisabledProps } from '../../model/DisabledProps';
 import { style } from '../../utils/style';
 import { parseDecimal } from './parseDecimal';
 
-interface RangeWithTicksProps {
+interface RangeWithTicksProps extends ControlProps<number>, DisabledProps {
   list: number[];
   min: number;
   max: number;
   step: number;
-  disabled?: boolean;
-  value?: number;
-  onChange?: (value: number) => void;
 }
 
 export function renderRangeWithTicks({

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
+import { type ComponentType } from '../../model/ComponentType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type LinkProps as BaseLinkProps } from '../../model/LinkProps';
 import { getAspectsAttributes } from '../../utils/dataAttributes';
@@ -18,8 +19,7 @@ const themeStyle: Record<LinkButtonVersion, string> = {
   '': '',
 };
 
-export interface LinkProps extends BaseLinkProps {
-  className?: string;
+export interface LinkProps extends BaseLinkProps, ComponentType {
   version?: LinkButtonVersion;
   aboveText?: string;
   rel?: string;

package/mobile/src/ui-kit/LinkButton/ButtonInner.tsx

@@ -17,7 +17,7 @@ export const ButtonInner = JSX<LinkButtonProps>((props) => {
       {isWithText(props) ? (
         <div className="whitespace-pre">
           {aboveText ? <div className="text-xs font-light text-left">{aboveText}</div> : null}
-          <div className={`text-left ${aboveText ? 'text-s -mt-3xs' : 'text-l'}`}>{text}</div>
+          <div className={`text-left ${aboveText ? 'text-s' : 'text-l'}`}>{text}</div>
         </div>
       ) : null}
       {appendRight ? (

package/mobile/src/ui-kit/LinkButton/GetButtonClassParams.ts

@@ -1,8 +1,8 @@
+import { type ComponentType } from '../../model/ComponentType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 
 /** @deprecated */
-export type GetButtonClassParams = {
-  className?: string;
+export type GetButtonClassParams = ComponentType & {
   rounded?: boolean;
   version?: LinkButtonVersion;
 };

package/mobile/src/ui-kit/LinkButton/LinkButtonProps.ts

@@ -1,18 +1,18 @@
+import { type ComponentType } from '../../model/ComponentType';
+import { type DisabledProps } from '../../model/DisabledProps';
 import { type VNode } from '../../model/VNode';
-import { type PreventableEvent } from '../PreventableEvent';
-import { type LinkButtonContent } from './LinkButtonContent';
+import { type PreventableEventWithTarget } from '../PreventableEvent';
+import { type LinkButtonContent } from './LinkButtonContent'; /** @deprecated */
 
 /** @deprecated */
 /**
  * @title Кнопка
  */
-export interface LinkButtonProps extends LinkButtonContent {
-  className?: string;
-  disabled?: boolean;
+export interface LinkButtonProps extends LinkButtonContent, ComponentType, DisabledProps {
   rel?: string;
   ariaLabel?: string;
   appendLeft?: VNode;
   appendRight?: VNode;
-  onClick?: (ev?: PreventableEvent) => void;
+  onClick?: (ev?: PreventableEventWithTarget) => void;
   type?: string;
 }

package/mobile/src/ui-kit/LinkButton/renderArrows.tsx

@@ -1,16 +1,17 @@
+import { type ComponentType } from '../../model/ComponentType';
+import { type DisabledProps } from '../../model/DisabledProps';
 import { style } from '../../utils/style';
 import { ArrowLeftButton, ArrowRightButton } from './ArrowButton';
 
 /** @deprecated */
-export type RenderArrowsProps = {
-  dec: () => void;
-  inc: () => void;
-  canInc: boolean;
-  canDec: boolean;
-  btnClass: [string, string];
-  className?: string;
-  isDisabled?: boolean;
-};
+export type RenderArrowsProps = ComponentType &
+  DisabledProps & {
+    dec: () => void;
+    inc: () => void;
+    canInc: boolean;
+    canDec: boolean;
+    btnClass: [string, string];
+  };
 
 /** @deprecated */
 export const renderArrows = ({

package/mobile/src/ui-kit/LinkButton/renderButtonsSection.tsx

@@ -1,3 +1,4 @@
+import { type ComponentType } from '../../model/ComponentType';
 import { type Picture } from '../../model/Picture';
 import { isIcon } from '../../utils/isIcon';
 import { style } from '../../utils/style';
@@ -5,8 +6,7 @@ import { Img } from '../Img/Img';
 import { LinkButton } from './LinkButton';
 import { type LinkButtonContent } from './LinkButtonContent';
 
-interface ButtonsSectionOptions {
-  className?: string;
+interface ButtonsSectionOptions extends ComponentType {
   buttonClassName?: string;
   isVertical?: boolean;
 }

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

@@ -1,16 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
-import { type AspectsProps } from '../../model/AspectsProps';
-import { type Target } from '../../model/LinkProps';
+import { type ComponentType } from '../../model/ComponentType';
+import { type LinkProps } from '../../model/LinkProps';
+import type { OnClickProps } from '../../model/OnClickProps';
 import { getAspectsAttributes } from '../../utils/dataAttributes';
 import { style } from '../../utils/style';
 
-interface LinkWrapperProps extends AspectsProps {
-  className?: string;
-  href?: string;
-  target?: Target;
-  onClick?: () => void;
-}
+interface LinkWrapperProps extends ComponentType, OnClickProps, LinkProps {}
 
 export const LinkWrapper = JSX<LinkWrapperProps>(
   ({ className = '', href, target, onClick, data, children }) => {

package/mobile/src/ui-kit/ListControlProps.ts

@@ -1,4 +1,4 @@
-import { type ControlProps } from './ControlProps';
+import { type ControlProps } from '../model/ControlProps';
 
 export interface ListControlProps<T> extends ControlProps<T> {
   items: T[];

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type TextColor } from '../../ui-kit/Text/TextProps';
 import { style } from '../../utils/style';
+import { type TextColor } from '../Text/TextProps';
 
 interface LoaderProps {
   color?: TextColor;

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

@@ -3,6 +3,7 @@ import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type BranchesHeader, type ForeignOfficeProps } from '../../data/HeaderData';
 import { useDefaultLocation } from '../../hooks/useLocation';
 import { useRegions, type Region } from '../../hooks/useRegions';
+import type { OnCloseProps } from '../../model/OnCloseProps';
 import { groupBy } from '../../utils/groupBy';
 import { jaroWinklerDistance } from '../../utils/jaroWinklerDistance';
 import { Dialog } from '../DialogManager/Dialog';
@@ -15,10 +16,9 @@ import { SelectedLocation } from './SelectedLocation';
 
 const SEARCH_TERM_MIN_LENGTH = 3;
 
-export interface LocationDialogProps {
+export interface LocationDialogProps extends OnCloseProps {
   foreignOffices?: ForeignOfficeProps[];
   branches?: BranchesHeader;
-  onClose?: () => void;
 }
 
 export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branches, onClose }) => {

package/mobile/src/ui-kit/LocationDialog/SearchBar.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ComponentType } from '../../model/ComponentType';
 import { style } from '../../utils/style';
 import { inputValidStyle } from '../Input/inputValidStyle';
 import { type PreventableEvent } from '../PreventableEvent';
 
-export interface SearchBarInnerProps {
-  className?: string;
+export interface SearchBarInnerProps extends ComponentType {
   searchTerm?: string;
   onSearch: (_: string) => void;
 }

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

@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { JSX } from '@redneckz/uni-jsx';
+import type { DescriptionProps } from '../../model/HeadlineType';
 
-interface ProgressBarProps {
+interface ProgressBarProps extends DescriptionProps {
   step?: number;
-  description?: string;
   showPercentage?: boolean;
 }
 
@@ -15,7 +15,7 @@ export const ProgressBar = JSX<ProgressBarProps>(
       </div>
       <div className="relative">
         {showPercentage ? <div className="absolute left-2/4 text-green">{step}%</div> : null}
-        {description ? <div className="text-right mr-4 text-gray">{description}</div> : null}
+        {description ? <div className="text-right pr-m text-gray">{description}</div> : null}
       </div>
     </div>
   ),

package/mobile/src/ui-kit/Radio/RadioProps.ts

@@ -1,8 +1,8 @@
-export interface RadioProps {
+import { type ComponentType } from '../../model/ComponentType';
+import { type ControlProps } from '../../model/ControlProps';
+
+export interface RadioProps extends ComponentType, ControlProps<string> {
   name: string;
   text?: string;
-  value: string;
   checked: boolean;
-  onChange?: (value: string) => void;
-  className?: string;
 }

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

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type ControlProps } from '../../model/ControlProps';
 import { type DefaultControlType } from '../../model/DefaultControlType';
-import { type TextProps } from '../../model/HeadlineType';
+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 & {
@@ -14,7 +14,6 @@ export type RadioButtonItem = TextProps & {
 export interface RadioButtonGroupProps extends DefaultControlType, ControlProps<string> {
   items?: RadioButtonItem[];
   onChange?: (id: string) => void;
-  disabled?: boolean;
   orientation?: ListOrientation;
 }
 

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

@@ -1,15 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type LinkDoc } from '../../components/LinkDocs/LinkDocsContent';
+import type { OnCloseProps } from '../../model/OnCloseProps';
 import { type Picture } from '../../model/Picture';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Link } from '../Link/Link';
 import { RichText } from '../RichText/RichText';
 
-export interface ReportDialogProps extends LinkDoc {
+export interface ReportDialogProps extends LinkDoc, OnCloseProps {
   __html?: string;
   icon?: Picture;
-  onClose?: () => void;
 }
 
 export const ReportDialog = JSX<ReportDialogProps>(({ href, __html, target, onClose }) => (

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

@@ -1,13 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Headline } from '../../components/Headline/Headline';
+import { type OnCloseProps } from '../../model/onClose';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';
 
-export interface ResponseNotificationProps {
+export interface ResponseNotificationProps extends OnCloseProps {
   ok?: boolean;
   typeForm?: string;
-  onClose?: () => void;
 }
 
 export const ResponseTypeDialog = JSX<ResponseNotificationProps>(({ ok, typeForm, onClose }) => {