@redneckz/wildless-cms-uni-blocks 0.3.96 → 0.4.0

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

@@ -5,4 +5,4 @@ export interface SelectProps {
     value: string;
     onChange: (value: string) => void;
 }
-export declare const Select: (props: import("@redneckz/uni-jsx").PropsWithChildren<SelectProps, any>, context?: any) => any;
+export declare const Select: import("@redneckz/uni-jsx").UNIComponent<SelectProps, any, any>;

package/mobile/lib/ui-kit/Select/SelectOption.d.ts

@@ -3,4 +3,4 @@ export interface SelectOptionProps {
     value?: string;
     selected?: boolean;
 }
-export declare const SelectOption: (props: import("@redneckz/uni-jsx").PropsWithChildren<SelectOptionProps, any>, context?: any) => any;
+export declare const SelectOption: import("@redneckz/uni-jsx").UNIComponent<SelectOptionProps, any, any>;

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

@@ -1,2 +1,2 @@
 import type { SwipeListControlProps } from './SwipeListControlProps';
-export declare const SwipeListControl: (props: import("@redneckz/uni-jsx").PropsWithChildren<SwipeListControlProps, any>, context?: any) => any;
+export declare const SwipeListControl: import("@redneckz/uni-jsx").UNIComponent<SwipeListControlProps, any, any>;

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

@@ -1,13 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { DEFAULT_GAP, DEFAULT_PADDING } from './constants.js';
 import { SwipeListControlDots } from './SwipeListControlDots.js';
 import { SwipeListControlList } from './SwipeListControlList.js';
 import { getIndexParts } from './utils/getIndexParts.js';
 import { getScrollPoints } from './utils/getScrollPoints.js';
-export const SwipeListControl = JSX(({ className, context, children, gap = DEFAULT_GAP, padding = DEFAULT_PADDING, showDots = true, onSlideChange, }) => {
-    const [activeIndex, setActiveIndex] = context.useState(0);
-    const [indexFraction, setIndexFraction] = context.useState(0);
+export const SwipeListControl = JSX(({ className, children, gap = DEFAULT_GAP, padding = DEFAULT_PADDING, showDots = true, onSlideChange, }) => {
+    const [activeIndex, setActiveIndex] = useState(0);
+    const [indexFraction, setIndexFraction] = useState(0);
     const dotsProps = {
         activeIndex,
         indexFraction,

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

@@ -1 +1 @@
-{"version":3,"file":"SwipeListControl.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/SwipeListControl.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CACjC,CAAC,EACC,SAAS,EACT,OAAO,EACP,QAAQ,EACR,GAAG,GAAG,WAAW,EACjB,OAAO,GAAG,eAAe,EACzB,QAAQ,GAAG,IAAI,EACf,aAAa,GACd,EAAE,EAAE;IACH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAS,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAS,CAAC,CAAC,CAAC;IAEtE,MAAM,SAAS,GAAG;QAChB,WAAW;QACX,aAAa;QACb,QAAQ;QACR,QAAQ;KACT,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,EAAE;QACzB,MAAM,EACJ,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,WAAW,EACX,QAAQ,EAAE,kBAAkB,GAC7B,GAAG,CAAC,EAAE,aAA4B,CAAC;QAEpC,+EAA+E;QAC/E,gGAAgG;QAChG,MAAM,SAAS,GAAI,kBAAkB,CAAC,CAAC,CAAiB,CAAC,WAAW,GAAG,OAAO,GAAG,CAAC,CAAC;QACnF,MAAM,YAAY,GAAG,eAAe,CAAC;YACnC,GAAG;YACH,OAAO;YACP,WAAW;YACX,WAAW;YACX,iBAAiB;YACjB,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI,KAAK,KAAK,WAAW,IAAI,aAAa,EAAE;YAC1C,aAAa,EAAE,CAAC;SACjB;QACD,cAAc,CAAC,KAAK,CAAC,CAAC;QACtB,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,KAAC,oBAAoB,IACnB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,YAAY,YAErB,QAAQ,GACY,EACvB,KAAC,oBAAoB,OAAK,SAAS,GAAI,IACnC,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"SwipeListControl.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/SwipeListControl.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CACjC,CAAC,EACC,SAAS,EACT,QAAQ,EACR,GAAG,GAAG,WAAW,EACjB,OAAO,GAAG,eAAe,EACzB,QAAQ,GAAG,IAAI,EACf,aAAa,GACd,EAAE,EAAE;IACH,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEtD,MAAM,SAAS,GAAG;QAChB,WAAW;QACX,aAAa;QACb,QAAQ;QACR,QAAQ;KACT,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,EAAE;QACzB,MAAM,EACJ,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,WAAW,EACX,QAAQ,EAAE,kBAAkB,GAC7B,GAAG,CAAC,EAAE,aAA4B,CAAC;QAEpC,+EAA+E;QAC/E,gGAAgG;QAChG,MAAM,SAAS,GAAI,kBAAkB,CAAC,CAAC,CAAiB,CAAC,WAAW,GAAG,OAAO,GAAG,CAAC,CAAC;QACnF,MAAM,YAAY,GAAG,eAAe,CAAC;YACnC,GAAG;YACH,OAAO;YACP,WAAW;YACX,WAAW;YACX,iBAAiB;YACjB,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI,KAAK,KAAK,WAAW,IAAI,aAAa,EAAE;YAC1C,aAAa,EAAE,CAAC;SACjB;QACD,cAAc,CAAC,KAAK,CAAC,CAAC;QACtB,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,KAAC,oBAAoB,IACnB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,YAAY,YAErB,QAAQ,GACY,EACvB,KAAC,oBAAoB,OAAK,SAAS,GAAI,IACnC,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/lib/ui-kit/SwipeListControl/SwipeListControlDots.d.ts

@@ -3,4 +3,4 @@ export interface SwipeListControlDotsProps {
     indexFraction: number;
     showDots?: boolean;
 }
-export declare const SwipeListControlDots: (props: import("@redneckz/uni-jsx").PropsWithChildren<SwipeListControlDotsProps, any>, context?: any) => any;
+export declare const SwipeListControlDots: import("@redneckz/uni-jsx").UNIComponent<SwipeListControlDotsProps, any, any>;

package/mobile/lib/ui-kit/SwipeListControl/SwipeListControlItem.d.ts

@@ -6,4 +6,4 @@ export interface SwipeListControlItemProps {
     style?: Record<string, string>;
     'aria-current'?: boolean;
 }
-export declare const SwipeListControlItem: (props: import("@redneckz/uni-jsx").PropsWithChildren<SwipeListControlItemProps, any>, context?: any) => any;
+export declare const SwipeListControlItem: import("@redneckz/uni-jsx").UNIComponent<SwipeListControlItemProps, any, any>;

package/mobile/lib/ui-kit/SwipeListControl/SwipeListControlList.d.ts

@@ -7,4 +7,4 @@ export interface SwipeListControlListProps extends SwipeContainer {
     activeIndex: number;
     onScroll?: (e: any) => void;
 }
-export declare const SwipeListControlList: (props: import("@redneckz/uni-jsx").PropsWithChildren<SwipeListControlListProps, any>, context?: any) => any;
+export declare const SwipeListControlList: import("@redneckz/uni-jsx").UNIComponent<SwipeListControlListProps, any, any>;

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

@@ -1,2 +1,2 @@
 import type { TableArrowScrollControlProps } from './TableArrowScrollControlProps';
-export declare const TableArrowScrollControl: (props: import("@redneckz/uni-jsx").PropsWithChildren<TableArrowScrollControlProps, any>, context?: any) => any;
+export declare const TableArrowScrollControl: import("@redneckz/uni-jsx").UNIComponent<TableArrowScrollControlProps, any, any>;

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

@@ -1,2 +1,2 @@
 import type { TabsProps } from './TabsProps';
-export declare const Tabs: (props: import("@redneckz/uni-jsx").PropsWithChildren<TabsProps, any>, context?: any) => any;
+export declare const Tabs: import("@redneckz/uni-jsx").UNIComponent<TabsProps, any, any>;

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

@@ -11,4 +11,4 @@ export interface TopItemProps extends TopItemContent {
     bgColor?: BgColorVersion;
     dataItemName?: string;
 }
-export declare const TopItem: (props: import("@redneckz/uni-jsx").PropsWithChildren<TopItemProps, any>, context?: any) => any;
+export declare const TopItem: import("@redneckz/uni-jsx").UNIComponent<TopItemProps, any, any>;

package/mobile/src/common.css

@@ -84,7 +84,10 @@ html {
     height: 4px;
     background: transparent;
     border-radius: 5px;
-    background-image: linear-gradient(#42ab44, #42ab44);
+    background-image: linear-gradient(
+      rgb(var(--color-primary-main)),
+      rgb(var(--color-primary-main))
+    );
     background-repeat: no-repeat;
   }
 
@@ -93,30 +96,45 @@ html {
     height: 18px;
     width: 18px;
     border-radius: 50%;
-    background: #fff;
+    background: rgb(var(--color-primary-main));
     cursor: pointer;
     box-shadow: none;
-    border: 3px solid #42ab44;
   }
 
   input[type='range'].slider::-moz-range-thumb {
     height: 12px;
     width: 12px;
     border-radius: 50%;
-    background: #fff;
+    background: rgb(var(--color-primary-main));
     cursor: pointer;
     box-shadow: none;
-    border: 3px solid #42ab44;
   }
 
   input[type='range'].slider::-ms-thumb {
     height: 18px;
     width: 18px;
     border-radius: 50%;
-    background: #fff;
+    background: rgb(var(--color-primary-main));
     cursor: pointer;
     box-shadow: none;
-    border: 3px solid #42ab44;
+  }
+
+  input[type='range'].slider:disabled {
+    background-image: linear-gradient(rgb(201, 202, 204), rgb(201, 202, 204));
+    pointer-events: none;
+    cursor: default;
+  }
+
+  input[type='range'].slider:disabled::-webkit-slider-thumb {
+    background: rgb(201, 202, 204);
+  }
+
+  input[type='range'].slider:disabled::-moz-range-thumb {
+    background: rgb(201, 202, 204);
+  }
+
+  input[type='range'].slider:disabled::-ms-thumb {
+    background: rgb(201, 202, 204);
   }
 
   /* Hide arrows */

package/mobile/src/components/Accordion/AccordionItem.tsx

@@ -9,10 +9,7 @@ export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockPr
 
 export const AccordionItem = JSX<AccordionItemProps>(
   ({ label, labelIcon, blocks, bordered, context }) => {
-    const { hasContent, icon, handleToggle } = useActiveHandler({
-      context,
-      blocks,
-    });
+    const { hasContent, icon, handleToggle } = useActiveHandler({ blocks });
 
     return (
       <li className={`${borderedLiClass(bordered)} border-solid border-main-divider`}>

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

@@ -1,8 +1,9 @@
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { IconName } from '../../icons/IconName';
 import { ActiveHandler } from '../../ui-kit/BlocksList/BlocksListProps';
 
-export const useActiveHandler = ({ context, blocks, initialState = false }: ActiveHandler) => {
-  const [isActive, setIsActive] = context.useState(initialState);
+export const useActiveHandler = ({ blocks, initialState = false }: ActiveHandler) => {
+  const [isActive, setIsActive] = useState(initialState);
   const hasContent = blocks?.length;
   const icon: IconName = isActive ? 'MinusIcon' : 'PlusIcon';
 

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

@@ -1,6 +1,7 @@
-import { setup } from '@redneckz/uni-jsx';
+import { setupHooks } from '@redneckz/uni-jsx/lib/hooks';
+import { setup } from '@redneckz/uni-jsx/lib/setup';
 import { render } from '@testing-library/react';
-import { useEffect, useState } from 'react';
+import * as React from 'react';
 import runtime from 'react/jsx-runtime';
 import { Blocks } from './Blocks';
 import type { ContentPageContext } from './ContentPage/ContentPageContext';
@@ -8,35 +9,28 @@ import type { ContentPageContext } from './ContentPage/ContentPageContext';
 const { jsx, jsxs } = runtime as any;
 
 setup(jsx, jsxs);
+setupHooks(React as any);
 
 const emptyFn = () => {
   /* For sure */
 };
 
 const context: ContentPageContext = {
-  useState,
-  useEffect,
   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,
 };
 
+jest.mock('@redneckz/uni-jsx/lib/hooks/useAsyncData', () => ({
+  __esModule: true,
+  useAsyncData: () => ({}),
+}));
+
 describe('Blocks', () => {
   beforeEach(() => {
     jest.resetModules();

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

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../types';
 import { CommonCalculatorProps } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
@@ -12,14 +13,14 @@ export interface BonusCalculatorProps extends CommonCalculatorProps, UniBlockPro
 
 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 [travelExpenseValue, setTravelExpenseValue] = useState(DEFAULT_TRAVEL_MIN_SUM);
+    const [restExpenseValue, setRestExpenseValue] = useState(DEFAULT_REST_MIN_SUM);
     const userInputParams = {
       travelExpenseValue,
       restExpenseValue,
     };
     const { minSumTravel, maxSumTravel, minSumOther, maxSumOther, monthBonus, yearBonus } =
-      useBonusCalculatorParams(context, userInputParams, sourceBookDir);
+      useBonusCalculatorParams(userInputParams, sourceBookDir);
 
     return (
       <section className={className}>

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

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../types';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
@@ -28,8 +29,8 @@ export const Calculator = JSX<CalculatorProps>(
     const calculatorBlocks = calculatorTabs.map(
       ({ calculatorBlock }) => calculatorBlock || ({} as CalculatorBlockDef),
     );
-    const [activeSlideIndex, setActiveSlideIndex] = context.useState(0);
-    const [tabsShift, setTabsShift] = context.useState(0);
+    const [activeSlideIndex, setActiveSlideIndex] = useState(0);
+    const [tabsShift, setTabsShift] = useState(0);
 
     const handleNextClick = () => setTabsShift(tabsShift + 1);
     const handlePrevClick = () => setTabsShift(tabsShift - 1);
@@ -41,10 +42,10 @@ export const Calculator = JSX<CalculatorProps>(
     return (
       <BlockWrapper
         context={context}
-        className={`box-border overflow-hidden relative font-sans w-100 bg-white text-primary-text ${className}`}
+        className={`box-border overflow-hidden relative font-sans w-100 text-primary-text ${className}`}
         {...rest}
       >
-        <div>
+        <div className="bg-white">
           {tabsNav.length > 1
             ? renderTabs({ tabsShift, tabsNav, activeSlideIndex, setActiveSlideIndex })
             : null}

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

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../types';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { CommonCalculatorProps } from './CalculatorContent';
@@ -29,12 +30,12 @@ export interface CreditCalculatorProp extends CommonCalculatorProps, UniBlockPro
 
 export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
   ({ context, className = '', sourceBookDir, buttons }) => {
-    const [isAnnuity, toggleIsAnnuity] = context.useState(false);
-    const [isInsurance, toggleIsInsurance] = context.useState(true);
-    const [isSalaryClient, toggleIsSalaryClient] = context.useState(false);
-    const [isStateEmployee, toggleIsStateEmployee] = context.useState(false);
-    const [moneyValue, setMoneyValue] = context.useState(DEFAULT_SUM);
-    const [monthsValue, setMonthsValue] = context.useState(DEFAULT_MONTHS);
+    const [isAnnuity, toggleIsAnnuity] = useState(false);
+    const [isInsurance, toggleIsInsurance] = useState(true);
+    const [isSalaryClient, toggleIsSalaryClient] = useState(false);
+    const [isStateEmployee, toggleIsStateEmployee] = useState(false);
+    const [moneyValue, setMoneyValue] = useState(DEFAULT_SUM);
+    const [monthsValue, setMonthsValue] = useState(DEFAULT_MONTHS);
     const userInputParams = {
       isAnnuity,
       isInsurance,
@@ -43,7 +44,7 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
       moneyValue,
       monthsValue,
     };
-    const calculatorParams = useCreditCalculatorParams(context, userInputParams, sourceBookDir);
+    const calculatorParams = useCreditCalculatorParams(userInputParams, sourceBookDir);
 
     return (
       <section className={className}>

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

@@ -1,6 +1,7 @@
 // TEMP
 
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../types';
 import { CommonCalculatorProps, DepositCalculatorParams } from './CalculatorContent';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
@@ -24,8 +25,8 @@ export interface DepositCalculatorProp
 
 export const DepositCalculatorForm = JSX<DepositCalculatorProp>(
   ({ context, className = '', buttons, rate }) => {
-    const [moneyValue, setMoneyValue] = context.useState<number>(DEFAULT_SUM);
-    const [monthsValue, setMonthsValue] = context.useState<number>(DEFAULT_MONTHS);
+    const [moneyValue, setMoneyValue] = useState(DEFAULT_SUM);
+    const [monthsValue, setMonthsValue] = useState(DEFAULT_MONTHS);
 
     const income = 948841;
     const finallySum = 1218841;

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

@@ -1,5 +1,6 @@
 // TEMP
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../types';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { CommonCalculatorProps, MortgageCalculatorParams } from './CalculatorContent';
@@ -20,10 +21,10 @@ export interface MortgageCalculatorProp
 
 export const MortgageCalculatorForm = JSX<MortgageCalculatorProp>(
   ({ context, className = '', buttons }) => {
-    const [moneyValue, setMoneyValue] = context.useState<number>(1000000);
-    const [monthsValue, setMonthsValue] = context.useState<number>(12);
-    const [isInsurance, toggleIsInsurance] = context.useState(false);
-    const [isFullInsurance, toggleIsFullInsurance] = context.useState(false);
+    const [moneyValue, setMoneyValue] = useState(1000000);
+    const [monthsValue, setMonthsValue] = useState(12);
+    const [isInsurance, toggleIsInsurance] = useState(false);
+    const [isFullInsurance, toggleIsFullInsurance] = useState(false);
 
     const calculatorParams = {}; // getCalculatorParams(context, { isAnnuity: isInsurance });
 

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

@@ -14,7 +14,7 @@ export const renderCalculatorBlock =
     return (
       <section
         key={String(i)}
-        className={`box-border relative flex shrink-0 basis-full ${className}`}
+        className={`box-border relative bg-white flex shrink-0 self-start basis-full ${className}`}
         role="listitem"
       >
         <div className="box-border p-9 w-full">

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

@@ -1,4 +1,3 @@
-import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 import { BONUS_CALC_DEFAULT_DIR, DEFAULT_BONUS_CALCULATOR_PARAMS } from './constants';
 import { getBonus } from './getBonus';
 import { useCalculatorParams } from './useCalculatorParams';
@@ -29,16 +28,13 @@ export interface BonusCalculatorParams
 }
 
 export const useBonusCalculatorParams = (
-  context: ContentPageContext,
   userInputParams: BonusCalculatorUserInputParams,
   sourceBookDir: string,
 ) => {
   const { travelExpenseValue, restExpenseValue } = userInputParams;
   const bonusCalculatorSourceBookParams =
-    useCalculatorParams<BonusCalculatorSourceBookParams>(
-      context.useAsyncData,
-      sourceBookDir || BONUS_CALC_DEFAULT_DIR,
-    ) || DEFAULT_BONUS_CALCULATOR_PARAMS;
+    useCalculatorParams<BonusCalculatorSourceBookParams>(sourceBookDir || BONUS_CALC_DEFAULT_DIR) ||
+    DEFAULT_BONUS_CALCULATOR_PARAMS;
 
   const [monthBonus, yearBonus] = getBonus(
     bonusCalculatorSourceBookParams,

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

@@ -1,6 +1,6 @@
-import type { AsyncDataHook } from '../ContentPage/ContentPageContext';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 
-export function useCalculatorParams<Data>(useAsyncData: AsyncDataHook, dir: string) {
+export function useCalculatorParams<Data>(dir: string) {
   const { data } = useAsyncData<Data>(
     `/wcms-resources/${dir}.json`,
     fetchCalculatorSourceBookParams,

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

@@ -1,4 +1,3 @@
-import type { ContentPageContext } from '../ContentPage/ContentPageContext';
 import { CREDIT_CALC_DEFAULT_DIR, DEFAULT_CREDIT_CALCULATOR_PARAMS } from './constants';
 import { getMonthlyPayment } from './getMonthlyPayment';
 import { useCalculatorParams } from './useCalculatorParams';
@@ -36,16 +35,12 @@ export type CreditCalculatorData = {
 };
 
 export const useCreditCalculatorParams = (
-  context: ContentPageContext,
   userInputParams: CreditCalculatorUserInputParams,
   sourceBookDir?: string,
 ): CreditCalculatorParams => {
   const { isInsurance, isSalaryClient, isStateEmployee, moneyValue } = userInputParams;
 
-  const data = useCalculatorParams<CreditCalculatorData>(
-    context.useAsyncData,
-    sourceBookDir || CREDIT_CALC_DEFAULT_DIR,
-  );
+  const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
   const creditCalculatorSourceBookParams =
     data?.rows?.find((_) => {
       return (

package/mobile/src/components/Catalog/Catalog.tsx

@@ -1,11 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../types';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import type { ContentPageContext } from '../ContentPage/ContentPageContext';
+import { Headline } from '../Headline/Headline';
 import { CatalogCard } from './CatalogCard';
 import type { CatalogCardType, CatalogContent } from './CatalogContent';
-import { Headline } from '../Headline/Headline';
 
 export interface CatalogProps extends CatalogContent, UniBlockProps {}
 
@@ -15,7 +16,7 @@ const CARD_SHIFT = 430;
 
 export const Catalog = JSX<CatalogProps>(
   ({ context, cards = [], className = '', title, description, ...rest }) => {
-    const [activeCardIndex, setActiveCardIndex] = context.useState(0);
+    const [activeCardIndex, setActiveCardIndex] = useState(0);
 
     return (
       <BlockWrapper

package/mobile/src/components/ComparisonTable/ComparisonTable.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
@@ -24,8 +25,8 @@ export const ComparisonTable = JSX<ComparisonTableProps>(
         column: data?.map((cell, i) => ({ cell, rowHeader: rowHeaders?.[i]?.title })),
       })) || [];
 
-    const [columnsViewState, setColumnsViewState] = context.useState<boolean[]>(
-      new Array(columns?.length).fill(!visibleRowLength),
+    const [columnsViewState, setColumnsViewState] = useState(
+      new Array<boolean>(columns?.length || 0).fill(!visibleRowLength),
     );
 
     const handleToggleColumn = (i: number) => {

package/mobile/src/components/ComparisonTable/ComparisonTableBody.tsx

@@ -1,10 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { ComparisonTableColumnHeaders } from './ComparisonTableColumnHeaders';
-import { ComparisonTableRows } from './ComparisonTableRows';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useTableArrowScrollControl } from '../../hooks/useTableArrowScrollControl';
-import { COLS_LENGTH_FOR_SCROLL } from './constants';
 import { ContentPageContext } from '../ContentPage/ContentPageContext';
+import { ComparisonTableColumnHeaders } from './ComparisonTableColumnHeaders';
 import { Column, RowHeader } from './ComparisonTableContent';
+import { ComparisonTableRows } from './ComparisonTableRows';
+import { COLS_LENGTH_FOR_SCROLL } from './constants';
 
 interface ComparisonTableBodyProps {
   context: ContentPageContext;
@@ -29,7 +30,7 @@ export const ComparisonTableBody = JSX<ComparisonTableBodyProps>(
       }))
       .slice(0, isShowAllRow ? rowHeaders.length : visibleRowLength);
 
-    const [activeCardIndex, setActiveCardIndex] = context.useState(0);
+    const [activeCardIndex, setActiveCardIndex] = useState(0);
 
     const tableArrowScrollProps = useTableArrowScrollControl({
       columnsLength: colData.length,

package/mobile/src/components/ContentPage/ContentPage.tsx

@@ -1,4 +1,5 @@
-import { JSX, PropsWithChildren } from '@redneckz/uni-jsx';
+import type { UNIComponent } from '@redneckz/uni-jsx';
+import { JSX } from '@redneckz/uni-jsx';
 import type { BlockDef, ContentPageDef, UniBlockProps } from '../../types';
 import { style2className } from '../../utils/style2className';
 import type { BlockContent } from '../BlockContent';
@@ -17,10 +18,7 @@ export type BlockDecorator<VNode = any> = (
   index?: number | string,
 ) => any;
 
-export type JSXBlock<BlockProps = BlockContent> = (
-  props: PropsWithChildren<UniBlockProps & BlockProps, any>,
-  context?: any,
-) => any;
+export type JSXBlock<BlockProps = BlockContent> = UNIComponent<BlockProps & UniBlockProps>;
 
 export type BlocksRegistry = Record<string, JSXBlock>;
 

package/mobile/src/components/ContentPage/ContentPageContext.tsx

@@ -9,32 +9,13 @@ export interface Router {
   replace: (url: string) => void;
 }
 
-export interface LikeService {
-  likeCount: number;
-  like: () => void;
-  dislike: () => void;
-}
-
-export type HandlerDecorator = <F extends Function>(handler: F, targetContent: any) => F;
+export type HandlerDecorator = <F extends Function>(handler: F, targetContent?: any) => F;
 
 export interface Search {
   term: string;
   setTerm: (t: string) => void;
 }
 
-export type AsyncDataHook = <Data, Err = any>(
-  key: string,
-  fetcher: (fetcherKey: string) => Promise<Data>,
-) => { data?: Data; error?: Err };
-
-export type GeolocationHook = (defaultLocation: string) => [string, () => void];
-
-export type SetStateAction<S> = S | ((prevState: S) => S);
-
-export type SetStateHook = <State>(
-  initialState: State | (() => State),
-) => [State, (action: SetStateAction<State>) => void];
-
 export interface IntersectionObserverTagProps {
   tag: keyof HTMLElementTagNameMap;
   className?: string;
@@ -48,12 +29,6 @@ export type IntersectionObserverComponent = (props: IntersectionObserverTagProps
 
 export interface ContentPageContext {
   useRouter: () => Router;
-  useState: SetStateHook;
-  useAsyncData: AsyncDataHook;
-  useGeolocation: GeolocationHook;
-  useLikeService: () => LikeService;
-  useSearch: () => Search;
-  useEffect: <Deps extends any[]>(effect: () => (() => void) | void, deps?: Deps) => void;
   handlerDecorator?: HandlerDecorator;
   IntersectionObserverTag: IntersectionObserverComponent;
 }

package/mobile/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useLink } from '../../hooks/useLink';
 import type { UniBlockProps } from '../../types';
 import { Button } from '../../ui-kit/Button/Button';
@@ -30,7 +31,7 @@ export const ExchangeCurrencyCalculator = JSX<ExchangeCurrencyCalculatorProps>(
     const { useRouter, handlerDecorator } = context;
     const router = useRouter();
 
-    const [calcState, setCalcState] = context.useState<CalcState>({
+    const [calcState, setCalcState] = useState<CalcState>({
       inputSell: '',
       inputBuy: '',
       selectSell: currencyRatesBuy?.[0]?.code || Currency.RUB,

package/mobile/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -19,7 +19,7 @@ export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlock
 
 export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
   ({ className = '', context, title = 'Курсы обмена валют', button, ...rest }) => {
-    const currencyRates = useExchangeRates(context.useAsyncData);
+    const currencyRates = useExchangeRates();
 
     const currencyRatesBuy = currencyRates.filter((_) => _.buy);
     currencyRatesBuy.unshift({ code: Currency.RUB });

package/mobile/src/components/Footer/Footer.tsx

@@ -26,7 +26,7 @@ export const Footer = JSX<FooterProps>(
     context,
     horizontalNavigationTitle,
   }) => {
-    const sitemap = useSitemap(context.useAsyncData);
+    const sitemap = useSitemap();
     const dispositions = sitemap?.dispositions;
 
     return (

package/mobile/src/components/Footer/Sitemap.tsx

@@ -11,7 +11,7 @@ export interface SitemapProps extends UniBlockProps {
 }
 
 export const Sitemap = JSX<SitemapProps>(({ className = '', items, context }) => {
-  const sitemap = useSitemap(context.useAsyncData);
+  const sitemap = useSitemap();
   const mergedItems = mergeTopItems(sitemap.topItems, items);
   const linkParams = {
     router: context.useRouter(),
@@ -19,7 +19,7 @@ export const Sitemap = JSX<SitemapProps>(({ className = '', items, context }) =>
   };
 
   return (
-    <div className={`flex items-start justify-between gap-[54px] xl:gap-5 ${className}`}>
+    <div className={`flex flex-grow items-start justify-between gap-[54px] xl:gap-5 ${className}`}>
       {mergedItems?.map((_, i) => renderColumn(_, i, linkParams))}
     </div>
   );