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

package/mobile/src/components/InvestmentInfo/InvestmentInfo.tsx

@@ -0,0 +1,149 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../model/ContentPageDef';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { List } from '../../ui-kit/List/List';
+import { joinList } from '../../utils/joinList';
+import type {
+  InvestmentCell,
+  InvestmentCellColor,
+  InvestmentCellSize,
+  InvestmentColumn,
+  InvestmentInfoContent,
+  InvestmentZeroColumn,
+} from './InvestmentInfoContent';
+
+const investmentCellColorMap: Record<InvestmentCellColor, string> = {
+  yellow: 'bg-yellow',
+  green: 'bg-green',
+  'green-light': 'bg-green-light',
+  'green-dark': 'bg-green-dark',
+};
+
+const investmentCellSizeMap: Record<InvestmentCellSize, string> = {
+  XS: 'h-[40px]',
+  S: 'h-[68px]',
+  M: 'h-[102px]',
+  L: 'h-[136px]',
+  XL: 'h-[204px]',
+};
+
+export interface InvestmentInfoProps extends InvestmentInfoContent, UniBlockProps {}
+
+export const InvestmentInfo = JSX<InvestmentInfoProps>((props) => {
+  const {
+    context,
+    className = '',
+    items,
+    isDotted,
+    investmentZeroColumn,
+    investmentColumns,
+    ...rest
+  } = props;
+  const colums = investmentColumns ? [...investmentColumns] : [];
+  if (investmentZeroColumn) {
+    colums.unshift(investmentZeroColumn);
+  }
+
+  return (
+    <BlockWrapper
+      className={`font-sans bg-white p-9 pb-9 ${className}`}
+      context={context}
+      {...rest}
+    >
+      <div className="container text-m-light">
+        {colums?.length ? (
+          <div>
+            <div className="flex items-end px-9 text-white">
+              {joinList(<div className="w-px h-4 bg-main-stroke" />)(
+                colums.map(renderInvestmentColumn),
+              )}
+              <div className="w-px h-4 bg-main-stroke" />
+            </div>
+            <div className="border-t border-main-stroke -mt-2 mx-9" />
+            <div className="flex justify-between mt-3 -mx-10">
+              {colums.map(renderInvestmentColumnTitle)}
+            </div>
+          </div>
+        ) : null}
+
+        {items?.length ? (
+          <List
+            className="mt-9 text-h6"
+            items={items}
+            itemClassName="mb-[7px]"
+            isDotted={isDotted}
+          />
+        ) : null}
+      </div>
+    </BlockWrapper>
+  );
+});
+
+const renderInvestmentColumn = (
+  column: InvestmentColumn | InvestmentZeroColumn,
+  i: number,
+  arr: Array<InvestmentColumn>,
+) => {
+  const isSecondColumn = i === 1;
+  const isLastColumn = i === arr.length - 1;
+
+  return (
+    <div
+      key={`column_${i}`}
+      className={`${getColumnClasses(isSecondColumn, isLastColumn, column.cells)}`}
+    >
+      {column.cells?.length ? (
+        <div className={`w-full ${isLastColumn ? 'border-4 border-green-more-dark p-1' : ''}`}>
+          {column.cells.map(renderInvestmentCell)}
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+const getColumnClasses = (
+  isSecondColumn: boolean,
+  isLastColumn: boolean,
+  cells: InvestmentCell[] = [],
+): string =>
+  [
+    cells.length ? 'flex-1' : 'flex-0',
+    cells.length && !isSecondColumn && !isLastColumn ? 'pl-2.5' : '',
+    cells.length && !isLastColumn ? 'pr-2.5 pb-8' : 'pb-6',
+  ].join(' ');
+
+const renderInvestmentCell = (cell: InvestmentCell, i: number) => {
+  const cellSize = cell.cellSize || 'XS';
+  const cellColor = cell.cellColor || 'green';
+
+  return cell.text ? (
+    <div
+      key={`cell_${i}`}
+      className={`flex-1 flex items-center justify-center relative py-2 ${
+        investmentCellSizeMap[cellSize]
+      } ${investmentCellColorMap[cellColor]} ${cellSize === 'XS' ? 'px-3' : 'px-11'}`}
+    >
+      <div className="text-center">{cell.text}</div>
+    </div>
+  ) : null;
+};
+
+const renderInvestmentColumnTitle = (
+  column: InvestmentColumn | InvestmentZeroColumn,
+  i: number,
+  arr: Array<InvestmentColumn>,
+) => {
+  const isFirstColumn = i === 0;
+  const isLastColumn = i === arr.length - 1;
+
+  return (
+    <div
+      key={`title_${i}`}
+      className={`flex-1 max-w-[180px] text-center px-2 ${isFirstColumn ? 'pl-9' : ''} ${
+        isLastColumn ? 'pr-9' : ' '
+      }`}
+    >
+      {column.title}
+    </div>
+  );
+};

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

@@ -0,0 +1,16 @@
+{
+  "content": {
+    "bonusItems": {
+      "items": {
+        "bonusItemContent": {
+          "bonusType": {
+            "ui:widget": "hidden"
+          },
+          "image": {
+            "ui:field": "icon"
+          }
+        }
+      }
+    }
+  }
+}

package/mobile/src/components/InvestmentInfo/InvestmentInfoContent.ts

@@ -0,0 +1,55 @@
+import type { ListContent } from '../../ui-kit/List/ListContent';
+
+/**
+ * @title Цвет
+ * @enumNames ["Желтый", "Светло-зеленый", "Зеленый", "Тёмно-зеленый"]
+ */
+export type InvestmentCellColor = 'yellow' | 'green-light' | 'green' | 'green-dark';
+
+/**
+ * @title Высота
+ * @enumNames ["Очень большой", "Большой", "Средний", "Маленький", "Очень маленький"]
+ */
+export type InvestmentCellSize = 'XL' | 'L' | 'M' | 'S' | 'XS';
+
+/**
+ * @title Ячейка
+ */
+export type InvestmentCell = {
+  /** @title Текст */
+  text?: string;
+  cellColor?: InvestmentCellColor;
+  cellSize?: InvestmentCellSize;
+};
+
+/**
+ * @title Элемент данных 1
+ */
+export type InvestmentZeroColumn = {
+  /** @title Название */
+  title?: string;
+  /** @hidden */
+  cells?: InvestmentCell[];
+};
+
+/**
+ * @title Элемент данных
+ */
+export type InvestmentColumn = {
+  /** @title Название */
+  title?: string;
+  /** @title Ячейки */
+  cells?: InvestmentCell[];
+};
+
+/**
+ * @title Блок инвестиций
+ */
+export type InvestmentInfoContent = ListContent & {
+  /** @title Буллиты */
+  isDotted?: boolean;
+  /** @title Элемент данных 1 */
+  investmentZeroColumn?: InvestmentZeroColumn;
+  /** @title Остальные элементы данных */
+  investmentColumns?: InvestmentColumn[];
+};

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

@@ -2,8 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { ColorPalette, UniBlockProps } from '../../model/ContentPageDef';
 import type { VNode } from '../../model/VNode';
 import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
-import { DefaultButton } from '../../ui-kit/Foldable/DefaultButton';
+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 { BlockItemCommonProps } from './OtherProductsContent';
 
@@ -14,7 +15,7 @@ export interface BlockItemProps extends BlockItemCommonProps, UniBlockProps {
 const icons: IconName[] = ['ArrowDownIcon', 'ArrowUpIcon'];
 
 export const OtherProductsItem = JSX<BlockItemProps>(
-  ({ label = '', blocks, context, dataTheme, isUnfolded }) => {
+  ({ label = '', blocks, context, dataTheme, isUnfolded: unfoldedByDefault }) => {
     const foldableBlocks = renderBlocksList({
       context,
       blocks,
@@ -24,17 +25,23 @@ export const OtherProductsItem = JSX<BlockItemProps>(
       <div className="˝border-0 border-b border-solid border-main-divider">
         {blocks?.length ? (
           <Foldable
-            blocks={foldableBlocks}
-            hiddenBlocksNum={blocks?.length}
-            unfoldedByDefault={isUnfolded}
-            containerClassName="grid grid-cols-12 gap-1 border-box"
-            blockWrapper={(children) => <Wrapper>{children}</Wrapper>}
-            renderFoldButton={(props) => (
-              <DefaultButton
-                icon={icons[Number(props.isUnfolded)]}
+            unfoldedByDefault={unfoldedByDefault}
+            renderFoldableSection={({ isUnfolded }) => (
+              <div className="box-border">
+                <FoldableSection
+                  className="grid grid-cols-12 gap-1 border-box"
+                  isUnfolded={isUnfolded}
+                >
+                  {foldableBlocks}
+                </FoldableSection>
+              </div>
+            )}
+            renderFoldButton={({ isUnfolded, onToggle }) => (
+              <DefaultFoldButton
                 label={label}
+                icon={icons[Number(isUnfolded)]}
                 dataTheme={dataTheme}
-                onClick={props.onToggle}
+                onClick={onToggle}
               />
             )}
           />
@@ -43,7 +50,3 @@ export const OtherProductsItem = JSX<BlockItemProps>(
     );
   },
 );
-
-const Wrapper = JSX(({ children }) => {
-  return <div className="box-border">{children}</div>;
-});

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]);
+
+    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.13",
   "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"
     }
   ],