@redneckz/wildless-cms-uni-blocks 0.5.14 → 0.5.15

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

@@ -1,4 +1,4 @@
-import type { UniBlockProps } from '../model/ContentPageDef';
+import type { UniBlockProps } from '../model/JSXBlock';
 interface BlockWrapperProps extends UniBlockProps, Record<string, any> {
     anchor?: string;
     tag?: keyof HTMLElementTagNameMap;

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

@@ -14,11 +14,13 @@ export const BlockWrapper = JSX(({ anchor, className, children, tag = 'section',
     const observerCallback = useMemo(() => changeHashOnObserve({ anchor, anchorClickRef }), [anchor]);
     useEffect(() => {
         const anchorClickCleanup = EventBus.inst.subscribe('anchorClick', (e) => {
+            setShouldRenderBlock(true);
             anchorClickRef.current = e;
         });
         const tabCleanup = EventBus.inst.subscribe('tab', (event) => {
             if (event.type === 'group') {
-                setShouldRenderBlock(!labels?.length || !event.label || labels.includes(event.label));
+                const blockHasSettgins = labels?.length || anchor;
+                setShouldRenderBlock(event.label ? !blockHasSettgins || Boolean(labels?.includes(event.label)) : true);
             }
             else {
                 changeHash(event.label);

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

@@ -1 +1 @@
-{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BlockWrapper.js","sourceRoot":"","sources":["../../src/ui-kit/BlockWrapper.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/ui-kit/Button/ButtonSection.d.ts

@@ -1,4 +1,4 @@
-import { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { ButtonContent } from './ButtonProps';
 export interface ButtonSectionProps extends ButtonContent, UniBlockProps {
 }

package/mobile/lib/ui-kit/Img/getIconVersion.d.ts

@@ -1 +1,2 @@
-export declare function getIconVersion(image: any): any;
+import type { Image } from './ImgProps';
+export declare function getIconVersion(image?: Image): import("../../model/IconVersion").IconVersion;

package/mobile/lib/ui-kit/Img/getIconVersion.js

@@ -1,4 +1,4 @@
 export function getIconVersion(image) {
-    return typeof image === 'string' ? 'normal' : image.iconVersion || 'normal';
+    return typeof image === 'string' ? 'normal' : image?.iconVersion || 'normal';
 }
 //# sourceMappingURL=getIconVersion.js.map

package/mobile/lib/ui-kit/Img/getIconVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"getIconVersion.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/getIconVersion.tsx"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAAC,KAAK;IAClC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,IAAI,QAAQ,CAAC;AAC9E,CAAC"}
+{"version":3,"file":"getIconVersion.js","sourceRoot":"","sources":["../../../src/ui-kit/Img/getIconVersion.tsx"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,IAAI,QAAQ,CAAC;AAC/E,CAAC"}

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

@@ -1,4 +1,4 @@
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { TariffsTableInnerContent } from './InnerTableProps';
 export interface InnerTableProps extends TariffsTableInnerContent, UniBlockProps {
 }

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

@@ -1,4 +1,4 @@
-import { type UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { DataItem } from './InnerTableProps';
 export interface InnerTableBodyProps extends UniBlockProps {
     activeTabIndex: number;

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

@@ -1,4 +1,4 @@
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { RowsData } from './InnerTableProps';
 export interface InnerTableBodyItemProps extends UniBlockProps {
     rows?: RowsData[][];

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

@@ -1,4 +1,4 @@
-import { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { TariffsTableInnerEvent } from './InnerTableProps';
 export interface TableInnerButtonProps extends TariffsTableInnerEvent, UniBlockProps {
     isOpen?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"InputRange.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/InputRange.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,MAAM,sBAAsB,GAAG,sDAAsD,CAAC;AAEtF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,GAAG,GAAG,CAAC,EACP,GAAG,GAAG,GAAG,EACT,IAAI,GAAG,CAAC,EACR,KAAK,GAAG,GAAG,EACX,QAAQ,GAAG,KAAK,EAChB,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,EAAE;QACzB,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KAC5E,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,iBAAO,SAAS,EAAC,gBAAgB,aAC9B,KAAK,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,cAAc,YAAE,KAAK,GAAQ,CAAC,CAAC,CAAC,IAAI,EAC7D,gBACE,SAAS,EAAE;uHACgG,sBAAsB,EAAE,EACnI,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,YAAY,GACpB,EACF,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,6CAA6C,EACvD,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,UAAU,GACjB,GACE,IACA,EACP,kBAAkB,CAAC,KAAK,CAAC,IACtB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,kBAAkB,CAAC,KAAK;IAC/B,OAAO,CACL,cAAK,SAAS,EAAC,2BAA2B,YACvC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,eAAsB,SAAS,EAAC,kCAAkC,YAC/D,IAAI,IADI,MAAM,CAAC,CAAC,CAAC,CAEb,CACR,CAAC,GACE,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"InputRange.js","sourceRoot":"","sources":["../../../src/ui-kit/InputRange/InputRange.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,MAAM,sBAAsB,GAAG,sDAAsD,CAAC;AAEtF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAC3B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,GAAG,GAAG,CAAC,EACP,GAAG,GAAG,GAAG,EACT,IAAI,GAAG,CAAC,EACR,KAAK,GAAG,GAAG,EACX,QAAQ,GAAG,KAAK,EAChB,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,YAAY,GAA+C,CAAC,CAAC,EAAE,EAAE;QACrE,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;KAC5E,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,aACvB,iBAAO,SAAS,EAAC,gBAAgB,aAC9B,KAAK,CAAC,CAAC,CAAC,eAAM,SAAS,EAAC,cAAc,YAAE,KAAK,GAAQ,CAAC,CAAC,CAAC,IAAI,EAC7D,gBACE,SAAS,EAAE;uHACgG,sBAAsB,EAAE,EACnI,KAAK,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACrC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,YAAY,GACpB,EACF,cAAK,SAAS,EAAC,kDAAkD,YAC/D,gBACE,SAAS,EAAC,6CAA6C,EACvD,IAAI,EAAC,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,UAAU,GACjB,GACE,IACA,EACP,kBAAkB,CAAC,KAAK,CAAC,IACtB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,SAAS,kBAAkB,CAAC,KAAe;IACzC,OAAO,CACL,cAAK,SAAS,EAAC,2BAA2B,YACvC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,eAAsB,SAAS,EAAC,kCAAkC,YAC/D,IAAI,IADI,MAAM,CAAC,CAAC,CAAC,CAEb,CACR,CAAC,GACE,CACP,CAAC;AACJ,CAAC"}

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

@@ -1,5 +1,5 @@
-import { UniBlockProps } from '../../model/ContentPageDef';
-interface RadioButtonItem {
+import type { UniBlockProps } from '../../model/JSXBlock';
+export interface RadioButtonItem {
     id: string;
     text: string;
 }

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

@@ -1,2 +1,2 @@
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 export declare const SearchBar: import("@redneckz/uni-jsx").UNIComponent<UniBlockProps, any, any>;

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

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { Icon } from '../Icon/Icon.js';
-import { useState, useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useOutsideClick } from '../../hooks/useOutsideClick.js';
+import { Icon } from '../Icon/Icon.js';
 export const Select = JSX(({ className = '', isBorder = true, label, options = [], value, onChange, placeholder = '' }) => {
     const [selectedItem, setSelectedItem] = useState(options[0] || { key: '', text: '' });
     const [isOpen, setIsOpen] = useState(false);

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

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/ui-kit/Select/Select.tsx"],"names":[],"mappings":"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"}

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,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"}
+{"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,EAA6B,MAAM,wBAAwB,CAAC;AAEzF,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,GAA0C,CAAC,CAAC,EAAE,EAAE;QAChE,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/SwipeListControlList.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SwipeContainer } from './SwipeListControlProps';
 /**
  * @title Список
@@ -5,6 +6,6 @@ import { SwipeContainer } from './SwipeListControlProps';
 export interface SwipeListControlListProps extends SwipeContainer {
     className?: string;
     activeIndex: number;
-    onScroll?: (e: any) => void;
+    onScroll?: JSX.IntrinsicElements['div']['onScroll'];
 }
 export declare const SwipeListControlList: import("@redneckz/uni-jsx").UNIComponent<SwipeListControlListProps, any, any>;

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

@@ -1,4 +1,4 @@
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 /**
  * @title Контейнер
  */

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

@@ -1,66 +1,4 @@
 {
   "title": "Аккордеон",
-  "accordionAlignTitle": "center",
-  "accordionItems": [
-    {
-      "label": "Аккордеон 1",
-      "labelIcon": {
-        "icon": "CardIcon"
-      },
-      "blocks": [
-        {
-          "blockListType": "TextBlock",
-          "title": "Текстовый блок",
-          "description": "Описание текстового блока",
-          "style": ["col-span-12"]
-        },
-        {
-          "blockListType": "TextBlock",
-          "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2",
-          "style": ["col-span-12"]
-        }
-      ]
-    },
-    {
-      "label": "Аккордеон 2",
-      "labelIcon": {
-        "icon": "CardIcon"
-      },
-      "blocks": [
-        {
-          "blockListType": "TextBlock",
-          "title": "Текстовый блок",
-          "description": "Описание текстового блока",
-          "style": ["col-span-6"]
-        },
-        {
-          "blockListType": "TextBlock",
-          "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2",
-          "style": ["col-span-6"]
-        }
-      ]
-    },
-    {
-      "label": "Аккордеон 3",
-      "labelIcon": {
-        "icon": "CardIcon"
-      },
-      "blocks": [
-        {
-          "blockListType": "TextBlock",
-          "title": "Текстовый блок",
-          "description": "Описание текстового блока",
-          "style": ["col-span-12"]
-        },
-        {
-          "blockListType": "TextBlock",
-          "title": "Текстовый блок №2",
-          "description": "Описание текстового блока №2",
-          "style": ["col-span-12"]
-        }
-      ]
-    }
-  ]
+  "accordionAlignTitle": "center"
 }

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

@@ -1,40 +1,24 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/ContentPageDef';
-import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
+import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { AccordionContent } from './AccordionContent';
-import { AccordionItem } from './AccordionItem';
 import { AccordionItemsList } from './AccordionItemsList';
 
 export interface AccordionProps extends AccordionContent, UniBlockProps {}
 
-export const Accordion = JSX<AccordionProps>(
-  ({ title, description, accordionItems, context, className = '', bordered, ...rest }) => {
-    return (
-      <BlockWrapper
-        context={context}
-        className={`py-6 px-4 font-sans bg-white text-primary-text ${className}`}
-        {...rest}
-      >
-        {title ? <Heading headingType="h3" className="mb-2 text-center" title={title} /> : null}
-        {description ? <div className="mb-5 text-m-light text-center">{description}</div> : null}
-        {accordionItems?.length ? (
-          <AccordionItemsList>
-            {accordionItems.map((item, i) => (
-              <AccordionItem
-                key={`AccordionItem_${i}`}
-                context={context}
-                bordered={bordered}
-                hasContent={Boolean(item.blocks?.length)}
-                {...item}
-              >
-                {renderBlocksList({ blocks: item.blocks, context, className: '!p-0 mb-5' })}
-              </AccordionItem>
-            ))}
-          </AccordionItemsList>
-        ) : null}
-      </BlockWrapper>
-    );
-  },
+export const Accordion: JSXBlock<AccordionProps> = JSX<AccordionProps>(
+  ({ title, description, context, className = '', children, ...rest }) => (
+    <BlockWrapper
+      context={context}
+      className={`py-6 px-4 font-sans bg-white text-primary-text ${className}`}
+      {...rest}
+    >
+      {title ? <Heading headingType="h3" className="mb-2 text-center" title={title} /> : null}
+      {description ? <div className="mb-5 text-m-light text-center">{description}</div> : null}
+      <AccordionItemsList>{children}</AccordionItemsList>
+    </BlockWrapper>
+  ),
 );
+
+Accordion.childrenTypes = ['AccordionItem'];

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

@@ -1,79 +1 @@
-{
-  "content": {
-    "accordionItems": {
-      "items": {
-        "blocks": {
-          "items": {
-            "blockListType": {
-              "ui:widget": "hidden"
-            },
-            "image": {
-              "ui:field": "picture"
-            },
-            "benefitList": {
-              "items": {
-                "description": {
-                  "benefitType": {
-                    "ui:widget": "hidden"
-                  }
-                },
-                "icon": {
-                  "ui:field": "icon"
-                }
-              }
-            },
-            "style": {
-              "ui:field": "style"
-            },
-            "benefits": {
-              "items": {
-                "icon": {
-                  "ui:field": "icon"
-                }
-              }
-            },
-            "buttons": {
-              "items": {
-                "icon": {
-                  "ui:field": "icon"
-                },
-                "iconRight": {
-                  "ui:field": "icon"
-                }
-              }
-            },
-            "icon": {
-              "ui:field": "icon"
-            },
-            "backwardButton": {
-              "icon": {
-                "ui:field": "icon"
-              },
-              "iconRight": {
-                "ui:field": "icon"
-              }
-            },
-            "cards": {
-              "items": {
-                "image": {
-                  "ui:field": "picture"
-                },
-                "button": {
-                  "icon": {
-                    "ui:field": "icon"
-                  },
-                  "iconRight": {
-                    "ui:field": "icon"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "labelIcon": {
-          "ui:field": "icon"
-        }
-      }
-    }
-  }
-}
+{}

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

@@ -1,32 +1,6 @@
 import type { AlignType } from '../../model/AlignType';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
-import type { Picture } from '../../model/Picture';
-import type { BlockDef } from '../../ui-kit/BlocksList/BlocksListProps';
-
-export interface AccordionItemCommonProps {
-  /**
-   * @title Название
-   * @default Список
-   */
-  label?: string;
-  /** @title Отображать в раскрытом виде */
-  isExpanded?: boolean;
-  /**
-   * @title Отображать/скрывать обводку элемента
-   * @default false
-   */
-  bordered?: boolean; // TODO: только для мобильной версии
-  labelIcon?: Picture; // TODO: только для мобильной версии
-}
-
-/**
- * @title Элемент списка
- */
-export interface AccordionItem extends AccordionItemCommonProps {
-  /** @title Блоки */
-  blocks?: BlockDef[];
-}
 
 /**
  * @title Аккордеон
@@ -37,9 +11,9 @@ export type AccordionContent = HeadlineCommonProps & {
    * @default center
    */
   accordionAlignTitle?: AlignType;
+
   version?: BlockVersion;
-  /** @title Список */
-  accordionItems?: AccordionItem[];
+
   /**
    * @title Отображать/скрывать обводку у элемента списка
    * @default false

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

@@ -0,0 +1,7 @@
+{
+  "label": "Аккордеон 1",
+  "isExpanded": true,
+  "labelIcon": {
+    "icon": "CardIcon"
+  }
+}

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

@@ -0,0 +1,73 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { getParentBlockContent } from '../../model/getParentBlockContent';
+import type { JSXBlock } from '../../model/JSXBlock';
+import type { Picture } from '../../model/Picture';
+import { Foldable } from '../../ui-kit/Foldable/Foldable';
+import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
+import type { IconName } from '../../ui-kit/Icon/IconProps';
+import { Img } from '../../ui-kit/Img/Img';
+import type { AccordionContent } from '../Accordion/AccordionContent';
+import type { AccordionItemProps } from './AccordionItemProps';
+
+const icons: IconName[] = ['PlusIcon', 'MinusIcon'];
+
+export const AccordionItem: JSXBlock<AccordionItemProps> = JSX<AccordionItemProps>(
+  ({ className = '', ancestors, label = '', labelIcon, isExpanded, children }) => {
+    const { bordered } = getParentBlockContent(ancestors, {} as AccordionContent);
+
+    return (
+      <li
+        className={`${
+          bordered ? 'border p-4 rounded mb-4' : 'border-0 border-b last:border-b-0'
+        } border-solid border-main-divider ${className}`}
+      >
+        <Foldable
+          isFoldButtonOnTop={true}
+          unfoldedByDefault={isExpanded}
+          renderFoldableSection={({ isUnfolded }) => (
+            <FoldableSection
+              className="flex flex-wrap group-last:last:pb-0 gap-5 [&>*]:p-0"
+              isUnfolded={isUnfolded}
+            >
+              {children}
+            </FoldableSection>
+          )}
+          renderFoldButton={({ isUnfolded, onToggle }) => (
+            <FoldButton
+              className={bordered ? '' : 'py-[14px] px-0'}
+              label={label}
+              icon={icons[Number(isUnfolded)]}
+              primaryIcon={labelIcon}
+              onClick={onToggle}
+            />
+          )}
+        />
+      </li>
+    );
+  },
+);
+
+AccordionItem.childrenTypes = [];
+
+interface FoldButtonProps {
+  className?: string;
+  label: string;
+  icon: IconName;
+  primaryIcon?: Picture;
+  onClick?: () => void;
+}
+
+const FoldButton = JSX<FoldButtonProps>(({ className, icon, label, primaryIcon, onClick }) => (
+  <button
+    className={`border-none bg-transparent flex justify-between text-left w-full font-sans text-primary-text group cursor-pointer ${className}`}
+    onClick={onClick}
+  >
+    <span className="text-m-title-xs font-medium pr-2.5 flex group-hover:text-primary-main">
+      {primaryIcon ? (
+        <Img image={primaryIcon} className="mr-3 flex-shrink-0" width="24" height="24" asSVG />
+      ) : null}
+      {label}
+    </span>
+    <Img className="flex-shrink-0" image={icon} width="24" height="24" asSVG />
+  </button>
+));

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

@@ -0,0 +1,7 @@
+{
+  "content": {
+    "labelIcon": {
+      "ui:field": "icon"
+    }
+  }
+}

package/mobile/src/components/AccordionItem/AccordionItemContent.ts

@@ -0,0 +1,15 @@
+import type { Picture } from '../../model/Picture';
+
+/**
+ * @title Элемент аккордиона
+ */
+export interface AccordionItemContent {
+  /**
+   * @title Название
+   * @default Список
+   */
+  label?: string;
+  /** @title Отображать в раскрытом виде */
+  isExpanded?: boolean;
+  labelIcon?: Picture; // TODO: только для мобильной версии
+}

package/mobile/src/components/AccordionItem/AccordionItemProps.ts

@@ -0,0 +1,4 @@
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { AccordionItemContent } from './AccordionItemContent';
+
+export interface AccordionItemProps extends AccordionItemContent, UniBlockProps {}

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { BaseTileCommonProps } from './BaseTileProps';
 
 export interface BaseTileProps extends BaseTileCommonProps, UniBlockProps {}

package/mobile/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';

package/mobile/src/components/Blocks.ts

@@ -1,4 +1,5 @@
 import { Accordion } from './Accordion/Accordion';
+import { AccordionItem } from './AccordionItem/AccordionItem';
 import { ComparisonTable } from './ComparisonTable/ComparisonTable';
 import { Footer } from './Footer/Footer';
 import { Gallery } from './Gallery/Gallery';
@@ -16,6 +17,7 @@ import { TextBlock } from './TextBlock/TextBlock';
 
 export const Blocks = {
   Accordion,
+  AccordionItem,
   ComparisonTable,
   Footer,
   Gallery,

package/mobile/src/components/Bonus/Bonus.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { Img } from '../../ui-kit/Img/Img';

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -1,15 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/ContentPageDef';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
 import { Headline } from '../Headline/Headline';
-import type { BonusBenefit, BonusBenefitsBlockContent } from './BonusBenefitsBlockContent';
-import { getElementsColsValue } from './getElementsColsValue';
+import type {
+  BonusBenefit,
+  BonusBenefitsBlockContent,
+  ColumnsCount,
+} from './BonusBenefitsBlockContent';
 
 export interface BenefitsBlockProps extends BonusBenefitsBlockContent, UniBlockProps {}
 
 export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
-  ({ context, className = '', title, subtitle, bonusBenefits, ...rest }) => (
+  ({ context, className = '', title, subtitle, bonusBenefits, columnsCount = '4', ...rest }) => (
     <BlockWrapper
       className={`font-sans text-primary-text bg-white p-[50px] flex flex-col text-center ${className}`}
       context={context}
@@ -24,7 +27,7 @@ export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
         align="center"
       />
       {bonusBenefits?.length ? (
-        <div className={`grid gap-1 mt-8 ${getElementsColsValue(className)}`}>
+        <div className={`grid gap-1 mt-8 ${getElementsColsValue(columnsCount)}`}>
           {bonusBenefits.map(renderBonusBenefit)}
         </div>
       ) : null}
@@ -49,3 +52,6 @@ const renderBonusBenefit = (bonusBenefit: BonusBenefit, i: number) => {
     </div>
   );
 };
+
+const getElementsColsValue = (colValue: ColumnsCount) =>
+  colValue === '4' ? 'grid-cols-4' : 'grid-cols-5';

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

@@ -7,5 +7,10 @@
         }
       }
     }
+  },
+  "style": {
+    "ui:options": {
+      "minCols": 12
+    }
   }
 }