@redneckz/wildless-cms-uni-blocks 0.14.850 → 0.14.852

package/src/ui-kit/BaseFiltration/FiltrationSchemaContent.ts

@@ -1,10 +1,5 @@
 import { type TitleProps } from '../../model/HeadlineType';
 
-/**
- * @title Заголовок
- */
-type Title = string;
-
 /**
  * @title Ключи
  */
@@ -15,8 +10,7 @@ type Enum = string[];
  */
 type EnumNames = string[];
 
-export type StringArray = {
-  title?: Title;
+export type StringArray = TitleProps & {
   /**
    * @default array
    * @hidden

package/src/ui-kit/BaseFiltration/HotFilterBase.ts

@@ -1,4 +1,4 @@
-import { type TextProps } from '../../model/HeadlineType';
+import type { TextProps } from '../../model/HeadlineType';
 
 /**
  * @title Кнопка фильтрации

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

@@ -24,8 +24,6 @@ export interface TileImageOptions extends ComponentType {
 
 /** @title Цены */
 export type PriceItem = LabelProps & {
-  /** @title Название */
-  label?: string;
   /** @title Сумма */
   amount?: number;
   /** @title Единица измерения */

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

@@ -23,8 +23,7 @@ export type RateProps = {
   rate: number;
 };
 
-export interface CalcCurrencyProps extends ComponentType {
-  title?: string;
+export interface CalcCurrencyProps extends ComponentType, TitleProps {
   value?: number | string;
   fractionDigits?: number;
   fixed?: boolean;

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

@@ -1,13 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type TitleProps } from '../../model/HeadlineType';
 import { Icon } from '../Icon/Icon';
 import { Paragraph } from '../Paragraph/Paragraph';
 import { Text } from '../Text/Text';
 
-export interface UnknownRateProps {
-  title?: string;
-}
-
-export const UnknownRate = JSX<UnknownRateProps>(({ title = 'Ставка' }) => (
+export const UnknownRate = JSX<TitleProps>(({ title = 'Ставка' }) => (
   <div className="space-y-s min-w-96">
     <Text size="text-l" font="font-light" color="text-secondary-text">
       {title}

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

@@ -1,9 +1,10 @@
+import { type TitleProps } from '../../model/HeadlineType';
 import { type VNode } from '../../model/VNode';
 import { CalculatorValue } from './CalculatorValue';
 import { Rate, type RateProps } from './Rate';
-import { UnknownRate, type UnknownRateProps } from './UnknownRate';
+import { UnknownRate } from './UnknownRate';
 
-interface RenderRateProps extends RateProps, UnknownRateProps {
+interface RenderRateProps extends RateProps, TitleProps {
   children?: VNode;
 }
 

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

@@ -3,6 +3,7 @@ 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 type { OnClickProps } from '../../model/OnClickProps';
 import { normalizeWithMask } from '../../utils/normalizeWithMask';
 import { style } from '../../utils/style';
 import { Icon } from '../Icon/Icon';
@@ -16,12 +17,11 @@ const ICON_PROPS: { name: IconName; iconVersion: IconVersion; width: string; hei
   height: '24',
 };
 
-interface DatePickerInputProps extends ComponentType, DisabledProps {
+interface DatePickerInputProps extends ComponentType, DisabledProps, OnClickProps {
   setSelectedMonth: (selectedMonth: number) => void;
   setSelectedYear: (selectedYear: number) => void;
   value?: string;
   onChange?: (value: Date) => void;
-  onClick?: () => void;
 }
 
 interface UpdateSelectedDateProps {

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

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

package/src/ui-kit/DialogManager/useDialog.tsx

@@ -1,10 +1,11 @@
 import type { UNIComponent } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import type { OnCloseProps } from '../../model/OnCloseProps';
 import type { VNode } from '../../model/VNode';
 import type { DialogOptions } from './DialogAction';
 import { useDialogManager } from './useDialogManager';
 
-export function useDialog<Props extends { onClose?: () => void }>(
+export function useDialog<Props extends OnCloseProps>(
   Dialog: UNIComponent<Props>,
   initialProps: Partial<Props> = {},
 ) {

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

@@ -1,13 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { type LabelProps } from '../../model/HeadlineType';
 import { style } from '../../utils/style';
 import { Button, type ButtonProps } from '../Button/Button';
 import { ButtonTitle } from '../Button/ButtonTitle';
 import { ToggleIcon } from '../Icon/ToggleIcon';
 
-interface DefaultFoldButtonProps extends ButtonProps {
+interface DefaultFoldButtonProps extends ButtonProps, LabelProps {
   isUnfolded?: boolean;
   short?: boolean;
-  label?: string;
 }
 
 export const DefaultFoldButton = JSX<DefaultFoldButtonProps>(

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

@@ -1,5 +1,6 @@
 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';
@@ -8,8 +9,7 @@ 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;
 }
 

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

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

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

@@ -1,7 +1,7 @@
 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 PreventableEventWithTarget } from '../PreventableEvent';
 import { type LinkButtonContent } from './LinkButtonContent'; /** @deprecated */
 
 /** @deprecated */
@@ -13,6 +13,6 @@ export interface LinkButtonProps extends LinkButtonContent, ComponentType, Disab
   ariaLabel?: string;
   appendLeft?: VNode;
   appendRight?: VNode;
-  onClick?: (ev?: PreventableEvent) => void;
+  onClick?: (ev?: PreventableEventWithTarget) => void;
   type?: string;
 }

package/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 ComponentType } from '../../model/ComponentType';
-import { type Target } from '../../model/LinkProps';
+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, ComponentType {
-  href?: string;
-  target?: Target;
-  onClick?: () => void;
-}
+interface LinkWrapperProps extends ComponentType, OnClickProps, LinkProps {}
 
 export const LinkWrapper = JSX<LinkWrapperProps>(
   ({ className = '', href, target, onClick, data, children }) => {

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

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

@@ -1,7 +1,7 @@
 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';

package/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/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/OnCloseProps';
 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 }) => {

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

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { type TopMenuItemProps } from '../../data/NavigationData';
 import { type LinkProps } from '../../model/LinkProps';
+import type { OnCloseProps } from '../../model/OnCloseProps';
 import { useSearch, type SearchResult } from '../../services/search/useSearch';
 import { zip } from '../../utils/fp/zip';
 import { joinPath } from '../../utils/url';
@@ -9,10 +10,9 @@ import { Dialog } from '../DialogManager/Dialog';
 import { Sitemap } from '../Sitemap/Sitemap';
 import { SearchInput } from './SearchInput';
 
-export interface SearchDialogProps {
+export interface SearchDialogProps extends OnCloseProps {
   initialQuery?: string;
   navigationItems?: TopMenuItemProps[];
-  onClose?: () => void;
 }
 
 export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery, navigationItems, onClose }) => {

package/src/ui-kit/Select/Option.ts

@@ -1,4 +1,4 @@
-import { type TextProps } from '../../model/HeadlineType';
+import type { TextProps } from '../../model/HeadlineType';
 
 export type Option = TextProps & {
   key: string;

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

@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import { useOutsideClick } from '@redneckz/uni-jsx/lib/hooks/useOutsideClick';
+import type { OnCloseProps } from '../../model/OnCloseProps';
 import { usePopupManager } from '../PopupManager/usePopupManager';
 import { type Option } from './Option';
 import { SelectPopup, type SelectPopupProps } from './SelectPopup';
 
-interface SelectPopupOptions extends SelectPopupProps {
+interface SelectPopupOptions extends SelectPopupProps, OnCloseProps {
   isOpen?: boolean;
-  onClose?: () => void;
 }
 
 export function useSelectPopup({

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type ControlProps } from '../../model/ControlProps';
-import { type TextProps } from '../../model/HeadlineType';
+import type { TextProps } from '../../model/HeadlineType';
 import { style } from '../../utils/style';
 import { Text } from '../Text/Text';
 

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

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type ControlProps } from '../../model/ControlProps';
+import { type TitleProps } from '../../model/HeadlineType';
 import { SlideCheckbox } from '../SlideCheckbox/SlideCheckbox';
 
-type SlideCheckboxGroupItem = {
+type SlideCheckboxGroupItem = TitleProps & {
   value: string;
-  title: string;
 };
 
 interface SlideCheckboxGroupProps extends ControlProps<string[]> {

package/src/ui-kit/TabsControl/renderTabItemInner.tsx

@@ -1,3 +1,4 @@
+import { type DescriptionProps, type TextProps } from '../../model/HeadlineType';
 import { type IconVersion } from '../../model/IconVersion';
 import { type Picture } from '../../model/Picture';
 import { style } from '../../utils/style';
@@ -15,12 +16,10 @@ const getButtonClassNames = (isActive: boolean) => ({
   oldDesc: 'text-m-light',
 });
 
-interface TabsLayoutButtonProps {
+interface TabsLayoutButtonProps extends DescriptionProps, TextProps {
   isActive: boolean;
-  description?: string;
   icon?: Picture;
   type: string;
-  text?: string;
 }
 
 export const renderTabItemInner = ({

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { Headline } from '../../components/Headline/Headline';
+import { type TitleProps } from '../../model/HeadlineType';
 import { noop } from '../../utils/noop';
 import { Timer } from './Timer';
 import { useCountDownTimer } from './useCountDownTimer';
 
-interface TimerCircleProps {
-  title?: string;
+interface TimerCircleProps extends TitleProps {
   interval?: number; // В секундах
   onEnd?: () => void;
 }

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

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 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';
 
@@ -9,10 +10,9 @@ export interface TopItemContent extends LinkProps {
   active?: boolean;
 }
 
-export interface TopItemProps extends TopItemContent, ComponentType {
+export interface TopItemProps extends TopItemContent, ComponentType, OnClickProps {
   flat?: boolean;
   dataItemName?: string;
-  onClick?: () => void;
 }
 
 export const TopItem = JSX<TopItemProps>(