@redneckz/wildless-cms-uni-blocks 0.3.85 → 0.3.87

package/mobile/src/content-page-repository/mapJSON.ts

@@ -17,7 +17,7 @@ export async function mapJSON<T>(
 
     return Promise.all(values) as any;
   } else if (typeof data === 'object' && (data as any).toString() === '[object Object]') {
-    const subKeys = Object.keys(data as any);
+    const subKeys = Object.keys(data);
     const values = subKeys.map((k) => mapJSON(data[k], mapper, [k].concat(keyParts)));
     const pairs = (await Promise.all(values)).map((_, i) => ({
       [subKeys[i]]: _,

package/mobile/src/content-page-repository/transformContentPage.ts

@@ -15,6 +15,7 @@ export async function transformContentPage(
 ): Promise<ContentPageDef> {
   const content = await readFile(pagePath, 'utf8');
 
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   return mapJSON<ContentPageDef>(JSON.parse(content), async (value: any, [key]) => {
     const isMarkdown = typeof value === 'string' && key?.endsWith('__md');
     const isPicture = value && isLocalPath(value?.src);

package/mobile/src/hooks/useExchangeRates.ts

@@ -12,7 +12,7 @@ export function useExchangeRates(useAsyncData: AsyncDataHook): ExchangeCurrencyI
 
   const result = data?.hits?.hits?.map((_) => _._source) || [];
 
-  return result.length ? getCurrencyListByRate(result) : result;
+  return result.length ? getCurrencyListByRate(result as RatesData[]) : result;
 }
 
 async function fetchExchangeRates(): Promise<any | undefined> {

package/mobile/src/hooks/useLink.ts

@@ -18,11 +18,11 @@ export function useLink(
     ...link,
     href,
     'aria-label': link.text,
-    onClick: handlerDecorator((ev: MouseEvent) => {
+    onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
       const isLocalHref = href && !isURL(href);
       const isLocalTarget = !link.target || link.target === '_self';
       if (isLocalHref && isLocalTarget) {
-        ev.preventDefault();
+        ev?.preventDefault();
         router.push(href);
       }
     }, link),

package/mobile/src/icons/IconName.ts

@@ -1,7 +1,6 @@
 
 // Generated. Do not touch
-/* eslint-disable max-lines */
-
+/* eslint-disable max-len, max-lines */
 export enum IconMap {
   ActualBalanceIcon = 'ActualBalanceIcon', AirPlane = 'AirPlane', AppleIcon = 'AppleIcon', ArrowDownIcon = 'ArrowDownIcon', ArrowLeftIcon = 'ArrowLeftIcon', ArrowUpIcon = 'ArrowUpIcon', AtmIcon = 'AtmIcon', BankIcon = 'BankIcon', BurgerIcon = 'BurgerIcon', Calendar2Icon = 'Calendar2Icon', CalendarCircleIcon = 'CalendarCircleIcon', CalendarIcon = 'CalendarIcon', CalendarTickIcon = 'CalendarTickIcon', CardIcon = 'CardIcon', CardPosIcon = 'CardPosIcon', CardTickIcon = 'CardTickIcon', CardWithGemIcon = 'CardWithGemIcon', CarIcon = 'CarIcon', ChartSquareIcon = 'ChartSquareIcon', CinemaIcon = 'CinemaIcon', ClockIcon = 'ClockIcon', CloseIcon = 'CloseIcon', ComfortableCompIcon = 'ComfortableCompIcon', CreditCardsIcon = 'CreditCardsIcon', DiscountShapeIcon = 'DiscountShapeIcon', DocIcon = 'DocIcon', DocIconMonoColor = 'DocIconMonoColor', DocsIcon = 'DocsIcon', DocumentTextIcon = 'DocumentTextIcon', DollarIcon = 'DollarIcon', DoneIcon = 'DoneIcon', EarthIcon = 'EarthIcon', EmptyWalletChangeIcon = 'EmptyWalletChangeIcon', EmptyWalletIcon = 'EmptyWalletIcon', EuroIcon = 'EuroIcon', GeolocationIcon = 'GeolocationIcon', GlassIcon = 'GlassIcon', GlobalIcon = 'GlobalIcon', GpsIcon = 'GpsIcon', GridIcon = 'GridIcon', InterestGrowthIcon = 'InterestGrowthIcon', InterestIcon = 'InterestIcon', JCBIcon = 'JCBIcon', Logo = 'Logo', LoupeIcon = 'LoupeIcon', MasterCardIcon = 'MasterCardIcon', MinusIcon = 'MinusIcon', MirIcon = 'MirIcon', MoneyIcon = 'MoneyIcon', MoneyInsuranceIcon = 'MoneyInsuranceIcon', MonitorMobileIcon = 'MonitorMobileIcon', NewDocIcon = 'NewDocIcon', OfficeIcon = 'OfficeIcon', OkIcon = 'OkIcon', PassSendIcon = 'PassSendIcon', PercentageRoundIcon = 'PercentageRoundIcon', PercentageSquareIcon = 'PercentageSquareIcon', PersonalCardIcon = 'PersonalCardIcon', PlayMarketIcon = 'PlayMarketIcon', PlusIcon = 'PlusIcon', PowerIcon = 'PowerIcon', Profile2UserIcon = 'Profile2UserIcon', ProfileIcon = 'ProfileIcon', PumpkinIcon = 'PumpkinIcon', RoundRubleIcon = 'RoundRubleIcon', SafeIcon = 'SafeIcon', ShieldTickIcon = 'ShieldTickIcon', SignDocsIcon = 'SignDocsIcon', SmallClockIcon = 'SmallClockIcon', SoundIcon = 'SoundIcon', TelegramIcon = 'TelegramIcon', UnionPayIcon = 'UnionPayIcon', UserTickIcon = 'UserTickIcon', VisaIcon = 'VisaIcon', VKIcon = 'VKIcon', WalletAdd2Icon = 'WalletAdd2Icon', WalletAddIcon = 'WalletAddIcon', WalletIcon = 'WalletIcon', WalletWithMoneyIcon = 'WalletWithMoneyIcon', WateringCan = 'WateringCan'
 }

package/mobile/src/model/HeadlineType.ts

@@ -0,0 +1,21 @@
+/**
+ * @title Размер заголовка
+ * @enumNames ["Самый большой", "Очень большой", "Большой", "Средний", "Маленький"]
+ */
+export type HeadlineVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S';
+
+export type TitleProp = {
+  /** @title Заголовок */
+  title?: string;
+};
+
+export type DescriptionProp = {
+  /** @title Описание */
+  description?: string;
+};
+
+export type HeadlineCommonProps = TitleProp & DescriptionProp;
+
+export type HeadlineProps = HeadlineCommonProps & {
+  headlineVersion?: HeadlineVersion;
+};

package/mobile/src/model/VNode.ts

@@ -1 +1 @@
-export type VNode = unknown;
+export type VNode = any;

package/mobile/src/react/IntersectionObserverTag.tsx

@@ -1,15 +1,14 @@
-import { useCallback, useRef } from 'react';
+import React, { ReactNode, useCallback, useRef } from 'react';
 import type { IntersectionObserverComponent } from '../components/ContentPage/ContentPageContext';
 
 export const IntersectionObserverTag: IntersectionObserverComponent = (props) => {
   const {
-    Tag,
+    tag: _tag = 'section',
     observerCallback,
     observerOptions,
     className = '',
     anchor = null,
     children,
-    ...rest
   } = props;
 
   const intersectionObserver = useRef<IntersectionObserver>();
@@ -23,9 +22,5 @@ export const IntersectionObserverTag: IntersectionObserverComponent = (props) =>
     [observerCallback, observerOptions],
   );
 
-  return (
-    <Tag ref={ref} className={className} id={anchor} {...rest}>
-      {children}
-    </Tag>
-  );
+  return React.createElement(_tag, { ref, className, id: anchor }, children as ReactNode);
 };

package/mobile/src/react/setup-fixture.ts

@@ -1,10 +1,13 @@
 import { setup } from '@redneckz/uni-jsx';
 import { useEffect, useState } from 'react';
-import { jsx, jsxs } from 'react/jsx-runtime';
+import runtime from 'react/jsx-runtime';
 import { DaDataAPI } from '../api/DaDataAPI';
 import type { ContentPageContext } from '../components/ContentPage/ContentPageContext';
 import { IntersectionObserverTag } from './IntersectionObserverTag';
 
+const { jsx, jsxs } = runtime as any;
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 setup(jsx, jsxs);
 
 const TEST_ORIGIN = 'http://localhost:5001';
@@ -33,7 +36,7 @@ export const context: ContentPageContext = {
   useState,
   useRouter: Router,
   useAsyncData: (key, fetcher) => {
-    const [data, setData] = useState();
+    const [data, setData] = useState<any>();
     useEffect(() => {
       fetcher(key).then((_) => {
         setData(_);

package/mobile/src/services/sitemap/findActiveSubItem.ts

@@ -5,10 +5,10 @@ import { isSubItemActive } from './isSubItemActive';
 
 export const findActiveSubItem =
   (router: Router) =>
-  <T extends LinkProps>(items: T[] = []): T | null => {
+  <T extends LinkProps>(items: T[] = []): T | undefined => {
     const possibleActiveSubItems = items?.filter(isSubItemActive(router));
 
     return possibleActiveSubItems?.length
       ? maxBy((_: T) => _.href?.length || 0)(possibleActiveSubItems) // More specific item with max length
-      : null;
+      : undefined;
   };

package/mobile/src/types.ts

@@ -72,5 +72,3 @@ export interface DaDataSuggestion<T> {
 export interface DaDataAddress {
   city?: string | null;
 }
-
-export type FuncReturnVoid<Input = unknown> = (value: Input) => void;

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

@@ -6,16 +6,18 @@ interface BlockWrapperProps {
   context: ContentPageContext;
   className?: string;
   anchor?: string;
-  Tag?: string;
+  tag?: keyof HTMLElementTagNameMap;
 }
 
 export const BlockWrapper = JSX<BlockWrapperProps>(
-  ({ anchor, className, context, children, Tag = 'section' }) => {
+  ({ anchor, className, context, children, tag = 'section' }) => {
     const { IntersectionObserverTag } = context;
 
+    const Tag: any = tag;
+
     return anchor ? (
       <IntersectionObserverTag
-        Tag={Tag}
+        tag={tag}
         className={className}
         observerCallback={changeHashOnObserve}
         observerOptions={{ threshold: 1 }} // Lower threshold when hash change needed

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

@@ -3,7 +3,7 @@ import type { LinkProps } from '../model/LinkProps';
 
 export interface BreadcrumbProps extends LinkProps {
   className?: string;
-  onClick?: (ev: MouseEvent) => any;
+  onClick?: () => void;
 }
 
 export const Breadcrumb = JSX<BreadcrumbProps>(

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ButtonProps } from './ButtonProps';
-import { Button } from './Button';
 import { Img } from '../Img/Img';
+import { Button } from './Button';
+import type { ButtonProps } from './ButtonProps';
 
 export const ArrowButton = JSX<ButtonProps>(({ className, disabled, ...rest }) => (
   <Button
     rounded
-    className={`shadow-[0_4px_25px_rgba(0,0,0,0.07)] w-12 h-12 min-h-12 max-h-12 flex items-center justify-center ${
+    className={`group shadow-[0_4px_25px_rgba(0,0,0,0.07)] w-12 h-12 min-h-12 max-h-12 flex items-center justify-center ${
       disabled
         ? 'bg-secondary-light text-secondary-text'
         : 'bg-white text-primary-text hover:text-primary-main'
@@ -17,6 +17,7 @@ export const ArrowButton = JSX<ButtonProps>(({ className, disabled, ...rest }) =
     <Img
       className="w-4 h-4 min-w-4 min-h-4 rounded-full box-border"
       image={{ icon: 'ArrowLeftIcon', iconVersion: 'black' }}
+      imageClassName="group-hover:text-primary-main"
       width="16"
       height="16"
       asSVG

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

@@ -3,8 +3,8 @@
 
 import { JSX } from '@redneckz/uni-jsx';
 import type { ButtonVersion } from '../../model/ButtonVersion';
-import type { ButtonProps, ButtonWithIconProps } from './ButtonProps';
 import { ButtonInner } from './ButtonInner';
+import type { ButtonProps, ButtonWithIconProps } from './ButtonProps';
 
 const buttonStyleMap: Record<ButtonVersion, string> = {
   primary: 'text-white bg-primary-main hover:bg-primary-hover active:bg-primary-active',
@@ -55,7 +55,7 @@ export const Button = JSX<ButtonCommonProps>(
           role="button"
           aria-disabled="true"
           aria-label={ariaLabel}
-          tabIndex="-1"
+          tabIndex={-1}
           className={`inline-block ${styleButton} ${buttonDisabledStyleMap[version] || ''} ${
             rounded ? 'rounded-full' : 'rounded-md'
           } ${className || ''}`}

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

@@ -14,8 +14,8 @@ export const ButtonInner = JSX<ButtonInnerProps>((props) => {
       {appendLeft ? appendLeft : null}
       {isWithText(props) ? (
         <div>
-          <div className="text-m-2xs font-light text-left">{aboveText}</div>
-          <div className="text-base text-left">{text}</div>
+          <div className="text-xs text-left">{aboveText}</div>
+          <div className={`text-left ${aboveText ? 'text-s -mt-0.5' : 'text-l'}`}>{text}</div>
         </div>
       ) : null}
       {appendRight ? appendRight : null}
@@ -30,7 +30,7 @@ const getButtonStyle = (props: ButtonInnerProps) => {
     return '';
   }
 
-  const withTextStyle = `px-9 gap-2 ${aboveText ? 'py-2' : 'py-4'}`;
+  const withTextStyle = `gap-2 ${aboveText ? 'py-2.5 px-7' : 'py-4 px-9'}`;
 
   return [
     'flex items-center justify-center',

package/mobile/src/ui-kit/Button/ButtonProps.ts

@@ -1,6 +1,7 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { LinkProps } from '../../model/LinkProps';
 import type { Picture } from '../../model/Picture';
+import type { VNode } from '../../model/VNode';
 
 /**
  * @hidden
@@ -10,7 +11,7 @@ export interface ButtonAdditionalProps {
   disabled?: boolean;
   rel?: string;
   ariaLabel?: string;
-  onClick?: (ev: MouseEvent) => any;
+  onClick?: (ev?: { preventDefault: () => void }) => void;
 }
 
 /**
@@ -33,9 +34,9 @@ export interface ButtonWithIconProps extends ButtonProps {
   /** @title Верхний текст */
   aboveText?: string;
   /** @hidden */
-  appendLeft?: any;
+  appendLeft?: VNode;
   /** @hidden */
-  appendRight?: any;
+  appendRight?: VNode;
   /** @title Закругленные углы */
   rounded?: boolean;
   /** @hidden */
@@ -56,7 +57,7 @@ export interface BackwardButtonProps extends ButtonProps {
   /** @title Верхний текст */
   aboveText?: string;
   /** @hidden */
-  appendLeft?: any;
+  appendLeft?: VNode;
   /** @title Закругленные углы */
   rounded?: boolean;
   /** @hidden */

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

@@ -11,7 +11,7 @@ export const ButtonSection = JSX<ButtonSectionProps>(({ context, className = '',
   const { handlerDecorator } = context;
   const router = context.useRouter();
 
-  return buttons?.length ? (
+  return buttons && buttons?.length ? (
     <div className={className}>
       {buttons.map((button, index) =>
         renderButton(useLink({ router, handlerDecorator }, button), index),

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

@@ -1,8 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { SVGPathOptions } from '../SVG';
 
 export interface LikeButtonProps {
   className?: string;
-  onClick?: (ev: MouseEvent) => any;
+  onClick?: () => void;
   ariaLabel?: string;
 }
 
@@ -23,13 +24,14 @@ const renderLikeIcon = () => {
     strokeLinecap: 'round',
     strokeLinejoin: 'round',
     strokeWidth: '1.5',
-  };
+  } as SVGPathOptions;
 
   return (
     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
       <path
         {...params}
         strokeMiterlimit="10"
+        /* eslint-disable max-len */
         d="M21.48 11.95c.5-1.4-.4-2.6-1.9-2.6h-4c-.6 0-1.1-.5-1-1.2l.5-3.2c.2-.9-.4-1.9-1.3-2.2-.8-.3-1.8.1-2.2.7l-4.1 6.1M7.48 18.35l3.1 2.4c.4.4 1.3.6 1.9.6h3.8c1.2 0 2.5-.9 2.8-2.1l1.24-3.77"
       />
       <path

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

@@ -1,8 +1,7 @@
 import { ArrowButton } from './ArrowButton';
-import type { FuncReturnVoid } from '../../types';
 
-type renderArrowsProps = {
-  handler: FuncReturnVoid<MouseEvent>[];
+export type renderArrowsProps = {
+  handler: [() => void, () => void];
   isShown: [boolean, boolean];
   btnClass: [string, string];
   className?: string;

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

@@ -21,7 +21,7 @@ export const Checkbox = JSX<CheckboxProps>(({ className, text, checked, isRadio,
         checked:border-primary-main m-0`}
         type="checkbox"
         onChange={(e) => {
-          onChange(e.target.checked);
+          onChange(e.target.checked as boolean);
         }}
         checked={checked}
       />
@@ -37,7 +37,7 @@ export const Checkbox = JSX<CheckboxProps>(({ className, text, checked, isRadio,
           viewBox="0 0 11 9"
         />
       )}
-      {text ? <span className="font-sans ml-3 text-m-base cursor-pointer">{text}</span> : null}
+      {text ? <span className="font-sans ml-3 text-l cursor-pointer">{text}</span> : null}
     </label>
   </div>
 ));

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

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { DescriptionContent } from './DescriptionContent';
+import type { DescriptionProp } from '../../model/HeadlineType';
 
-export interface DescriptionProps extends DescriptionContent {
+export interface DescriptionProps extends DescriptionProp {
   className?: string;
 }
 
 export const Description = JSX<DescriptionProps>((props) => {
   const { className = '', description } = props;
 
-  return <div className={`font-normal text-base ${className}`}>{description}</div>;
+  return <div className={`${className}`}>{description}</div>;
 });

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

@@ -48,7 +48,7 @@ export const Foldable = JSX<FoldableProps>(
 
     const buttonClassName =
       foldButtonClasses ||
-      'border-none bg-primary-main px-0 py-[26px] mb-[1px] w-full font-sans text-white text-base flex justify-center cursor-pointer';
+      'border-none bg-primary-main px-0 py-[26px] mb-[1px] w-full font-sans text-white text-l flex justify-center cursor-pointer';
     const getFoldButtonLabel = isActive ? 'Скрыть' : foldButtonLabel;
 
     return blocks ? (

package/mobile/src/ui-kit/Foldable/useActiveHandler.ts

@@ -12,7 +12,7 @@ export const useActiveHandler = ({ context, initialState = false }: ActiveHandle
   const [isActive, setIsActive] = context.useState(initialState);
   const icon: IconName = isActive ? 'ArrowUpIcon' : 'ArrowDownIcon';
 
-  const handleToggle = (e: MouseEvent) => {
+  const handleToggle = (e) => {
     const currentTarget = e.currentTarget as HTMLElement;
 
     if (!currentTarget) {

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

@@ -1,28 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { HeadingContent, HeadingType, HeadingTypeContent } from './HeadingContent';
-
-export interface HeadingProps extends HeadingContent, HeadingTypeContent {
-  className?: string;
-  as?: HeadingType;
-}
+import type { HeadingProps, HeadingType } from './HeadingProps';
 
 const HeadingClass: Record<HeadingType, string> = {
+  h0: 'text-m-title',
   h1: 'text-m-title',
   h2: 'text-m-title',
-  h3: 'text-m-title-md',
+  h3: 'text-h6',
   h4: 'text-m-title-xs',
   h5: 'text-m-title-xs',
   h6: 'text-m-title-xs',
 };
 
 export const Heading = JSX<HeadingProps>((props) => {
-  const { className, headingType, title, as } = props;
-
-  if (!headingType) {
-    return null;
-  }
-
-  const Tag = as || headingType;
+  const { className, headingType = 'h3', title, as: Tag = 'h3' } = props;
 
   return (
     <Tag className={`font-sans font-medium m-0 ${HeadingClass[headingType]} ${className || ''}`}>

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

@@ -0,0 +1,24 @@
+import type { TitleProp } from '../../model/HeadlineType';
+
+/**
+ *
+ * @title Размер заголовка
+ * @enumNames [
+ *   "h0", "h1", "h2", "h3", "h4", "h5", "h6"
+ * ]
+ */
+export type HeadingType = 'h0' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+/**
+ * @hidden
+ */
+export type HeadingTagType = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+export interface HeadingCommonProps extends TitleProp {
+  as?: HeadingTagType;
+  headingType?: HeadingType;
+}
+
+export interface HeadingProps extends HeadingCommonProps {
+  className?: string;
+}

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

@@ -1,11 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputProps } from './InputProps';
-import { ChangeEvent } from 'react';
 
 export const Input = JSX<InputProps>(
   ({ className = '', id, name, type = 'text', placeholder, pattern, value, onChange }) => {
-    const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
-      const validInputValue = e.target.validity.valid ? e.target.value : value;
+    const handleChange = (e) => {
+      const validInputValue = e.target.validity.valid ? (e.target.value as string) : value;
       onChange(validInputValue);
     };
 
@@ -18,7 +17,7 @@ export const Input = JSX<InputProps>(
         pattern={pattern}
         placeholder={placeholder}
         value={value}
-        onChange={(e) => handleChange(e)}
+        onChange={handleChange}
       />
     );
   },

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

@@ -29,12 +29,12 @@ export const InputRange = JSX<InputRangeProps>(
     return (
       <div className={className}>
         <label className="block relative">
-          {title ? <span className="text-base text-secondary-text pl-4">{title}</span> : null}
+          {title ? <span className="text-l text-secondary-text pl-4">{title}</span> : null}
           <input
-            className={`m-0 mt-[5px] font-sans text-title w-full h-14 border border-solid border-main-stroke rounded-md
+            className={`m-0 mt-[5px] font-sans text-h3 w-full h-14 border border-solid border-main-stroke rounded-md
                         outline-none p-0 pl-4 box-border text-primary-text`}
             value={addSpacesBetweenNumbers(value)}
-            onChange={(e) => handleChange(e.target.value)}
+            onChange={(e) => handleChange(e.target.value as string)}
             onBlur={handleBlur}
           />
           <div className="absolute inset-x-0 bottom-[-4px] px-4 leading-[18px]">
@@ -45,7 +45,7 @@ export const InputRange = JSX<InputRangeProps>(
               max={max}
               step={step}
               value={value}
-              onChange={(e) => handleChange(e.target.value)}
+              onChange={(e) => handleChange(e.target.value as string)}
               style={inputStyle}
             />
           </div>

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

@@ -1,5 +1,3 @@
-import type { FuncReturnVoid } from '../../types';
-
 export interface InputRangeProps {
   className?: string;
   items?: string[];
@@ -8,5 +6,5 @@ export interface InputRangeProps {
   step?: number;
   value?: number;
   title?: string;
-  onChange?: FuncReturnVoid<number>;
+  onChange?: (value: number) => void;
 }

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

@@ -1,15 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
 
-interface SVGPathOptions {
+export interface SVGPathOptions {
   fill?: string;
   stroke?: string;
-  strokeLinecap?: string;
-  strokeLinejoin?: string;
+  strokeLinecap?: 'inherit' | 'butt' | 'round' | 'square';
+  strokeLinejoin?: 'inherit' | 'round' | 'miter' | 'bevel';
   strokeWidth?: string;
   strokeMiterlimit?: string;
 }
 
-interface SVGPath extends SVGPathOptions {
+export interface SVGPath extends SVGPathOptions {
   d: string;
 }
 

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

@@ -12,11 +12,11 @@ export const SearchBarInner = JSX<SearchBarInnerProps>(
     const { term, setTerm } = context.useSearch();
 
     const LoupeIconClassName = isMobile ? 'w-[20px] h-[20px]' : 'w-[24px] h-[24px]';
-    const SearchBarLabelClassName = isMobile ? 'font-normal text-sm' : 'font-light text-base';
+    const SearchBarLabelClassName = isMobile ? 'font-normal text-sm' : 'text-l-light';
     const SearchBarInputClassName = isMobile
       ? ' placeholder-transparent font-normal'
       : 'font-light h-full';
-    const inputPlaceholder = isMobile ? 'some search' : null;
+    const inputPlaceholder = isMobile ? 'some search' : undefined;
 
     return (
       <form className={`font-sans relative ${className}`}>
@@ -35,10 +35,10 @@ export const SearchBarInner = JSX<SearchBarInnerProps>(
         </div>
         <input
           id="search-bar-input"
-          className={`h-12 pl-12 w-full peer text-base text-black border border-solid rounded box-border
+          className={`h-12 pl-12 w-full peer text-l text-black border border-solid rounded box-border
               outline-none pr-[6%] border-main-divider focus:border-primary-text ${SearchBarInputClassName}`}
           value={term}
-          onChange={(e) => setTerm(e.target.value)}
+          onChange={(e) => setTerm(e.target.value as string)}
           type="text"
           name="search-bar-input"
           placeholder={inputPlaceholder}
@@ -58,8 +58,8 @@ export const SearchBarInner = JSX<SearchBarInnerProps>(
             version="primary"
             text="Найти"
             className="invisible peer-focus:visible absolute top-1 right-1"
-            onClick={(e) => {
-              e.preventDefault();
+            onClick={(ev) => {
+              ev?.preventDefault();
               console.log('click');
             }}
           >

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

@@ -16,7 +16,7 @@ export const Select = JSX<SelectProps>(
         id={id}
         name={name || id}
         value={value}
-        onChange={(e) => onChange(e.target.value)}
+        onChange={(e) => onChange(e.target.value as string)}
       >
         {children}
       </select>

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

@@ -26,14 +26,14 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
       children,
     };
 
-    const handleScroll = (e: UIEvent) => {
+    const handleScroll = (e) => {
       const {
         scrollLeft,
         clientWidth,
         childElementCount,
         scrollWidth,
         children: childrenCollection,
-      } = e.currentTarget as HTMLElement;
+      } = e?.currentTarget as HTMLElement;
 
       // horizontal PADDING / 2 to compensate padding-margin combo of child container
       // without CSS calc function, as wrapper element gets bigger in the DOM, remaining same visually

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlDots.tsx

@@ -14,7 +14,7 @@ export interface SwipeListControlDotsProps {
 
 export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
   ({ children, activeIndex, indexFraction, showDots }) => {
-    const handleClick = (idx: number) => (e: Event) => {
+    const handleClick = (idx: number) => (e) => {
       if (idx === activeIndex) {
         return;
       }
@@ -27,7 +27,7 @@ export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
 
     return showDots && children?.length ? (
       <div className="flex gap-2 mx-auto mt-5 w-fit">
-        {children?.map((_, idx) => (
+        {children?.map((_, idx: number) => (
           <div
             key={String(idx)}
             onClick={handleClick(idx)}
@@ -45,9 +45,9 @@ const getDotStyles = (
   currentIdx: number,
   activeIndex: number,
   indexFraction: number,
-): Record<string, string> | null => {
+): Record<string, string> | undefined => {
   if (currentIdx < activeIndex || currentIdx > activeIndex + 1) {
-    return null;
+    return;
   }
 
   const leftIndexMod = 1 - indexFraction;