@redneckz/wildless-cms-uni-blocks 0.3.12 → 0.3.13

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

@@ -0,0 +1,15 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import { Icon } from '../../ui-kit/Icon/Icon';
+import type { TariffsTableRowHeader } from './TariffsTableContent';
+
+export const TableTileHeader = JSX<TariffsTableRowHeader>(({ title, icon }) => {
+  return (
+    <div className="flex gap-2.5 mb-2">
+      {title ? <Heading headingType="h3" className="font-medium" title={title} /> : null}
+      {icon ? (
+        <Icon className="ml-auto max-w-6 max-h-6" name={icon} width="24px" height="24px" />
+      ) : null}
+    </div>
+  );
+});

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

@@ -1,5 +1,7 @@
 {
   "title": "Заголовок",
+  "description": "Описание",
+  "orientation": "vertical",
   "rowHeaders": [
     {
       "title": "Параметр 1",
@@ -73,7 +75,11 @@
           },
           {
             "list": {
-              "items": ["item 1", "item 2", "item 3"]
+              "items": [
+                "item 1",
+                "item 2",
+                "item 3"
+              ]
             }
           }
         ]

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

@@ -1,78 +1,54 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useComparisonTableScroll } from '../../hooks/useComparisonTableScroll';
 import type { UniBlockProps } from '../../types';
-import { ArrowButton } from '../../ui-kit/Button/ArrowButton';
+import type {
+  TariffsTableCellData,
+  TariffsTableColumn,
+  TariffsTableContent,
+  TariffsTableRowHeader,
+} from './TariffsTableContent';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { COLS_LENGTH_FOR_SCROLL } from './constants';
-import type { TariffsTableContent } from './TariffsTableContent';
-import { TariffsTableRow } from './TariffsTableRow';
+import { TariffsTableVertical } from './TariffsTableVertical';
+import { TariffsTableHorizontal } from './TariffsTableHorizontal';
 
 export interface TariffsTableProps extends TariffsTableContent, UniBlockProps {}
 
 export const TariffsTable = JSX<TariffsTableProps>(
-  ({ className, context, title, rowHeaders, columns }) => {
-    const [activeCardIndex, setActiveCardIndex] = context.useState(0);
-
-    const colData = columns?.map(({ data }) => data) || [];
-    const rowData = rowHeaders?.map((header, i) => ({
-      header,
-      data: colData.map((col) => col?.[i] || [{}]),
-    }));
-
-    const { nextClick, prevClick, isScrollAvailable, showNextButton, showPrevButton } =
-      useComparisonTableScroll({
-        colData,
-        colsLengthForScroll: COLS_LENGTH_FOR_SCROLL,
-        activeCardIndex,
-        setActiveCardIndex,
-      });
+  ({ className, context, title, description, columns, rowHeaders, orientation = 'vertical' }) => {
+    const colData = getColData(columns);
+    const tiles = getTiles(rowHeaders, colData);
 
     return (
-      <section
-        className={`bg-white font-sans py-[50px] pl-[50px] overflow-hidden text-primary-text relative ${
-          className || ''
-        }`}
-      >
-        <Heading
-          headingType="h2"
-          className="max-w-[47rem] text-center mb-9 mx-auto"
-          title={title}
-        />
-        <div role="table">
-          {rowData?.length ? (
-            <div className="relative">
-              {rowData.map((row, i, { length }) => (
-                <TariffsTableRow
-                  key={String(i)}
-                  row={row}
-                  isLastRow={i + 1 === length}
-                  activeCardIndex={activeCardIndex}
-                />
-              ))}
-              {isScrollAvailable ? (
-                <div>
-                  <div className="absolute top-7 right-7 z-10">
-                    <ArrowButton
-                      onClick={nextClick}
-                      disabled={!showNextButton}
-                      ariaLabel="Пролистать вправо"
-                    />
-                    <ArrowButton
-                      className="mt-4 rotate-180"
-                      onClick={prevClick}
-                      disabled={!showPrevButton}
-                      ariaLabel="Пролистать влево"
-                    />
-                  </div>
-                </div>
-              ) : null}
-            </div>
-          ) : null}
-          {isScrollAvailable ? (
-            <div className="absolute top-0 right-0 bottom-0 w-[84px] bg-opacity-to-white" />
-          ) : null}
-        </div>
+      <section className={`px-4 py-6 bg-white font-sans text-primary-text ${className}`}>
+        {title ? (
+          <Heading
+            headingType="h2"
+            className={`text-center ${description ? 'mb-2' : 'mb-5'}`}
+            title={title}
+          />
+        ) : null}
+        {description ? <div className="mb-5 text-center text-m-md">{description}</div> : null}
+        {tiles?.length ? renderOrientationTable(orientation, tiles, context) : null}
       </section>
     );
   },
 );
+
+function renderOrientationTable(orientation, tiles, context) {
+  return orientation === 'vertical' ? (
+    <TariffsTableVertical tiles={tiles} />
+  ) : (
+    <TariffsTableHorizontal context={context} tiles={tiles} />
+  );
+}
+
+const getColData = (columns: TariffsTableColumn[] | undefined) =>
+  columns?.[0].data ? columns[0].data : [];
+
+const getTiles = (
+  rowHeaders: TariffsTableRowHeader[] | undefined,
+  colData: TariffsTableCellData[][],
+) =>
+  rowHeaders?.map((header, i) => ({
+    header,
+    data: colData?.[i] || [{}],
+  }));

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

@@ -17,7 +17,7 @@ export const TariffsTableCell = JSX<TariffsTableCellProps>(({ cell, isLastRow })
 
   return (
     <div className={cellWrapperClasses} role="cell">
-      <div>{cell.map((item, i) => renderCellInner(item, i))}</div>
+      <div>{cell.map(renderCellInner)}</div>
     </div>
   );
 });
@@ -30,8 +30,8 @@ const renderCellInner = (
     {i > 0 && (
       <div className="border-main-divider border border-solid border-t-0 border-x-0 my-4" />
     )}
-    {label && <div className="text-xl font-medium m-0">{label}</div>}
-    {description && <div className="text-sm text-secondary-text">{description}</div>}
+    {label ? <div className="text-xl font-medium m-0">{label}</div> : null}
+    {description ? <div className="text-sm text-secondary-text">{description}</div> : null}
     {list?.items?.length ? (
       <div className="flex flex-col justify-between items-start">
         <div role="list">

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

@@ -1,7 +1,11 @@
 import type { IconName } from '../../icons/IconName';
-import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-import type { CellData, RowHeader } from '../ComparisonTable/ComparisonTableContent';
+import type { CellData } from '../ComparisonTable/ComparisonTableContent';
+import type { ListOrientation } from '../../model/ListOrientation';
+import type { ImageContent } from '../../ui-kit/Img/ImgProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ListContent } from '../../ui-kit/List/ListContent';
+import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
+import type { DescriptionContent } from '../../ui-kit/Description/DescriptionContent';
 
 /**
  * @title Ряд
@@ -22,38 +26,42 @@ export interface TariffsTableColumn {
 /**
  * @title Список
  */
-export interface TariffsTableList {
+export type TariffsTableList = ListContent & {
   /** @title Маркеры */
   isDotted?: boolean;
-  /** @title Элементы списка */
-  items?: string[];
-}
+};
 
 /**
  * @title Ячейка
  */
-export interface TariffsTableCellData extends CellData {
-  list?: TariffsTableList;
-  image?: Picture;
-  /** @title Кнопки */
-  buttons?: ButtonWithIconProps[];
-}
+export type TariffsTableCellData = CellData &
+  ImageContent &
+  ButtonContent & {
+    list?: TariffsTableList;
+  };
 
 /**
  * @title Параметр
  */
-export interface TariffsTableRowHeader extends RowHeader {
+export type TariffsTableRowHeader = HeadingContent & {
   icon?: IconName;
-}
+};
 
 /**
  * @title Таблица тарифов
  */
-export interface TariffsTableContent {
-  /** @title Заголовок */
-  title?: string;
-  /** @title Колонки */
-  columns?: TariffsTableColumn[];
-  /** @title Параметры */
-  rowHeaders?: TariffsTableRowHeader[];
-}
+export type TariffsTableContent = HeadingContent &
+  DescriptionContent & {
+    /** @title Колонки */
+    columns?: TariffsTableColumn[];
+    /** @title Параметры */
+    rowHeaders?: TariffsTableRowHeader[];
+    /** @title Направление таблицы (моб.) */
+    orientation?: ListOrientation;
+  };
+
+/** @hidden */
+export type TariffsTableTileCellProps = {
+  header: TariffsTableRowHeader;
+  data: TariffsTableCellData[];
+};

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

@@ -0,0 +1,16 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
+import { TariffsTableTileCell } from './TariffsTableTileCell';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
+import type { TariffsTableTileCellProps } from './TariffsTableContent';
+
+export const TariffsTableHorizontal = JSX<{
+  context: ContentPageContext;
+  tiles: TariffsTableTileCellProps[];
+}>(({ tiles, context }) => (
+  <SwipeListControl context={context}>
+    {tiles.map((tile, i) => (
+      <TariffsTableTileCell key={String(i)} {...tile} />
+    ))}
+  </SwipeListControl>
+));

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

@@ -0,0 +1,61 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { TableTileHeader } from './TableTileHeader';
+import { BlockItem } from '../../ui-kit/BlockItem/BlockItem';
+import { Img } from '../../ui-kit/Img/Img';
+import { Button } from '../../ui-kit/Button/Button';
+import { Icon } from '../../ui-kit/Icon/Icon';
+import type { TariffsTableCellData, TariffsTableTileCellProps } from './TariffsTableContent';
+
+export const TariffsTableTileCell = JSX<TariffsTableTileCellProps>(({ header, data }) => {
+  return (
+    <div className="rounded-md border-main-stroke h-full box-border border p-4">
+      <TableTileHeader {...header} />
+      {data?.length ? data.map(renderCellInner) : null}
+    </div>
+  );
+});
+
+const renderCellInner = (
+  { label, description, list, image, buttons }: TariffsTableCellData,
+  i: number,
+) => (
+  <div key={String(i)}>
+    {i > 0 && (
+      <div className="border-main-divider border border-solid border-t-0 border-x-0 my-2" />
+    )}
+    {label ? <div className="text-m-sm m-0">{label}</div> : null}
+    {description ? (
+      <div className="text-m-sm text-secondary-text mt-[3px]">{description}</div>
+    ) : null}
+    {list?.items?.length ? (
+      <div className="flex flex-col justify-between items-start">
+        <div role="list">
+          {list.items.map((text, idx) => (
+            <BlockItem
+              className="text-m-sm"
+              key={String(idx)}
+              text={text}
+              version="gray"
+              isDotted={list.isDotted ?? true}
+            />
+          ))}
+        </div>
+      </div>
+    ) : null}
+    {image && <Img image={{ ...image, className: 'm-0' }} />}
+    {buttons?.length ? (
+      <div>
+        {buttons.map(({ icon, rounded, ...buttonProps }, idx) => (
+          <Button
+            className={`mt-3 ${idx > 0 && rounded ? 'ml-2.5' : ''} ${icon ? 'w-12 h-12' : ''}`}
+            key={String(idx)}
+            rounded={rounded}
+            appendLeft={icon && <Icon name={icon} width="24px" height="24px" asSVG />}
+            {...buttonProps}
+            aria-label={icon}
+          />
+        ))}
+      </div>
+    ) : null}
+  </div>
+);

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

@@ -0,0 +1,11 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { TariffsTableTileCell } from './TariffsTableTileCell';
+import type { TariffsTableTileCellProps } from './TariffsTableContent';
+
+export const TariffsTableVertical = JSX<{ tiles: TariffsTableTileCellProps[] }>(({ tiles }) => (
+  <div className="flex flex-col gap-3.5">
+    {tiles.map((tile, i) => (
+      <TariffsTableTileCell key={String(i)} {...tile} />
+    ))}
+  </div>
+));

package/mobile/src/components/TextBlock/TextBlock.tsx

@@ -55,10 +55,10 @@ export const TextBlock = JSX<TextBlockProps>(
           ) : null}
           {items?.length ? (
             <List
+              className="mt-1"
               items={items}
               isDotted={isDotted}
-              version="gray"
-              className="mt-1 text-m-sm text-secondary-text"
+              version={blockVersion.indexOf('secondary') !== -1 ? 'secondary' : 'gray'}
             />
           ) : null}
         </div>

package/mobile/src/hooks/useTableArrowScrollControl.ts

@@ -0,0 +1,22 @@
+import type { TableArrowScrollControlProps } from '../ui-kit/TableArrowScrollControl/TableArrowScrollControlProps';
+
+export const useTableArrowScrollControl = ({
+  columnsLength,
+  colsLengthForScroll,
+  activeCardIndex,
+  setActiveCardIndex,
+}: {
+  columnsLength: number;
+  colsLengthForScroll: number;
+  activeCardIndex: number;
+  setActiveCardIndex: (_: number) => void;
+}): Required<TableArrowScrollControlProps> => {
+  const onNextClick = () => setActiveCardIndex(activeCardIndex + 1);
+  const onPrevClick = () => setActiveCardIndex(activeCardIndex - 1);
+
+  const isScrollAvailable = columnsLength > colsLengthForScroll;
+  const showNextButton = isScrollAvailable && columnsLength - activeCardIndex > colsLengthForScroll;
+  const showPrevButton = Boolean(isScrollAvailable && activeCardIndex > 0);
+
+  return { onNextClick, onPrevClick, isScrollAvailable, showNextButton, showPrevButton };
+};

package/mobile/src/model/ListOrientation.ts

@@ -0,0 +1,8 @@
+/**
+ * @title Направление списка
+ * @enumNames [
+ *    "Вертикально",
+ *    "Горизонтально",
+ *    ]
+ */
+export type ListOrientation = 'vertical' | 'horizontal';

package/mobile/src/model/SitemapProps.ts

@@ -1,4 +1,5 @@
 import type { LinkProps } from './LinkProps';
+import { IconName } from '../icons/IconName';
 
 /**
  * @title Меню
@@ -9,7 +10,18 @@ export interface TopMenuItem extends LinkProps {
   items?: LinkProps[];
 }
 
+/**
+ * @title Ссылка дополнительного меню
+ * @required ["text", "href"]
+ */
+export interface DispositionItem extends LinkProps {
+  /** @hidden */
+  icon?: IconName;
+}
+
 export interface SitemapProps {
   /** @title Дополнительное меню */
   topItems?: TopMenuItem[];
+  /** @title Дополнительное меню */
+  dispositions?: DispositionItem[];
 }

package/mobile/src/services/sitemap/SitemapProps.ts

@@ -1,4 +1,5 @@
 import type { LinkProps } from '../../model/LinkProps';
+import { IconName } from '../../icons/IconName';
 
 /**
  * @title Ссылка
@@ -9,7 +10,18 @@ export interface TopMenuItem extends LinkProps {
   items?: LinkProps[];
 }
 
+/**
+ * @title Ссылка дополнительного меню
+ * @required ["text", "href"]
+ */
+export interface DispositionItem extends LinkProps {
+  /** @hidden */
+  icon?: IconName;
+}
+
 export interface SitemapProps {
-  /** @title Дополнительное меню */
+  /** @title Основное меню */
   topItems?: TopMenuItem[];
+  /** @title Дополнительное меню */
+  dispositions?: DispositionItem[];
 }

package/mobile/src/ui-kit/Button/ButtonInner.tsx

@@ -6,32 +6,36 @@ interface ButtonInnerProps extends ButtonWithIconProps {
   version?: ButtonVersion;
 }
 
-export const ButtonInner = JSX<ButtonInnerProps>(
-  ({ text, aboveText, appendLeft, rounded, version }) => {
-    const withoutText = !text && !aboveText && Boolean(appendLeft);
-
-    const buttonInnerClasses =
-      version !== 'link'
-        ? `flex items-center justify-center
-          ${withoutText ? 'h-12 w-12' : `px-8 gap-2 ${aboveText ? 'py-2' : 'py-3.5'}`} ${
-            rounded ? 'rounded-full' : ''
-          }`
-        : null;
-
-    return renderButtonInner({ buttonInnerClasses, appendLeft, withoutText, aboveText, text });
-  },
-);
-
-function renderButtonInner({ buttonInnerClasses, appendLeft, withoutText, aboveText, text }) {
+export const ButtonInner = JSX<ButtonInnerProps>((props) => {
+  const { text, aboveText, appendLeft } = props;
   return (
-    <div className={buttonInnerClasses}>
+    <div className={getButtonStyle(props)}>
       {appendLeft ? appendLeft : null}
-      {withoutText ? null : (
+      {isWithText(props) ? (
         <div>
           <div className="text-m-2xs text-left">{aboveText}</div>
           <div className="text-m-button font-medium text-left">{text}</div>
         </div>
-      )}
+      ) : null}
     </div>
   );
-}
+});
+
+const getButtonStyle = (props: ButtonInnerProps) => {
+  const { version, aboveText, rounded } = props;
+
+  if (version === 'link') {
+    return '';
+  }
+
+  const withTextStyle = `px-8 gap-2 ${aboveText ? 'py-2' : 'py-3.5'}`;
+
+  return [
+    'flex items-center justify-center',
+    isWithText(props) ? withTextStyle : 'h-12 w-12',
+    rounded ? 'rounded-full' : '',
+  ].join(' ');
+};
+
+const isWithText = ({ text, aboveText, appendLeft }: ButtonInnerProps) =>
+  Boolean(text || aboveText || !appendLeft);

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

@@ -1,15 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ImgSource } from '../../model/Picture';
-import { ImageProps } from './ImgProps';
+import type { Picture, ImgSource } from '../../model/Picture';
 
-export const Img = JSX<ImageProps>(({ className = '', image }) => {
+export interface ImageProps {
+  className?: string;
+  imageClassName?: string;
+  image: Picture;
+}
+
+export const Img = JSX<ImageProps>(({ className = '', image, imageClassName }) => {
   if (!image) {
     return null;
   }
-  const style = {
-    width: image.size?.width ? `${image.size?.width}px` : '100%',
-    height: image.size?.height ? `${image.size?.height}px` : '100%',
-  };
 
   return (
     <picture className={className}>
@@ -18,18 +19,31 @@ export const Img = JSX<ImageProps>(({ className = '', image }) => {
             <source key={`${index}_${src}`} srcSet={src} type={formatToMimeType(format)} />
           ))
         : null}
-      <img
-        src={image.src}
-        className={`m-auto ${image.className || ''}`}
-        alt={image.alt || image.title}
-        title={image.title}
-        style={style}
-        {...image.size}
-      />
+      {renderImg(image, imageClassName)}
     </picture>
   );
 });
 
+const renderImg = (image, imageClassName = '') => {
+  const style = {
+    width: image.size?.width ? `${image.size?.width}px` : '100%',
+    height: image.size?.height ? `${image.size?.height}px` : '100%',
+  };
+  const title = image.title || '';
+  const alt = image.alt || image.title;
+
+  return (
+    <img
+      src={image.src}
+      className={`m-auto ${imageClassName}`}
+      alt={alt}
+      title={title}
+      style={style}
+      {...image.size}
+    />
+  );
+};
+
 export function formatToMimeType(format: ImgSource['format']): string | undefined {
   return format ? `image/${String(format)}` : undefined;
 }

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

@@ -2,9 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { DEFAULT_GAP, DEFAULT_PADDING } from './constants';
 import { SwipeListControlDots } from './SwipeListControlDots';
 import { SwipeListControlList } from './SwipeListControlList';
-import type { SwipeListControlProps } from './SwipeListControlProps';
 import { getIndexParts } from './utils/getIndexParts';
 import { getScrollPoints } from './utils/getScrollPoints';
+import type { SwipeListControlProps } from './SwipeListControlProps';
 
 export const SwipeListControl = JSX<SwipeListControlProps>(
   ({
@@ -19,6 +19,13 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
     const [activeIndex, setActiveIndex] = context.useState<number>(0);
     const [indexFraction, setIndexFraction] = context.useState<number>(0);
 
+    const dotsProps = {
+      activeIndex,
+      indexFraction,
+      showDots,
+      children,
+    };
+
     const handleScroll = (e: UIEvent) => {
       const { scrollLeft, clientWidth, childElementCount, scrollWidth, children } =
         e.currentTarget as HTMLElement;
@@ -45,26 +52,16 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
 
     return (
       <div className={className}>
-        {renderSwipeList({ gap, padding, activeIndex, handleScroll, children })}
-        {renderSwipelistDots({ activeIndex, indexFraction, showDots, children })}
+        <SwipeListControlList
+          gap={gap}
+          padding={padding}
+          activeIndex={activeIndex}
+          onScroll={handleScroll}
+        >
+          {children}
+        </SwipeListControlList>
+        <SwipeListControlDots {...dotsProps} />
       </div>
     );
   },
 );
-
-const renderSwipeList = ({ gap, padding, activeIndex, handleScroll, children }) => (
-  <SwipeListControlList
-    gap={gap}
-    padding={padding}
-    activeIndex={activeIndex}
-    onScroll={handleScroll}
-  >
-    {children}
-  </SwipeListControlList>
-);
-
-const renderSwipelistDots = ({ activeIndex, indexFraction, showDots, children }) => (
-  <SwipeListControlDots activeIndex={activeIndex} indexFraction={indexFraction} showDots={showDots}>
-    {children}
-  </SwipeListControlDots>
-);

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlDots.tsx

@@ -14,11 +14,23 @@ export interface SwipeListControlDotsProps {
 
 export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
   ({ children, activeIndex, indexFraction, showDots }) => {
+    const handleClick = (idx: number) => (e: Event) => {
+      if (idx === activeIndex) {
+        return;
+      }
+
+      const contentContainer = (e.currentTarget as HTMLElement).parentElement
+        ?.previousElementSibling;
+
+      contentContainer?.children[idx]?.scrollIntoView({ behavior: 'smooth' });
+    };
+
     return showDots && children?.length ? (
       <div className="flex gap-2 mx-auto mt-5 w-fit">
         {children?.map((_, idx) => (
           <div
             key={String(idx)}
+            onClick={handleClick(idx)}
             className={`${DOT_STYLES}`}
             style={getDotStyles(idx, activeIndex, indexFraction)}
             aria-hidden