@redneckz/wildless-cms-uni-blocks 0.14.854 → 0.14.856

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

@@ -3,15 +3,14 @@ import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { UniBlock } from '../../UniBlock/UniBlock.js';
 import { Text } from '../Text/Text.js';
 import { InnerTableBody } from './InnerTableBody.js';
-import { TableInnerButton } from './InnerTableButton.js';
 import { InnerTableHeader } from './InnerTableHeader.js';
 const EMPTY_DATA = 'Данных нет';
-export const InnerTable = UniBlock(({ tableSource, pdfUrl, onClick }) => {
+export const InnerTable = UniBlock(({ tableSource }) => {
     const tableData = tableSource?.tableData;
     const [activeTabIndex, setActiveTabIndex] = useState(0);
     const handleActiveTabIndex = useCallback((_) => setActiveTabIndex(_), []);
     const items = tableData?.[activeTabIndex]?.items ?? [];
     const currencies = tableData?.map((item) => item.currency ?? '');
-    return tableData ? (_jsxs("div", { className: "bg-white z-10", children: [_jsx(InnerTableHeader, { currencies: currencies, activeTabIndex: activeTabIndex, setActiveTabIndex: handleActiveTabIndex, linkToPDF: pdfUrl }), _jsx(InnerTableBody, { activeTabIndex: activeTabIndex, items: items }), _jsx(TableInnerButton, { className: "mt-xl", onClick: onClick, isOpen: true })] })) : (_jsxs("div", { className: "my-lg space-y-m text-center", children: [_jsx(Text, { size: "text-h6", children: EMPTY_DATA }), _jsx(TableInnerButton, { onClick: onClick, isOpen: true })] }));
+    return tableData ? (_jsxs("div", { className: "bg-white z-10", children: [_jsx(InnerTableHeader, { currencies: currencies, activeTabIndex: activeTabIndex, setActiveTabIndex: handleActiveTabIndex }), _jsx(InnerTableBody, { activeTabIndex: activeTabIndex, items: items })] })) : (_jsx("div", { className: "space-y-m text-center", children: _jsx(Text, { size: "text-h6", children: EMPTY_DATA }) }));
 });
 //# sourceMappingURL=InnerTable.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"InnerTable.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAOtD,MAAM,UAAU,GAAG,YAAY,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAkB,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;IACvF,MAAM,SAAS,GAAG,WAAW,EAAE,SAAS,CAAC;IACzC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,oBAAoB,GAAG,WAAW,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClF,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAEjE,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,eAAK,SAAS,EAAC,eAAe,aAC5B,KAAC,gBAAgB,IACf,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,oBAAoB,EACvC,SAAS,EAAE,MAAM,GACjB,EACF,KAAC,cAAc,IAAC,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,GAAI,EAChE,KAAC,gBAAgB,IAAC,SAAS,EAAC,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAG,IAC3D,CACP,CAAC,CAAC,CAAC,CACF,eAAK,SAAS,EAAC,6BAA6B,aAC1C,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,YAAE,UAAU,GAAQ,EACxC,KAAC,gBAAgB,IAAC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAG,IACzC,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"InnerTable.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGpE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAOtD,MAAM,UAAU,GAAG,YAAY,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAkB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,WAAW,EAAE,SAAS,CAAC;IACzC,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,oBAAoB,GAAG,WAAW,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClF,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,cAAc,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAEjE,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,eAAK,SAAS,EAAC,eAAe,aAC5B,KAAC,gBAAgB,IACf,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,oBAAoB,GACvC,EACF,KAAC,cAAc,IAAC,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,GAAI,IAC5D,CACP,CAAC,CAAC,CAAC,CACF,cAAK,SAAS,EAAC,uBAAuB,YACpC,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,YAAE,UAAU,GAAQ,GACpC,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/lib/ui-kit/InnerTable/InnerTableBody.js

@@ -2,10 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { Text } from '../../ui-kit/Text/Text.js';
 import { InnerTableBodyItem } from './InnerTableBodyItem.js';
-export const InnerTableBody = JSX(({ activeTabIndex, items }) => {
-    return (_jsx("div", { children: items.map((_, tableIdx) => {
-            const key = `activeTabIdx:${activeTabIndex}-tableIdx:${tableIdx}`;
-            return (_jsxs("div", { className: "w-full @container", children: [_jsx("div", { className: "flex py-m sm:px-m bg-white @4xl:bg-gray relative", children: _jsx(Text, { size: "text-xl", align: "text-left", children: _.title }) }), _jsx("div", { className: "w-full sm:pl-xs overflow-hidden transition-height duration-500 ease-in-out", children: _jsx("div", { className: "relative", children: _jsx(InnerTableBodyItem, { rows: _.rowsData }) }) })] }, key));
-        }) }));
-});
+export const InnerTableBody = JSX(({ activeTabIndex, items }) => (_jsx("div", { children: items.map((_, tableIdx) => {
+        const key = `activeTabIdx:${activeTabIndex}-tableIdx:${tableIdx}`;
+        return (_jsxs("div", { className: "w-full @container", children: [_jsx("div", { className: "flex py-m px-m bg-white @4xl:bg-gray relative", children: _jsx(Text, { size: "text-xl", align: "text-left", children: _.title }) }), _jsx("div", { className: "w-full sm:pl-xs overflow-hidden transition-height duration-500 ease-in-out", children: _jsx("div", { className: "relative", children: _jsx(InnerTableBodyItem, { rows: _.rowsData }) }) })] }, key));
+    }) })));
 //# sourceMappingURL=InnerTableBody.js.map

package/mobile/lib/ui-kit/InnerTable/InnerTableBody.js.map

@@ -1 +1 @@
-{"version":3,"file":"InnerTableBody.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTableBody.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAsB,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE;IACnF,OAAO,CACL,wBACG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;YACzB,MAAM,GAAG,GAAG,gBAAgB,cAAc,aAAa,QAAQ,EAAE,CAAC;YAElE,OAAO,CACL,eAAe,SAAS,EAAC,mBAAmB,aAC1C,cAAK,SAAS,EAAC,kDAAkD,YAC/D,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,EAAC,KAAK,EAAC,WAAW,YACnC,CAAC,CAAC,KAAK,GACH,GACH,EACN,cAAK,SAAS,EAAC,4EAA4E,YACzF,cAAK,SAAS,EAAC,UAAU,YACvB,KAAC,kBAAkB,IAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,GAAI,GACpC,GACF,KAVE,GAAG,CAWP,CACP,CAAC;QACJ,CAAC,CAAC,GACE,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"InnerTableBody.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTableBody.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAQ1D,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAsB,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CACpF,wBACG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;QACzB,MAAM,GAAG,GAAG,gBAAgB,cAAc,aAAa,QAAQ,EAAE,CAAC;QAElE,OAAO,CACL,eAAe,SAAS,EAAC,mBAAmB,aAC1C,cAAK,SAAS,EAAC,+CAA+C,YAC5D,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,EAAC,KAAK,EAAC,WAAW,YACnC,CAAC,CAAC,KAAK,GACH,GACH,EACN,cAAK,SAAS,EAAC,4EAA4E,YACzF,cAAK,SAAS,EAAC,UAAU,YACvB,KAAC,kBAAkB,IAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,GAAI,GACpC,GACF,KAVE,GAAG,CAWP,CACP,CAAC;IACJ,CAAC,CAAC,GACE,CACP,CAAC,CAAC"}

package/mobile/lib/ui-kit/InnerTable/InnerTableButton.d.ts

@@ -1,8 +1,7 @@
-import { type TariffsTableCellIndexProps } from '../../components/TariffsTable/TariffsTableContent';
 import { type ComponentType } from '../../model/ComponentType';
-import type { OnClickProps } from '../../model/OnClickProps';
+import { type OnClickProps } from '../../model/onClick';
 import { type TariffsTableInnerContent } from './InnerTableProps';
-export interface InnerTableButtonProps extends Partial<TariffsTableCellIndexProps>, TariffsTableInnerContent, ComponentType, OnClickProps {
+export interface InnerTableButtonProps extends TariffsTableInnerContent, ComponentType, OnClickProps {
     isOpen?: boolean;
 }
 export declare const TableInnerButton: import("@redneckz/uni-jsx").UNIComponent<InnerTableButtonProps, any, any>;

package/mobile/lib/ui-kit/InnerTable/InnerTableButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"InnerTableButton.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTableButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAIxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAWlE,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CACjC,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CACvC,KAAC,iBAAiB,IAChB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,EACrC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAC,WAAW,EACnB,KAAK,QACL,OAAO,EAAE,OAAO,GAChB,CACH,CACF,CAAC"}
+{"version":3,"file":"InnerTableButton.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/InnerTableButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAUlE,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CACjC,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CACvC,KAAC,iBAAiB,IAChB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,EACrC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAC,WAAW,EACnB,KAAK,QACL,OAAO,EAAE,OAAO,GAChB,CACH,CACF,CAAC"}

package/mobile/lib/ui-kit/InnerTable/InnerTableProps.d.ts

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

package/mobile/lib/ui-kit/InnerTable/renderInnerTableRow.js

@@ -8,7 +8,7 @@ export const renderInnerTableRow = (activeColumnIndex) => (rowData, rowIdx) => {
     }
     const [headerColumn, ...columns] = rowData;
     const columnsStyle = style('flex duration-1000 text-center', rowIdx !== 0 ? 'font-normal' : 'font-light');
-    return (_jsxs("div", { className: "flex border-main-divider border-b border-solid h-full", children: [headerColumn?.data ? (_jsx("div", { className: "whitespace-pre-wrap sm:whitespace-normal w-48 sm:w-56 sm:min-w-56 py-lg pr-lg sm:pr-0", children: _jsx(Text, { size: "text-xl", font: "font-light", children: headerColumn.data }) })) : null, _jsx("div", { className: "flex flex-grow overflow-hidden", children: _jsx("div", { className: columnsStyle, style: {
+    return (_jsxs("div", { className: "flex border-main-divider border-b border-solid h-full", children: [headerColumn?.data ? (_jsx("div", { className: "whitespace-pre-wrap sm:whitespace-normal w-48 min-w-48 sm:w-56 sm:min-w-56 py-lg pr-lg sm:pr-0", children: _jsx(Text, { size: "text-xl", font: "font-light", children: headerColumn.data }) })) : null, _jsx("div", { className: "flex flex-grow overflow-hidden", children: _jsx("div", { className: columnsStyle, style: {
                         transform: `translateX(-${getHorizontalShift(columns, activeColumnIndex)}px)`,
                     }, children: columns?.map((_, i) => (_jsxs("div", { className: "flex flex-col flex-grow gap-s justify-center py-xl odd:bg-main-divider", children: [_?.data ? _jsx(Text, { size: "text-xl", children: _.data }) : null, _?.cols ? renderCols(_.cols, activeColumnIndex) : null] }, `row${i}`))) }) })] }, String(rowIdx)));
 };

package/mobile/lib/ui-kit/InnerTable/renderInnerTableRow.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderInnerTableRow.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/renderInnerTableRow.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,MAAM,CAAC,MAAM,mBAAmB,GAC9B,CAAC,iBAAyB,EAAE,EAAE,CAAC,CAAC,OAAmB,EAAE,MAAc,EAAE,EAAE;IACrE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;QACpB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,CAAC,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC;IAC3C,MAAM,YAAY,GAAG,KAAK,CACxB,gCAAgC,EAChC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAC5C,CAAC;IAEF,OAAO,CACL,eAA0B,SAAS,EAAC,uDAAuD,aACxF,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CACpB,cAAK,SAAS,EAAC,uFAAuF,YACpG,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,EAAC,IAAI,EAAC,YAAY,YACnC,YAAY,CAAC,IAAI,GACb,GACH,CACP,CAAC,CAAC,CAAC,IAAI,EACR,cAAK,SAAS,EAAC,gCAAgC,YAC7C,cACE,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE;wBACL,SAAS,EAAE,eAAe,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,KAAK;qBAC9E,YAEA,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,eAEE,SAAS,EAAC,wEAAwE,aAEjF,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,YAAE,CAAC,CAAC,IAAI,GAAQ,CAAC,CAAC,CAAC,IAAI,EACrD,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,KAJlD,MAAM,CAAC,EAAE,CAKV,CACP,CAAC,GACE,GACF,KAzBE,MAAM,CAAC,MAAM,CAAC,CA0BlB,CACP,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,UAAU,GAAG,CAAC,IAAc,EAAE,QAAgB,EAAE,EAAE,CACtD,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjB,cAAK,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,qBAAqB,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC,YACrE,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,cAAqB,SAAS,EAAC,YAAY,YACzC,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,EAAC,IAAI,EAAC,YAAY,YACnC,IAAI,GACA,IAHC,MAAM,CAAC,CAAC,CAAC,CAIb,CACP,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,CAAC"}
+{"version":3,"file":"renderInnerTableRow.js","sourceRoot":"","sources":["../../../src/ui-kit/InnerTable/renderInnerTableRow.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,MAAM,CAAC,MAAM,mBAAmB,GAC9B,CAAC,iBAAyB,EAAE,EAAE,CAAC,CAAC,OAAmB,EAAE,MAAc,EAAE,EAAE;IACrE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE;QACpB,OAAO,IAAI,CAAC;KACb;IACD,MAAM,CAAC,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC;IAC3C,MAAM,YAAY,GAAG,KAAK,CACxB,gCAAgC,EAChC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAC5C,CAAC;IAEF,OAAO,CACL,eAA0B,SAAS,EAAC,uDAAuD,aACxF,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CACpB,cAAK,SAAS,EAAC,gGAAgG,YAC7G,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,EAAC,IAAI,EAAC,YAAY,YACnC,YAAY,CAAC,IAAI,GACb,GACH,CACP,CAAC,CAAC,CAAC,IAAI,EACR,cAAK,SAAS,EAAC,gCAAgC,YAC7C,cACE,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE;wBACL,SAAS,EAAE,eAAe,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,KAAK;qBAC9E,YAEA,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,eAEE,SAAS,EAAC,wEAAwE,aAEjF,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,YAAE,CAAC,CAAC,IAAI,GAAQ,CAAC,CAAC,CAAC,IAAI,EACrD,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,KAJlD,MAAM,CAAC,EAAE,CAKV,CACP,CAAC,GACE,GACF,KAzBE,MAAM,CAAC,MAAM,CAAC,CA0BlB,CACP,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,UAAU,GAAG,CAAC,IAAc,EAAE,QAAgB,EAAE,EAAE,CACtD,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACjB,cAAK,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,qBAAqB,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC,YACrE,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACrB,cAAqB,SAAS,EAAC,YAAY,YACzC,KAAC,IAAI,IAAC,IAAI,EAAC,SAAS,EAAC,IAAI,EAAC,YAAY,YACnC,IAAI,GACA,IAHC,MAAM,CAAC,CAAC,CAAC,CAIb,CACP,CAAC,GACE,CACP,CAAC,CAAC,CAAC,IAAI,CAAC"}

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

@@ -1,4 +1,4 @@
-import type { OnCloseProps } from '../../model/OnCloseProps';
+import { type OnCloseProps } from '../../model/onClose';
 export interface ResponseNotificationProps extends OnCloseProps {
     ok?: boolean;
     typeForm?: string;

package/mobile/src/components/Header/HeaderSecondaryMenu.tsx

@@ -8,7 +8,6 @@ import { useLocation } from '../../hooks/useLocation';
 import { type BlockVersion } from '../../model/BlockVersion';
 import { type ComponentType } from '../../model/ComponentType';
 import { type IconVersion } from '../../model/IconVersion';
-import { ClientOnly } from '../../ui-kit/ClientOnly';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
 import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
@@ -39,16 +38,14 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
         role="navigation"
       >
         {currentLocation?.name && rest?.branches?.visible ? (
-          <ClientOnly>
-            <TopItem
-              className="whitespace-nowrap text-ellipsis overflow-hidden"
-              flat={true}
-              href="#"
-              text={currentLocation?.name}
-              data={getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? '')}
-              onClick={openLocationDialog}
-            />
-          </ClientOnly>
+          <TopItem
+            className="whitespace-nowrap text-ellipsis overflow-hidden"
+            flat={true}
+            href="#"
+            text={currentLocation?.name}
+            data={getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? '')}
+            onClick={openLocationDialog}
+          />
         ) : null}
         {rest?.officesAtms?.href ? (
           <TopItem className="whitespace-nowrap" flat={true} {...rest.officesAtms} />

package/mobile/src/components/TariffsTable/TableCarouselContainer.tsx

@@ -2,8 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { type TableVersion } from '../../model/TableVersion';
 
 export interface TableCarouselContainerProps {
-  activeIndex: number;
-  columnWidth: number;
   version?: TableVersion;
 }
 
@@ -13,14 +11,9 @@ const carouselContainerClassesMap: Record<TableVersion, string> = {
 };
 
 export const TableCarouselContainer = JSX<TableCarouselContainerProps>(
-  ({ children, activeIndex, columnWidth, version = 'comparison' }) => (
-    <div className="flex flex-1 overflow-hidden">
-      <div
-        className={carouselContainerClassesMap[version]}
-        style={{ transform: `translateX(-${activeIndex * columnWidth}px)` }}
-      >
-        {children}
-      </div>
+  ({ children, version = 'comparison' }) => (
+    <div className="flex flex-1">
+      <div className={carouselContainerClassesMap[version]}>{children}</div>
     </div>
   ),
 );

package/mobile/src/components/TariffsTable/TariffsTable.example.json

@@ -29,67 +29,34 @@
         "data": [
           [
             {
-              "tableCellType": "LabelDescription",
               "label": "Ячейка 1-1",
               "description": "Описание для ячейки 2-1"
             },
             {
-              "tableCellType": "RichText",
               "isDotted": true,
-              "listItemSize": "M",
               "__html": "<ul><li>Элемент списка 1</li><li>Элемент списка 2</li><li>Элемент списка 3</li></ul>"
             },
             {
               "label": "Ячейка 1-2",
-              "tableCellType": "LabelDescription",
               "description": "Описание"
             },
             {
-              "tableCellType": "RichText",
               "isDotted": false,
-              "listItemSize": "M",
               "__html": "<ul><li>Элемент списка 1</li><li>Элемент списка 2</li><li>Элемент списка 3</li></ul>"
             }
           ],
           [
             {
-              "tableCellType": "LabelDescription",
               "label": "Ячейка 2-1"
             },
             {
-              "tableCellType": "RichText",
               "isDotted": true,
-              "listItemSize": "M",
               "__html": "<ul><li>Элемент списка 1</li><li>Элемент списка 2</li><li>Элемент списка 3</li></ul>"
             }
           ],
           [
             {
-              "label": "Ячейка 3-1",
-              "tableCellType": "LabelDescription"
-            },
-            {
-              "tableCellType": "Button",
-              "buttons": [
-                {
-                  "icon": {
-                    "icon": "AppleIcon"
-                  },
-                  "rounded": true,
-                  "version": "secondary",
-                  "href": "/",
-                  "target": "_blank"
-                },
-                {
-                  "icon": {
-                    "icon": "PlayMarketIcon"
-                  },
-                  "rounded": true,
-                  "version": "secondary",
-                  "href": "/",
-                  "target": "_blank"
-                }
-              ]
+              "label": "Ячейка 3-1"
             }
           ]
         ]

package/mobile/src/components/TariffsTable/TariffsTable.tsx

@@ -1,21 +1,19 @@
-import { JSX } from '@redneckz/uni-jsx';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { useCarouselControls } from '../../hooks/useCarouselControls';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { DefaultFoldButton } from '../../ui-kit/Foldable/DefaultFoldButton';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
+import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
-import { COLS_LENGTH_FOR_SCROLL } from './constants';
 import { type TariffsTableContent } from './TariffsTableContent';
 import { TariffsTableRow } from './TariffsTableRow';
 import { TariffsTableWrapper } from './TariffsTableWrapper';
 
 export interface TariffsTableProps extends TariffsTableContent, UniBlockProps {}
 
-export const TariffsTable = JSX<TariffsTableProps>(
+export const TariffsTable = UniBlock<TariffsTableProps>(
   ({
     className = '',
     title,
@@ -30,13 +28,8 @@ export const TariffsTable = JSX<TariffsTableProps>(
       header,
       data: colData.map((col) => col?.[i] || []),
     }));
-    const itemCount = colData.length;
-    const [activeIndex, controls] = useCarouselControls({
-      itemCount: itemCount,
-      visibleItemCount: COLS_LENGTH_FOR_SCROLL,
-    });
     const rows = (rowData || []).map((row, i) => (
-      <TariffsTableRow key={String(i)} row={row} activeIndex={activeIndex} rowIdx={i} {...rest} />
+      <TariffsTableRow key={String(i)} row={row} {...rest} />
     ));
     const [visibleRows, hiddenRows] =
       hiddenRowsNum > 0 ? [rows.slice(0, -hiddenRowsNum), rows.slice(-hiddenRowsNum)] : [rows, []];
@@ -45,7 +38,7 @@ export const TariffsTable = JSX<TariffsTableProps>(
 
     return (
       <BlockWrapper
-        className={style('relative space-y-6xl @4xl:space-y-xl', className)}
+        className={style('relative space-y-xl', className)}
         defaultPadding="p-6xl"
         {...rest}
       >
@@ -59,14 +52,14 @@ export const TariffsTable = JSX<TariffsTableProps>(
         <div className="space-y-m overflow-hidden">
           {hiddenRowsNum > 0 ? (
             <Foldable>
-              <TariffsTableWrapper controls={controls}>
+              <TariffsTableWrapper>
                 {visibleRows}
                 <FoldableSection isUnfolded={isUnfolded}>{hiddenRows}</FoldableSection>
               </TariffsTableWrapper>
               <DefaultFoldButton className="text-h4" isUnfolded={isUnfolded} onClick={toggle} />
             </Foldable>
           ) : (
-            <TariffsTableWrapper controls={controls}>{rows}</TariffsTableWrapper>
+            <TariffsTableWrapper>{rows}</TariffsTableWrapper>
           )}
         </div>
       </BlockWrapper>

package/mobile/src/components/TariffsTable/TariffsTable.ui.json

@@ -5,9 +5,6 @@
         "data": {
           "items": {
             "items": {
-              "tableCellType": {
-                "ui:widget": "hidden"
-              },
               "image": {
                 "ui:field": "picture"
               },

package/mobile/src/components/TariffsTable/TariffsTableCell.tsx

@@ -1,48 +1,50 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
+import type { JSONRefObject } from '../../data/JSONRefObject';
+import { type OnCloseProps } from '../../model/onClose';
+import { TableInnerButton } from '../../ui-kit/InnerTable/InnerTableButton';
+import {
+  type TableFetchData,
+  type TariffsTableInnerContent,
+} from '../../ui-kit/InnerTable/InnerTableProps';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
+import { renderCell } from './renderCell';
 import { type CellDef } from './TariffsTableContent';
-import { RenderCellInner } from './TariffsTableRenderCell';
 
 export interface TariffTableContentProps {
-  openTableInnerIdx?: number;
-  setOpenTableInnerIdx: (props?: number) => void;
-  setTableInner: (props?: TariffsTableInnerContent) => void;
+  onSetTable: (props?: TariffsTableInnerContent) => void;
   tableInner?: TariffsTableInnerContent;
 }
 
-export interface TariffsTableCellProps extends TariffTableContentProps, UniBlockProps {
-  rowIdx: number;
-  cellIdx: number;
-  cells: CellDef[];
+type CellDefProps = CellDef & { tableSource?: JSONRefObject & TableFetchData };
+
+export interface TariffsTableCellProps
+  extends TariffTableContentProps,
+    UniBlockProps,
+    OnCloseProps {
+  cells: CellDefProps[];
 }
 
-export const TariffsTableCell = JSX<TariffsTableCellProps>(
-  ({
-    cells,
-    rowIdx,
-    cellIdx,
-    setTableInner,
-    tableInner,
-    openTableInnerIdx,
-    setOpenTableInnerIdx,
-  }) => (
-    <div className="w-80 flex-grow flex flex-col gap-m @4xl:gap-lg" role="cell">
+export const TariffsTableCell = JSX<TariffsTableCellProps>(({ cells, tableInner, onSetTable }) => {
+  return (
+    <div className="w-80 flex-grow flex flex-col gap-lg" role="cell">
       {cells?.length
-        ? cells.map((_, i) => (
-            <RenderCellInner
-              key={String(i)}
-              cell={_}
-              fieldIdx={i}
-              rowIdx={rowIdx}
-              cellIdx={cellIdx}
-              setTableInner={setTableInner}
-              tableInner={tableInner}
-              openTableInnerIdx={openTableInnerIdx}
-              setOpenTableInnerIdx={setOpenTableInnerIdx}
-            />
-          ))
+        ? cells.map((_, i) => {
+            if (_?.tableSource?.tableData) {
+              return (
+                <TableInnerButton
+                  key={String(i)}
+                  className="w-fit"
+                  isOpen={Boolean(tableInner)}
+                  onClick={() => {
+                    onSetTable(tableInner ? undefined : { tableSource: _.tableSource });
+                  }}
+                />
+              );
+            }
+
+            return renderCell(_, i);
+          })
         : null}
     </div>
-  ),
-);
+  );
+});

package/mobile/src/components/TariffsTable/TariffsTableContent.ts

@@ -4,31 +4,7 @@ import { type ImageContent } from '../../ui-kit/Img/ImgProps';
 import { type TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 import { type ButtonsSectionContent } from '../../ui-kit/LinkButton/ButtonsSectionContent';
 import { type RichTextProps } from '../../ui-kit/RichText/RichTextProps';
-import { type UniBlockContent, type UniBlockProps } from '../../UniBlock/UniBlockProps';
-
-/**
- * @hidden
- */
-export interface TariffsTableTile {
-  header: TariffsTableRowHeader;
-  data: CellDef[];
-}
-
-/**
- * @hidden
- */
-export interface TariffsTableProps extends UniBlockProps {
-  tiles?: TariffsTableTile[];
-}
-
-/**
- * @hidden
- */
-export interface TariffsTableCellIndexProps {
-  rowIdx: number;
-  cellIdx: number;
-  fieldIdx: number;
-}
+import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 /**
  * @hidden
@@ -43,68 +19,15 @@ export type Data = {
  */
 export type TariffsTableRowHeader = TitleProps & IconProps;
 
-/**
- * @title Изображение
- */
-export type ImageCellDef = ImageContent & {
-  /** @default Img */
-  tableCellType: 'Img';
-};
-
-/**
- * @title Кнопки
- */
-export type ButtonsCellDef = ButtonsSectionContent & {
-  /** @default Buttons */
-  tableCellType: 'Buttons';
-};
-
-/**
- * @title Заголовок и описание
- */
-export type LabelDescriptionCell = LabelProps & DescriptionProps;
-
-/**
- * @title Заголовок и описание
- */
-export type LabelDescriptionCellDef = LabelDescriptionCell & {
-  /** @default LabelDescription */
-  tableCellType: 'LabelDescription';
-};
-
-/**
- * @title Список
- */
-export type RichTextDef = RichTextProps & {
-  /** @default RichText */
-  tableCellType: 'RichText';
-};
-
-/**
- * @title Таблица
- */
-export type InnerTableBlockDef = TariffsTableInnerContent & {
-  /** @default Table */
-  tableCellType: 'Table';
-};
-
-/** @title Не выбрано * */
-export type EmptyCellType = {
-  /** @default "" */
-  tableCellType: '';
-};
-
 /**
  * @title Содержимое ячейки
- * @default { "tableCellType": "" }
  */
-export type CellDef =
-  | EmptyCellType
-  | ImageCellDef
-  | ButtonsCellDef
-  | LabelDescriptionCellDef
-  | RichTextDef
-  | InnerTableBlockDef;
+export type CellDef = LabelProps &
+  DescriptionProps &
+  RichTextProps &
+  ImageContent &
+  TariffsTableInnerContent &
+  ButtonsSectionContent;
 
 /**
  * @title Ячейки

package/mobile/src/components/TariffsTable/TariffsTableRow.tsx

@@ -1,11 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { Img } from '../../ui-kit/Img/Img';
 import { type TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
-import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
-import { style } from '../../utils/style';
-import { COLUMN_WIDTH, firstCellStyle } from './constants';
+import { renderHeader } from './renderHeader';
 import { TableCarouselContainer } from './TableCarouselContainer';
 import { TariffsTableCell } from './TariffsTableCell';
 import { type Data } from './TariffsTableContent';
@@ -13,63 +10,26 @@ import { TariffsTableRowContainer } from './TariffsTableRowContainer';
 
 export interface TariffsTableRowProps extends UniBlockProps {
   row: Data;
-  activeIndex: number;
-  rowIdx: number;
 }
 
 export const TariffsTableRow = JSX<TariffsTableRowProps>(
-  ({ row: { header, data }, activeIndex, rowIdx, ...rest }) => {
+  ({ row: { header, data = [] }, ...rest }) => {
     const [tableInner, setTableInner] = useState<TariffsTableInnerContent | undefined>(undefined);
-    const handleSetTableInner = useCallback(
-      (_: TariffsTableInnerContent | undefined) => setTableInner(_),
-      [],
-    );
-    const [openTableInnerIdx, setOpenTableInnerIdx] = useState<number | undefined>(undefined);
-    const handleOpenTableInnerIdx = useCallback(
-      (_: number | undefined) => setOpenTableInnerIdx(_),
-      [],
-    );
-    const onHideContentClick = () => setTableInner(undefined);
+    const handleSetTableInner = useCallback((_?: TariffsTableInnerContent) => {
+      setTableInner(_);
+    }, []);
 
     return (
-      <TariffsTableRowContainer
-        onHideContentClick={onHideContentClick}
-        tableInner={tableInner}
-        {...rest}
-      >
-        <div className={style('text-s', firstCellStyle)}>
-          <div className="flex gap-m items-center" role="cell">
-            {header?.icon ? (
-              <Img
-                className="hidden @4xl:block max-w-6 shrink-0"
-                image={header.icon}
-                width="24"
-                height="24"
-              />
-            ) : null}
-            {header?.title ? (
-              <Text size="text-m" font="font-light" color="text-primary-text">
-                {header?.title}
-              </Text>
-            ) : null}
-          </div>
-        </div>
+      <TariffsTableRowContainer tableInner={tableInner} {...rest}>
+        {renderHeader(header)}
         {data?.length ? (
-          <TableCarouselContainer
-            activeIndex={activeIndex}
-            columnWidth={COLUMN_WIDTH}
-            version="tariff"
-          >
+          <TableCarouselContainer version="tariff">
             {data.map((cells, i) => (
               <TariffsTableCell
                 key={String(i)}
                 cells={cells}
-                rowIdx={rowIdx}
-                cellIdx={i}
-                setTableInner={handleSetTableInner}
+                onSetTable={handleSetTableInner}
                 tableInner={tableInner}
-                openTableInnerIdx={openTableInnerIdx}
-                setOpenTableInnerIdx={handleOpenTableInnerIdx}
                 {...rest}
               />
             ))}

package/mobile/src/components/TariffsTable/TariffsTableRowContainer.tsx

@@ -3,27 +3,21 @@ import { InnerTable } from '../../ui-kit/InnerTable/InnerTable';
 import { type TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
-import { dividerStyle } from './constants';
 
 export interface TariffsTableRowContainerProps extends UniBlockProps {
   tableInner?: TariffsTableInnerContent;
-  onHideContentClick?: () => void;
+  onClick?: (_?: TariffsTableInnerContent) => void;
 }
 
+export const DIVIDER_STYLE = 'border-main-divider lg:border-b w-full py-s lg:py-xl';
+
 export const TariffsTableRowContainer = JSX<TariffsTableRowContainerProps>(
-  ({ children, tableInner, onHideContentClick }) => (
-    <div className="self-start flex flex-col" role="row">
-      <div
-        className={style(
-          dividerStyle,
-          'flex flex-col @4xl:flex-row gap-y-xs gap-x-5xl pb-lg @4xl:pt-lg',
-        )}
-      >
-        {children}
-      </div>
+  ({ children, tableInner, onClick }) => (
+    <div className={style('self-start flex flex-col gap-xl', DIVIDER_STYLE)} role="row">
+      <div className={style('flex flex-col lg:flex-row gap-x-5xl gap-y-xs')}>{children}</div>
       {tableInner ? (
         <div className="origin-top animate-expansion">
-          <InnerTable {...tableInner} onClick={onHideContentClick} />
+          <InnerTable {...tableInner} onClick={onClick} />
         </div>
       ) : null}
     </div>