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

package/mobile/src/components/OtherProducts/OtherProducts.tsx

@@ -1,32 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { JSXBlock } from '../../model/BlocksRegistry';
 import type { UniBlockProps } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { OtherProductsContent } from './OtherProductsContent';
-import { OtherProductsItem } from './OtherProductsItem';
 
 export interface OtherProductsProps extends OtherProductsContent, UniBlockProps {}
 
 export const OtherProducts = JSX<OtherProductsProps>(
-  ({ blockItems, colorPalette, context, className = '', ...rest }) => {
-    return (
-      <BlockWrapper
-        context={context}
-        className={`font-sans text-primary-text ${className}`}
-        {...rest}
-      >
-        {blockItems?.length ? (
-          <div className="box-border1">
-            {blockItems.map((item, i) => (
-              <OtherProductsItem
-                key={`BlockItem${i}`}
-                {...item}
-                dataTheme={colorPalette}
-                context={context}
-              />
-            ))}
-          </div>
-        ) : null}
-      </BlockWrapper>
-    );
-  },
-);
+  ({ context, className = '', children, ...rest }) => (
+    <BlockWrapper
+      context={context}
+      className={`font-sans text-primary-text ${className}`}
+      {...rest}
+    >
+      {children ? <div className="box-border1">{children}</div> : null}
+    </BlockWrapper>
+  ),
+) as JSXBlock<OtherProductsProps>;
+
+OtherProducts.childrenTypes = ['OtherProductsItem'];

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

@@ -1,76 +1 @@
-{
-  "content": {
-    "blockItems": {
-      "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"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
+{}

package/mobile/src/components/OtherProducts/OtherProductsContent.ts

@@ -1,27 +1,6 @@
-import type { ColorPalette } from '../../model/ContentPageDef';
 import type { TitleProps } from '../../model/HeadlineType';
-import type { BlockDef } from '../../ui-kit/BlocksList/BlocksListProps';
-
-/**
- * @title Элемент списка
- */
-export interface BlockItemCommonProps {
-  /**
-   * @title Название
-   * @default Список
-   */
-  label?: string;
-  /** @title Отображать в раскрытом виде */
-  isUnfolded?: boolean;
-  /** @title Блоки */
-  blocks?: BlockDef[];
-}
 
 /**
  * @title Другие продукты
  */
-export type OtherProductsContent = TitleProps & {
-  /** @title Список */
-  blockItems?: BlockItemCommonProps[];
-  colorPalette?: ColorPalette;
-};
+export type OtherProductsContent = TitleProps;

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

@@ -0,0 +1,3 @@
+{
+  "label": "Другие продукты N"
+}

package/mobile/src/components/OtherProductsItem/OtherProductsItem.tsx

@@ -0,0 +1,39 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { JSXBlock } from '../../model/BlocksRegistry';
+import type { UniBlockProps } from '../../model/ContentPageDef';
+import { DefaultFoldButton } from '../../ui-kit/Foldable/DefaultFoldButton';
+import { Foldable } from '../../ui-kit/Foldable/Foldable';
+import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
+import type { IconName } from '../../ui-kit/Icon/IconProps';
+import type { OtherProductsItemContent } from './OtherProductsItemContent';
+
+export interface OtherProductsItemProps extends OtherProductsItemContent, UniBlockProps {}
+
+const icons: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
+
+export const OtherProductsItem = JSX<OtherProductsItemProps>(
+  ({ className, label = '', colorPalette, isUnfolded: unfoldedByDefault, children }) => (
+    <div className={`border-0 border-b border-solid border-main-divider ${className}`}>
+      <Foldable
+        unfoldedByDefault={unfoldedByDefault}
+        renderFoldableSection={({ isUnfolded }) => (
+          <div className="box-border">
+            <FoldableSection className="grid grid-cols-12 gap-1 border-box" isUnfolded={isUnfolded}>
+              {children}
+            </FoldableSection>
+          </div>
+        )}
+        renderFoldButton={({ isUnfolded, onToggle }) => (
+          <DefaultFoldButton
+            label={label}
+            icon={icons[Number(isUnfolded)]}
+            dataTheme={colorPalette}
+            onClick={onToggle}
+          />
+        )}
+      />
+    </div>
+  ),
+) as JSXBlock<OtherProductsItemProps>;
+
+OtherProductsItem.childrenTypes = []; // All types of blocks are suitable

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

@@ -0,0 +1 @@
+{}

package/mobile/src/components/OtherProductsItem/OtherProductsItemContent.ts

@@ -0,0 +1,17 @@
+import type { ColorPalette } from '../../model/ContentPageDef';
+
+/**
+ * @title Элемент списка
+ */
+export interface OtherProductsItemContent {
+  /**
+   * @title Название
+   * @default Список
+   */
+  label?: string;
+
+  /** @title Отображать в раскрытом виде */
+  isUnfolded?: boolean;
+
+  colorPalette?: ColorPalette;
+}

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

@@ -1 +1,8 @@
-{}
+{
+  "content": {},
+  "style": {
+    "ui:options": {
+      "minCols": 12
+    }
+  }
+}

package/mobile/src/components/StepsBlock/StepsBlockStyleMaps.ts

@@ -14,7 +14,7 @@ export const STEPS_BLOCK_STYLE_MAPS: Record<BlockVersion, StyleType> = {
   primary: {
     background: 'bg-white',
     title: 'text-primary-text',
-    description: 'text-secondary-text',
+    description: '!text-secondary-text text-l-light',
     iconText: 'text-secondary-text',
     iconBackground: 'bg-main-divider',
     iconConnector: 'bg-secondary-light',
@@ -23,7 +23,7 @@ export const STEPS_BLOCK_STYLE_MAPS: Record<BlockVersion, StyleType> = {
   secondary: {
     background: 'bg-primary-main',
     title: 'text-white',
-    description: 'text-white/80',
+    description: '!text-white/80 text-l-light',
     iconText: 'text-white',
     iconBackground: 'bg-white/30',
     iconConnector: 'bg-white',

package/mobile/src/components/StepsBlock/renderItems.tsx

@@ -1,17 +1,26 @@
-import type { StyleType } from './StepsBlockStyleMaps';
+import { List } from '../../ui-kit/List/List';
+import type { BlockVersion } from '../../model/BlockVersion';
 
-export const renderItems = (items?: string[], styleMap?: StyleType, isDotted = true) =>
-  items ? (
-    <div className={`mt-4 ${styleMap?.description}`} role="list">
-      {items.map((_) => (
-        <div className="items-start mt-1 first:mt-0" role="listitem">
-          {isDotted ? (
-            <div
-              className={`rounded-full inline-block mr-3 mb-1 w-1.5 h-1.5 min-w-1.5 min-h-1.5 ${styleMap?.dot}`}
-            />
-          ) : null}
-          <span>{_}</span>
-        </div>
-      ))}
-    </div>
+export const renderItems = ({
+  items,
+  isDotted = true,
+  version = 'primary',
+  className = '',
+}: {
+  items?: string[];
+  isDotted?: boolean;
+  version?: BlockVersion;
+  className?: string;
+}) => {
+  const listVersion = version === 'primary' ? 'gray' : version;
+
+  return items ? (
+    <List
+      className={`mt-4 ${className}`}
+      version={listVersion}
+      items={items}
+      listItemSize="S"
+      isDotted={isDotted}
+    />
   ) : null;
+};

package/mobile/src/components/StepsBlock/renderStepContent.tsx

@@ -0,0 +1,63 @@
+import { Button } from '../../ui-kit/Button/Button';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { HandlerDecorator, Router } from '../ContentPage/ContentPageContext';
+import type { Step } from './StepsBlockContent';
+import type { StyleType } from './StepsBlockStyleMaps';
+import { renderItems } from './renderItems';
+import { useLink } from '../../hooks/useLink';
+
+export const renderStepContent =
+  ({
+    styleMap,
+    isMainButton,
+    version,
+    router,
+    handlerDecorator,
+  }: {
+    styleMap: StyleType;
+    isMainButton: boolean;
+    version: BlockVersion;
+    router: Router;
+    handlerDecorator?: HandlerDecorator;
+  }) =>
+  (step: Step, i: number, { length }: { length: number }) => {
+    const { label, description, button, items, isDotted } = step;
+
+    const additionalMarginClass = `${button?.text ? 'mb-8' : ''} ${step?.label ? 'mt-2' : 'mt-4'}`;
+    const widthContainer = length < 5 ? 'w-[276px]' : 'w-[210px]';
+
+    return (
+      <div
+        key={String(i)}
+        className={`flex flex-col items-center text-center relative
+        whitespace-pre-line overflow-hidden ${widthContainer}`}
+      >
+        {renderStepLabel(label)}
+        {renderStepDescription({
+          description,
+          className: `${styleMap.description} ${additionalMarginClass}`,
+        })}
+        {renderItems({ items, isDotted, version, className: styleMap.description })}
+        {button?.text && !isMainButton ? (
+          <Button
+            className="box-border py-3 h-12 w-full max-w-[240px] mt-auto"
+            {...useLink({ router, handlerDecorator }, button)}
+            version={version}
+          >
+            {button.text}
+          </Button>
+        ) : null}
+      </div>
+    );
+  };
+
+const renderStepLabel = (label?: string) =>
+  label ? <div className="text-x6 m-0 mt-4">{label}</div> : null;
+
+const renderStepDescription = ({
+  description,
+  className = '',
+}: {
+  description?: string;
+  className?: string;
+}) => (description ? <div className={className}>{description}</div> : null);

package/mobile/src/model/BlockDecorator.ts

@@ -4,6 +4,8 @@ export const DEFAULT_SLOT_NAME = null;
 
 export type BlockAncestors = [keyof SlotsMap | typeof DEFAULT_SLOT_NAME, ...Slot[]];
 
+export const DEFAULT_ANCESTORS: BlockAncestors = [DEFAULT_SLOT_NAME];
+
 interface BlockDecoratorProps<VNode> {
   blockClassName: string;
   block: BlockDef;

package/mobile/src/model/BlocksRegistry.ts

@@ -6,6 +6,9 @@ export type JSXBlock<BlockProps = Record<string, any>> = UNIComponent<
   BlockProps & UniBlockProps,
   any,
   VNode | VNode[]
->;
+> & {
+  childrenTypes?: string[];
+  renderChild?: (child: VNode, i: number) => VNode;
+};
 
 export type BlocksRegistry<BlockProps = Record<string, any>> = Record<string, JSXBlock<BlockProps>>;

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

@@ -0,0 +1,52 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { ColorPalette } from '../../model/ContentPageDef';
+import type { IconName } from '../Icon/IconProps';
+import { Img } from '../Img/Img';
+import type { FoldablePartProps } from './FoldablePartProps';
+
+interface DefaultFoldButtonProps {
+  className?: string;
+  label: string;
+  icon: IconName;
+  dataTheme?: ColorPalette;
+  onClick?: () => void;
+}
+
+export const DefaultFoldButton = JSX<DefaultFoldButtonProps>(
+  ({ className, label, icon, dataTheme = '', onClick }) => (
+    <button
+      className={`border-none bg-primary-main hover:bg-primary-hover px-0 py-5 mb-[1px] w-full font-sans text-white flex justify-center cursor-pointer ${
+        className || ''
+      }`}
+      data-theme={dataTheme}
+      onClick={onClick}
+    >
+      <span className="text-h4 pr-3">{label}</span>
+      {icon ? (
+        <Img
+          image={{
+            icon,
+            iconVersion: 'white',
+          }}
+          className="flex-shrink-0 my-auto"
+          width="20"
+          height="20"
+          asSVG
+        />
+      ) : null}
+    </button>
+  ),
+);
+
+export const renderDefaultFoldButton = ({ isUnfolded, onToggle }: FoldablePartProps) => {
+  const labels = ['Развернуть', 'Скрыть'];
+  const icons: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
+
+  return (
+    <DefaultFoldButton
+      icon={icons[Number(isUnfolded)]}
+      label={labels[Number(isUnfolded)]}
+      onClick={onToggle}
+    />
+  );
+};

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

@@ -1,89 +1,41 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { VNode } from '../../model/VNode';
-import { clamp } from '../../utils/clamp';
-import type { IconName } from '../Icon/IconProps';
-import { DefaultButton } from './DefaultButton';
+import type { FoldablePartProps } from './FoldablePartProps';
 
-interface RenderFoldButtonProps {
-  isUnfolded: boolean;
-  onToggle: () => void;
-}
 export interface FoldableProps {
-  blocks?: VNode[];
-  hiddenBlocksNum?: number;
   unfoldedByDefault?: boolean;
   isFoldButtonOnTop?: boolean;
-  containerClassName?: string;
-  blockWrapper?: (children: VNode) => VNode;
-  renderFoldButton?: (props: RenderFoldButtonProps) => VNode;
+  renderFoldableSection: (props: FoldablePartProps) => VNode;
+  renderFoldButton?: (props: FoldablePartProps) => VNode;
 }
 
 export const Foldable = JSX<FoldableProps>(
   ({
-    blocks = [],
-    hiddenBlocksNum = 0,
     isFoldButtonOnTop = false,
     unfoldedByDefault = false,
-    containerClassName = '',
-    blockWrapper = (_) => _,
-    renderFoldButton = renderDefaultFoldButton,
+    renderFoldableSection,
+    renderFoldButton,
   }) => {
     const [isUnfolded, setIsUnfolded] = useState(unfoldedByDefault);
-    const blocksToHide = clamp(hiddenBlocksNum, 0, blocks?.length);
-    const visibleBlocks = blocks.slice(0, blocks.length - blocksToHide);
-    const hiddenBlocks = blocksToHide > 0 ? blocks.slice(-blocksToHide) : [];
-    const containerRef = useRef<HTMLDivElement | null>(null);
 
-    const onToggle = () => {
-      setIsUnfolded(!isUnfolded);
-      if (containerRef.current) {
-        containerRef.current.style.maxHeight = isUnfolded
-          ? ''
-          : `${containerRef.current.scrollHeight}px`;
-      }
-    };
+    const onToggle = useCallback(() => {
+      setIsUnfolded((_) => !_);
+    }, []);
 
-    const buttonNode = hiddenBlocksNum ? renderFoldButton({ isUnfolded, onToggle }) : null;
-    const blocksNode = blockWrapper(
-      <div>
-        {visibleBlocks}
-        <div
-          ref={containerRef}
-          className={`transition-max-h duration-300 overflow-hidden max-h-0 ${containerClassName}`}
-        >
-          {hiddenBlocks}
-        </div>
-      </div>,
-    );
+    const sectionNode = renderFoldableSection({ isUnfolded, onToggle });
+    const buttonNode = renderFoldButton ? renderFoldButton({ isUnfolded, onToggle }) : null;
 
-    return (
+    return isFoldButtonOnTop ? (
       <div>
-        {isFoldButtonOnTop ? (
-          <div>
-            {buttonNode}
-            {blocksNode}
-          </div>
-        ) : (
-          <div>
-            {blocksNode}
-            {buttonNode}
-          </div>
-        )}
+        {buttonNode}
+        {sectionNode}
+      </div>
+    ) : (
+      <div>
+        {sectionNode}
+        {buttonNode}
       </div>
     );
   },
 );
-
-const renderDefaultFoldButton = (props: RenderFoldButtonProps) => {
-  const labels = ['Развернуть', 'Скрыть'];
-  const icons: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
-
-  return (
-    <DefaultButton
-      icon={icons[Number(props.isUnfolded)]}
-      label={labels[Number(props.isUnfolded)]}
-      onClick={props.onToggle}
-    />
-  );
-};

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

@@ -0,0 +1,4 @@
+export interface FoldablePartProps {
+  isUnfolded: boolean;
+  onToggle?: () => void;
+}

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

@@ -0,0 +1,30 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+
+export interface FoldableSectionProps {
+  className?: string;
+  isUnfolded?: boolean;
+}
+
+export const FoldableSection = JSX<FoldableSectionProps>(
+  ({ className = '', isUnfolded, children }) => {
+    const containerRef = useRef<HTMLDivElement | null>(null);
+
+    useEffect(() => {
+      if (containerRef.current) {
+        containerRef.current.style.maxHeight = isUnfolded
+          ? `${containerRef.current.scrollHeight}px`
+          : '';
+      }
+    }, [isUnfolded, children?.length]);
+
+    return (
+      <div
+        ref={containerRef}
+        className={`transition-max-h duration-300 overflow-hidden max-h-0 ${className}`}
+      >
+        {children}
+      </div>
+    );
+  },
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.5.12",
+  "version": "0.5.14",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -182,7 +182,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "40 kB",
+      "limit": "37 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/common.css

@@ -5,9 +5,17 @@ html {
   scroll-behavior: smooth;
 }
 
+* {
+  --color-green: 78, 190, 81;
+  --color-green-light: 131, 184, 62;
+  --color-green-dark: 66, 171, 68;
+  --color-green-more-dark: 39, 148, 41;
+  --color-yellow: 221, 182, 61;
+}
+
 /* Private clients | Green */
 [data-theme='pc'] {
-  --color-primary-main: 66, 171, 68;
+  --color-primary-main: var(--color-green-dark);
   --color-primary-hover: 36, 131, 65;
   --color-primary-active: 36, 95, 52;
   --color-secondary-hover: 36, 131, 65;
@@ -17,7 +25,7 @@ html {
 }
 /* Business clients | Light-Green */
 [data-theme='bc'] {
-  --color-primary-main: 131, 184, 62;
+  --color-primary-main: var(--color-green-light);
   --color-primary-hover: 92, 146, 29;
   --color-primary-active: 60, 94, 16;
   --color-secondary-hover: 92, 146, 29;
@@ -27,7 +35,7 @@ html {
 }
 /* Ecosystem own | Yellow */
 [data-theme='eo'] {
-  --color-primary-main: 221, 182, 61;
+  --color-primary-main: var(--color-yellow);
   --color-primary-hover: 187, 151, 39;
   --color-primary-active: 126, 99, 12;
   --color-secondary-hover: 187, 151, 39;