@redneckz/wildless-cms-uni-blocks 0.3.84 → 0.3.86

package/mobile/lib/ui-kit/SearchBar/SearchBar.js

@@ -1,11 +1,7 @@
-import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
+import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { Img } from '../Img/Img.js';
-export const SearchBar = JSX(({ className, context }) => {
-    const { term, setTerm } = context.useSearch();
-    return (_jsxs("form", { className: `relative ${className || ''}`, children: [_jsxs("div", { className: "absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none", children: [_jsx("div", { className: "w-[20px] h-[20px]", children: _jsx(Img, { image: "LoupeIcon", width: "24", height: "24" }) }), term ? null : (_jsx("label", { htmlFor: "search-bar-input", className: "font-sans font-normal text-sm text-secondary-text", children: "\u041F\u043E\u0438\u0441\u043A \u043F\u043E \u0441\u0430\u0439\u0442\u0443" }))] }), _jsx("input", { id: "search-bar-input", className: 'h-12 pl-12 w-full peer placeholder-transparent font-sans font-normal text-base text-black border border-solid rounded box-border outline-none pr-[6%] border-main-divider focus:border-primary-text', value: term, onChange: (e) => setTerm(e.target.value), type: "text", name: "search-bar-input", placeholder: "some search" }), _jsx("button", { className: "visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer border-none", onClick: (e) => {
-                    e.preventDefault();
-                    setTerm('');
-                }, children: _jsx(Img, { image: "CloseIcon", width: "24", height: "24" }) })] }));
+import { SearchBarInner } from './SearchBarInner.js';
+export const SearchBar = JSX(({ className = '', context }) => {
+    return _jsx(SearchBarInner, { context: context, className: className, isMobile: true });
 });
 //# sourceMappingURL=SearchBar.js.map

package/mobile/lib/ui-kit/SearchBar/SearchBar.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchBar.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchBar/SearchBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAgB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;IACrE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAE9C,OAAO,CACL,gBAAM,SAAS,EAAE,YAAY,SAAS,IAAI,EAAE,EAAE,aAC5C,eAAK,SAAS,EAAC,yGAAyG,aACtH,cAAK,SAAS,EAAC,mBAAmB,YAChC,KAAC,GAAG,IAAC,KAAK,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GAC5C,EACL,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACb,gBACE,OAAO,EAAC,kBAAkB,EAC1B,SAAS,EAAC,mDAAmD,2FAGvD,CACT,IACG,EACN,gBACE,EAAE,EAAC,kBAAkB,EACrB,SAAS,EACP,qMAAqM,EAEvM,KAAK,EAAE,IAAI,EACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EACxC,IAAI,EAAC,MAAM,EACX,IAAI,EAAC,kBAAkB,EACvB,WAAW,EAAC,aAAa,GACzB,EACF,iBACE,SAAS,EAAC,uHAAuH,EACjI,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,OAAO,CAAC,EAAE,CAAC,CAAC;gBACd,CAAC,YAED,KAAC,GAAG,IAAC,KAAK,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GACzC,IACJ,CACR,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"SearchBar.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchBar/SearchBar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAgB,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC1E,OAAO,KAAC,cAAc,IAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,GAAI,CAAC;AACpF,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/SearchBar/SearchBarInner.d.ts

@@ -0,0 +1,5 @@
+import type { UniBlockProps } from '../../types';
+export interface SearchBarInnerProps extends UniBlockProps {
+    isMobile?: boolean;
+}
+export declare const SearchBarInner: (props: import("@redneckz/uni-jsx").PropsWithChildren<SearchBarInnerProps, any>, context?: any) => any;

package/mobile/lib/ui-kit/SearchBar/SearchBarInner.js

@@ -0,0 +1,22 @@
+import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
+import { JSX } from '@redneckz/uni-jsx';
+import { Button } from '../Button/Button.js';
+import { Img } from '../Img/Img.js';
+export const SearchBarInner = JSX(({ className, context, isMobile = false }) => {
+    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 SearchBarInputClassName = isMobile
+        ? ' placeholder-transparent font-normal'
+        : 'font-light h-full';
+    const inputPlaceholder = isMobile ? 'some search' : undefined;
+    return (_jsxs("form", { className: `font-sans relative ${className}`, children: [_jsxs("div", { className: "absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none", children: [_jsx("div", { className: LoupeIconClassName, children: _jsx(Img, { image: "LoupeIcon", width: "24", height: "24" }) }), term ? null : (_jsx("label", { htmlFor: "search-bar-input", className: `text-secondary-text ${SearchBarLabelClassName}`, children: "\u041F\u043E\u0438\u0441\u043A \u043F\u043E \u0441\u0430\u0439\u0442\u0443" }))] }), _jsx("input", { id: "search-bar-input", className: `h-12 pl-12 w-full peer text-base 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), type: "text", name: "search-bar-input", placeholder: inputPlaceholder }), isMobile ? (_jsx("button", { className: "visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer border-none", onClick: (e) => {
+                    e.preventDefault();
+                    setTerm('');
+                }, children: _jsx(Img, { image: "CloseIcon", width: "24", height: "24" }) })) : (_jsx(Button, { version: "primary", text: "\u041D\u0430\u0439\u0442\u0438", className: "invisible peer-focus:visible absolute top-1 right-1", onClick: (ev) => {
+                    ev?.preventDefault();
+                    console.log('click');
+                }, children: _jsx("div", { className: "font-normal text-sm px-9 py-[9px]", children: "\u041D\u0430\u0439\u0442\u0438" }) }))] }));
+});
+//# sourceMappingURL=SearchBarInner.js.map

package/mobile/lib/ui-kit/SearchBar/SearchBarInner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SearchBarInner.js","sourceRoot":"","sources":["../../../src/ui-kit/SearchBar/SearchBarInner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAMjC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAC/B,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,GAAG,KAAK,EAAE,EAAE,EAAE;IAC3C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAE9C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAChF,MAAM,uBAAuB,GAAG,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAC1F,MAAM,uBAAuB,GAAG,QAAQ;QACtC,CAAC,CAAC,sCAAsC;QACxC,CAAC,CAAC,mBAAmB,CAAC;IACxB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9D,OAAO,CACL,gBAAM,SAAS,EAAE,sBAAsB,SAAS,EAAE,aAChD,eAAK,SAAS,EAAC,yGAAyG,aACtH,cAAK,SAAS,EAAE,kBAAkB,YAChC,KAAC,GAAG,IAAC,KAAK,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GAC5C,EACL,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CACb,gBACE,OAAO,EAAC,kBAAkB,EAC1B,SAAS,EAAE,uBAAuB,uBAAuB,EAAE,2FAGrD,CACT,IACG,EACN,gBACE,EAAE,EAAC,kBAAkB,EACrB,SAAS,EAAE;mFAC8D,uBAAuB,EAAE,EAClG,KAAK,EAAE,IAAI,EACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EACxC,IAAI,EAAC,MAAM,EACX,IAAI,EAAC,kBAAkB,EACvB,WAAW,EAAE,gBAAgB,GAC7B,EACD,QAAQ,CAAC,CAAC,CAAC,CACV,iBACE,SAAS,EAAC,uHAAuH,EACjI,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,OAAO,CAAC,EAAE,CAAC,CAAC;gBACd,CAAC,YAED,KAAC,GAAG,IAAC,KAAK,EAAC,WAAW,EAAC,KAAK,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,GAAG,GACzC,CACV,CAAC,CAAC,CAAC,CACF,KAAC,MAAM,IACL,OAAO,EAAC,SAAS,EACjB,IAAI,EAAC,gCAAO,EACZ,SAAS,EAAC,qDAAqD,EAC/D,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE;oBACd,EAAE,EAAE,cAAc,EAAE,CAAC;oBACrB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACvB,CAAC,YAED,cAAK,SAAS,EAAC,mCAAmC,+CAAY,GACvD,CACV,IACI,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/lib/ui-kit/TableArrowScrollControl/TableArrowScrollControlProps.d.ts

@@ -1,8 +1,7 @@
-import { FuncReturnVoid } from '../../types';
 export interface TableArrowScrollControlProps {
     isScrollAvailable?: boolean;
-    handleNextClick: FuncReturnVoid<MouseEvent>;
-    handlePrevClick: FuncReturnVoid<MouseEvent>;
+    handleNextClick: () => void;
+    handlePrevClick: () => void;
     showNextButton: boolean;
     showPrevButton: boolean;
 }

package/mobile/lib/ui-kit/Tabs/TabsProps.d.ts

@@ -1,5 +1,4 @@
 import type { Picture } from '../../model/Picture';
-import { FuncReturnVoid } from '../../types';
 /**
  * @title Вкладка
  */
@@ -10,7 +9,7 @@ export interface Tab {
     description?: string;
     icon?: Picture;
 }
-export declare type TabClickHandler = FuncReturnVoid<number>;
+export declare type TabClickHandler = (tabIndex: number) => void;
 export interface TabsProps {
     tabs?: Tab[];
     currentTabIndex: number;

package/mobile/lib/ui-kit/TopItem/TopItem.d.ts

@@ -7,7 +7,7 @@ export interface TopItemProps extends TopItemContent {
     className?: string;
     flat?: boolean;
     ariaLabel?: string;
-    onClick?: (ev: MouseEvent) => any;
+    onClick?: () => void;
     bgColor?: BgColorVersion;
     dataItemName?: string;
 }

package/mobile/lib/utils/url.d.ts

@@ -2,3 +2,4 @@ export declare const isURL: (href?: string) => boolean | undefined;
 export declare const withoutQuery: (href?: string) => string;
 export declare const getOrigin: (href?: string) => string | undefined;
 export declare const getHash: (href?: string) => string | undefined;
+export declare const isHash: (href?: string) => boolean | undefined;

package/mobile/lib/utils/url.js

@@ -17,4 +17,5 @@ export const getHash = (href) => {
     const hashIndex = href.indexOf('#');
     return hashIndex !== -1 ? href.substring(hashIndex, href.length) : undefined;
 };
+export const isHash = (href) => href?.startsWith('#');
 //# sourceMappingURL=url.js.map

package/mobile/lib/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE;IACvC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEpC,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE;IACvC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEpC,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC"}

package/mobile/src/components/Accordion/useActiveHandler.ts

@@ -6,17 +6,17 @@ export const useActiveHandler = ({ context, blocks, initialState = false }: Acti
   const hasContent = blocks?.length;
   const icon: IconName = isActive ? 'MinusIcon' : 'PlusIcon';
 
-  const getContentBlock = ({ currentTarget }) => currentTarget.nextSibling;
+  const handleToggle = (e) => {
+    const currentTarget = e.currentTarget as HTMLElement;
 
-  const handleToggle = (e: MouseEvent) => {
-    if (!hasContent) {
+    if (!currentTarget) {
       return;
     }
 
     setIsActive(!isActive);
-    const contentBlock = getContentBlock(e);
+    const contentBlock = currentTarget.nextSibling as HTMLElement;
     contentBlock.style.maxHeight = contentBlock.style.maxHeight
-      ? null
+      ? ''
       : `${contentBlock.scrollHeight}px`;
   };
 

package/mobile/src/components/BaseTile/BaseTile.tsx

@@ -5,7 +5,7 @@ import type { BaseTileCommonProps } from './BaseTileProps';
 export interface BaseTileProps extends BaseTileCommonProps, UniBlockProps {}
 
 export const BaseTile = JSX<BaseTileProps>(
-  ({ className = '', title, children, buttons, image }) => {
+  ({ className = '', title = '', children, buttons, image }) => {
     return (
       <div className={`font-sans flex flex-col grow h-full items-start ${className}`}>
         {title}

package/mobile/src/components/BaseTile/BaseTileProps.ts

@@ -1,39 +1,16 @@
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-import type { HeadingType } from '../../ui-kit/Heading/HeadingContent';
 import type { AlignType } from '../../model/AlignType';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { HeadingType } from '../../ui-kit/Heading/HeadingProps';
+import type { VNode } from '../../model/VNode';
 
-/**
- * @title Общий компонент плиток
- */
-export type BaseTileCommonProps = BaseTileTitleProps & BaseTileMainProps;
-
-/**
- * @title Заголовк плитки
- */
-export interface BaseTileTitleProps {
-  /** @title Заголовок */
-  title?: string;
-  /**
-   * @title Тип заголовка
-   */
+export interface BaseTileCommonProps {
+  title?: VNode;
   headingType?: HeadingType;
-}
-
-export interface BaseTileMainProps {
   description?: string;
-  image?: Picture;
-  /** @title Список */
+  image?: VNode;
   items?: string[];
-
   list?: string;
-
-  /**
-   * @title Кнопки
-   * @maxItems 4
-   */
-  buttons?: ButtonWithIconProps[];
+  buttons?: VNode;
   version?: BlockVersion;
   align?: AlignType;
 }

package/mobile/src/components/BaseTile/getTileHeadingType.ts

@@ -3,10 +3,10 @@ import { getColSpan } from '../../utils/getColSpan';
 export function getTileHeadingType(className = '') {
   const colSpan = getColSpan(className);
   if (colSpan <= 4) {
-    return 'h4';
+    return 'S';
   } else if (colSpan <= 8) {
-    return 'h3';
+    return 'M';
   } else {
-    return 'h2';
+    return 'L';
   }
 }

package/mobile/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import type { HeadingContent, HeadingTypeContent } from '../../ui-kit/Heading/HeadingContent';
+import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 import type { EmptyOption } from '../../model/EmptyOptionType';
 
 /**
@@ -48,11 +48,10 @@ export interface BenefitItem {
 /**
  * @title Блок преимущества
  */
-export type BenefitsBlockContent = HeadingContent &
-  HeadingTypeContent & {
-    /**
-     * @title Список преимуществ
-     * @maxItems 6
-     */
-    benefitList?: BenefitItem[];
-  };
+export type BenefitsBlockContent = HeadingCommonProps & {
+  /**
+   * @title Список преимуществ
+   * @maxItems 6
+   */
+  benefitList?: BenefitItem[];
+};

package/mobile/src/components/Blocks.spec.tsx

@@ -0,0 +1,74 @@
+import { setup } from '@redneckz/uni-jsx';
+import { render } from '@testing-library/react';
+import { useState } from 'react';
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { Blocks } from './Blocks';
+import type { ContentPageContext } from './ContentPage/ContentPageContext';
+
+setup(jsx, jsxs);
+
+jest.mock('../ui-kit/BlockWrapper', () => ({
+  __esModule: true,
+  BlockWrapper: ({ children }) => <section>{children}</section>,
+}));
+
+const emptyFn = () => {
+  /* For sure */
+};
+
+const context: ContentPageContext = {
+  useState,
+  useRouter: () => ({
+    pathname: '/credits',
+    query: {},
+    push: emptyFn,
+    replace: emptyFn,
+  }),
+  useAsyncData: () => ({}),
+  useGeolocation: (defaultLocation) => [defaultLocation, emptyFn],
+  useLikeService: () => ({
+    likeCount: 0,
+    like: emptyFn,
+    dislike: emptyFn,
+  }),
+  handlerDecorator: (): any => emptyFn,
+  useSearch: () => ({
+    term: '',
+    setTerm: emptyFn,
+  }),
+  IntersectionObserverTag: ({ children }) => children,
+};
+
+describe('Blocks', () => {
+  beforeEach(() => {
+    jest.resetModules();
+  });
+
+  for (const [key, BlockComponent] of Object.entries(Blocks)) {
+    describe(key, () => {
+      it(`should render block "${key}" without content`, () => {
+        expect.assertions(2);
+
+        const { container } = render(<BlockComponent context={context} />);
+        expect(container.firstChild).toBeTruthy();
+        expect(container.firstChild).toMatchSnapshot();
+      });
+
+      it(`should render block "${key}" with demo content`, async () => {
+        expect.assertions(1);
+
+        let data = {};
+
+        try {
+          const { default: example } = await import(`./${key}/${key}.example.json`);
+          data = example;
+        } catch (ex) {
+          // Do nothing
+        }
+
+        const { container } = render(<BlockComponent context={context} {...data} />);
+        expect(container.firstChild).toBeTruthy();
+      });
+    });
+  }
+});

package/mobile/src/components/Bonus/BonusContent.ts

@@ -1,5 +1,4 @@
-import type { DescriptionContent } from '../../ui-kit/Description/DescriptionContent';
-import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
+import type { HeadlineCommonProps } from '../../model/HeadlineType';
 
 /** @title Плитка */
 interface BonusItems {
@@ -16,8 +15,7 @@ interface BonusItems {
 /**
  * @title Блок Бонусы
  */
-export type BonusContent = HeadingContent &
-  DescriptionContent & {
-    /** @title Список плиток */
-    bonusItems?: BonusItems[];
-  };
+export type BonusContent = HeadlineCommonProps & {
+  /** @title Список плиток */
+  bonusItems?: BonusItems[];
+};

package/mobile/src/components/Calculator/BonusCalculatorForm.tsx

@@ -1,68 +1,60 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
+import { CommonCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
-import { getDefaultSum } from './getDefaultSum';
-import { renderWantedSumInput } from './renderWantedSumInput';
-import { renderRate } from './renderRate';
+import { DEFAULT_REST_MIN_SUM, DEFAULT_TRAVEL_MIN_SUM } from './constants';
+import { Rate } from './Rate';
 import { renderButtonSection } from './renderButtonSection';
-import { BonusCalculatorParams, CommonCalculatorProps } from './CalculatorContent';
-
-export interface BonusCalculatorProp
-  extends BonusCalculatorParams,
-    CommonCalculatorProps,
-    UniBlockProps {}
+import { renderWantedSumInput } from './renderWantedSumInput';
+import { getBonusCalculatorParams } from './useBonusCalculatorParams';
 
-export const BonusCalculatorForm = JSX<BonusCalculatorProp>(
-  ({
-    context,
-    className = '',
-    buttons,
-    bonus,
-    minSumTrip,
-    maxSumTrip,
-    minSumOther,
-    maxSumOther,
-  }) => {
-    const [bonusTripValue, setBonusTripValue] = context.useState<number | undefined>(undefined);
-    const [bonusOtherValue, setBonusOtherValue] = context.useState<number | undefined>(undefined);
-    const calculatorTripParams = { minSum: minSumTrip, maxSum: maxSumTrip };
-    const calculatorOtherParams = { minSum: minSumOther, maxSum: maxSumOther };
+export interface BonusCalculatorProps extends CommonCalculatorProps, UniBlockProps {}
 
-    const incomeBonus = 948841;
-    const bonusOrDef = bonus || 2528;
+export const BonusCalculatorForm = JSX<BonusCalculatorProps>(
+  ({ context, className = '', sourceBookDir, buttons }) => {
+    const [travelExpenseValue, setTravelExpenseValue] = context.useState(DEFAULT_TRAVEL_MIN_SUM);
+    const [restExpenseValue, setRestExpenseValue] = context.useState(DEFAULT_REST_MIN_SUM);
+    const userInputParams = {
+      travelExpenseValue,
+      restExpenseValue,
+    };
+    const { minSumTravel, maxSumTravel, minSumOther, maxSumOther, monthBonus, yearBonus } =
+      getBonusCalculatorParams(context, userInputParams, sourceBookDir);
 
     return (
       <section className={className}>
         <div className="w-[468px]">
-          {renderWantedSumInput({
-            title: 'Сумма покупок в категории путешествия, ₽',
-            calculatorParams: calculatorTripParams,
-            moneyValue: bonusTripValue,
-            defaultSum: getDefaultSum(calculatorTripParams),
-            setMoneyValue: setBonusTripValue,
-            isShowItems: false,
-          })}
-          {renderWantedSumInput({
-            className: 'mt-6',
-            title: 'Сумма покупок в остальных категориях, ₽',
-            calculatorParams: calculatorOtherParams,
-            moneyValue: bonusOtherValue,
-            defaultSum: getDefaultSum(calculatorOtherParams),
-            setMoneyValue: setBonusOtherValue,
-            isShowItems: false,
-          })}
+          {renderWantedSumInput(
+            'Сумма покупок в категории путешествия, ₽',
+            {
+              minSum: minSumTravel,
+              maxSum: maxSumTravel,
+              moneyValue: travelExpenseValue,
+              step: 500,
+              isShowItems: false,
+            },
+            setTravelExpenseValue,
+          )}
+          {renderWantedSumInput(
+            'Сумма покупок в остальных категориях, ₽',
+            {
+              className: 'mt-6',
+              minSum: minSumOther,
+              maxSum: maxSumOther,
+              moneyValue: restExpenseValue,
+              step: 500,
+              isShowItems: false,
+            },
+            setRestExpenseValue,
+          )}
         </div>
         <div>
-          {bonusOrDef
-            ? renderRate({
-                rate: bonusOrDef,
-                title: 'Баллов за месяц',
-                className: 'tracking-[-14px]',
-              })
-            : null}
+          {monthBonus >= 0 ? (
+            <Rate title="Баллов за месяц" rate={monthBonus} rateBlockClassName="tracking-[-14px]" />
+          ) : null}
         </div>
         <div className="w-[240px]">
-          {incomeBonus ? <CalculatorValueBlock title="Баллов за год" value={incomeBonus} /> : null}
+          {yearBonus >= 0 ? <CalculatorValueBlock title="Баллов за год" value={yearBonus} /> : null}
           {renderButtonSection(context, buttons)}
         </div>
       </section>

package/mobile/src/components/Calculator/Calculator.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../types';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import type { FuncReturnVoid, UniBlockProps } from '../../types';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Img } from '../../ui-kit/Img/Img';
 import type { CalculatorBlockDef, CalculatorContent, CalculatorNav } from './CalculatorContent';
@@ -12,20 +12,20 @@ type TabsProps = {
   tabsShift: number;
   tabsNav: CalculatorNav[];
   activeSlideIndex: number;
-  setActiveSlideIndex: FuncReturnVoid<number>;
+  setActiveSlideIndex: (index: number) => void;
 };
 
 type NavButtonProps = {
   tab: CalculatorNav;
   i: number;
   activeSlideIndex: number;
-  onClick: FuncReturnVoid<MouseEvent>;
+  onClick: () => void;
 };
 
 export const Calculator = JSX<CalculatorProps>(
-  ({ className = '', context, calcTabs = [], ...rest }) => {
-    const tabsNav = calcTabs.map((_) => _.nav || ({} as CalculatorNav));
-    const blockCalcTabs = calcTabs.map(
+  ({ className = '', context, calculatorTabs = [], ...rest }) => {
+    const tabsNav = calculatorTabs.map((_) => _.nav || ({} as CalculatorNav));
+    const calculatorBlocks = calculatorTabs.map(
       ({ calculatorBlock }) => calculatorBlock || ({} as CalculatorBlockDef),
     );
     const [activeSlideIndex, setActiveSlideIndex] = context.useState(0);
@@ -34,8 +34,8 @@ export const Calculator = JSX<CalculatorProps>(
     const handleNextClick = () => setTabsShift(tabsShift + 1);
     const handlePrevClick = () => setTabsShift(tabsShift - 1);
 
-    const isGalleryScrollAvailable = calcTabs?.length > 3;
-    const showNextButton = isGalleryScrollAvailable && calcTabs?.length > tabsShift + 3;
+    const isGalleryScrollAvailable = calculatorTabs?.length > 3;
+    const showNextButton = isGalleryScrollAvailable && calculatorTabs?.length > tabsShift + 3;
     const showPrevButton = tabsShift > 0;
 
     return (
@@ -60,8 +60,8 @@ export const Calculator = JSX<CalculatorProps>(
           style={{ transform: `translateX(-${activeSlideIndex}00%)` }}
           role="list"
         >
-          {blockCalcTabs?.length
-            ? blockCalcTabs.map(renderCalculatorBlock({ context, className }))
+          {calculatorBlocks?.length
+            ? calculatorBlocks.map(renderCalculatorBlock({ context, className }))
             : null}
         </div>
       </BlockWrapper>

package/mobile/src/components/Calculator/CalculatorContent.ts

@@ -5,6 +5,8 @@ import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 export interface CommonCalculatorProps {
   /** @title Кнопки */
   buttons?: ButtonWithIconProps[];
+  /** @title Адрес справочника */
+  sourceBookDir?: string;
 }
 
 /**
@@ -12,7 +14,9 @@ export interface CommonCalculatorProps {
  **/
 export interface CreditCalculatorParams {
   /** @hidden */
-  isSalary?: boolean;
+  isSalaryClient?: boolean;
+  /** @hidden */
+  isStateEmployee?: boolean;
   /** @hidden */
   isInsurance?: boolean;
   /** @hidden */
@@ -77,13 +81,19 @@ export interface BonusCalculatorParams {
   /** @hidden */
   bonus?: number;
   /** @hidden */
-  minSumTrip?: number;
+  minSumTravel?: number;
   /** @hidden */
-  maxSumTrip?: number;
+  maxSumTravel?: number;
   /** @hidden */
   minSumOther?: number;
   /** @hidden */
   maxSumOther?: number;
+  maxBonus?: number;
+  prefMonthsNum?: number;
+  prefTravelBonusRate?: number;
+  prefRestBonusRate?: number;
+  travelBonusRate?: number;
+  restBonusRate?: number;
 }
 
 /**
@@ -171,5 +181,5 @@ export interface CalculatorTab {
  */
 export interface CalculatorContent {
   /** @title Вкладки */
-  calcTabs?: CalculatorTab[];
+  calculatorTabs?: CalculatorTab[];
 }