@redneckz/wildless-cms-uni-blocks 0.3.23 → 0.3.24

package/mobile/src/components/Gallery/GalleryCardInner.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion } from '../../model/BlockVersion';
-import { BlockItem } from '../../ui-kit/BlockItem/BlockItem';
 import { Button } from '../../ui-kit/Button/Button';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { Img } from '../../ui-kit/Img/Img';
-import type { GalleryCard } from './GalleryContent';
+import { List } from '../../ui-kit/List/List';
+import type { GalleryCard, GalleryItem } from './GalleryContent';
+import type { BlockVersion } from '../../model/BlockVersion';
 
 export const GalleryCardInner = JSX<GalleryCard>(
   ({ title, description, image, items, button, version }) => {
@@ -43,21 +43,16 @@ function renderCardTitle(title: string, className: string) {
   return <div className={`font-medium text-xl m-0 ${className}`}>{title}</div>;
 }
 
-function renderItems(items, version) {
+function renderItems(items: GalleryItem[], version: BlockVersion = 'primary') {
   return (
-    <section className={`max-w-[308px] mt-2`} role="list">
-      {items
-        .filter((item) => item?.text)
-        .map((item, i) => renderItem(item.text as string, i, version))}
-    </section>
-  );
-}
-
-function renderItem(item: string, i: number, version?: BlockVersion) {
-  return (
-    <BlockItem key={String(i)} version={version ?? 'primary'}>
-      <span className="text-sm">{item}</span>
-    </BlockItem>
+    <List
+      className={`max-w-[308px] mt-2 text-sm ${
+        version === 'primary' ? '!text-secondary-text' : ''
+      }`}
+      itemClassName="mt-1 first:mt-0"
+      items={items.filter((item) => item?.text).map((item) => item.text as string)}
+      version={version}
+    />
   );
 }
 

package/mobile/src/components/Gallery/GalleryContent.ts

@@ -1,6 +1,7 @@
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { Picture } from '../../model/Picture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ListOrientation } from '../../model/ListOrientation';
 
 /**
  * @title Элемент списка
@@ -41,6 +42,6 @@ export interface GalleryContent {
    * @minItems 3
    */
   cards?: GalleryCard[];
-  /** @title Горизонтальная прокрутка (для мобильных прокрутка shift+mouseScroll) */
-  isScroll?: boolean; //TODO: for mobile
+  /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
+  useSwiper?: ListOrientation; //TODO: for mobile
 }

package/mobile/src/components/LinkDocs/LinkDocsContent.ts

@@ -1,6 +1,7 @@
 import type { LinkProps } from '../../model/LinkProps';
 import type { IconName } from '../../ui-kit/Icon/IconProps';
 import type { AlignType } from '../BaseTile/BaseTileProps';
+import type { ListOrientation } from '../../model/ListOrientation';
 
 /**
  * @title Отображение списка
@@ -11,15 +12,6 @@ import type { AlignType } from '../BaseTile/BaseTileProps';
  */
 export type LinkColumnsMode = 'single' | 'double';
 
-/**
- * @title Отображение списка (моб.)
- * @enumNames [
- *    "Вертикально",
- *    "Горизонтально",
- *    ]
- */
-export type LinkListMode = 'vertical' | 'horizontal';
-
 /**
  * @title Элемент списка
  */
@@ -41,7 +33,8 @@ export interface LinkDocsContent {
   /** @title Список */
   documents?: LinkDocsItem[];
   columnsMode?: LinkColumnsMode;
-  listMode?: LinkListMode; // TODO: мобильный проп
+  /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
+  listMode?: ListOrientation; // TODO: мобильный проп
   /** @title Рамка элементов (моб.) */ // TODO: мобильный проп
   hasBorder?: boolean;
   align?: AlignType;

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

@@ -9,6 +9,7 @@
     }
   },
   "items": ["Элемент списка 1", "Элемент списка 2", "Элемент списка 3"],
+  "isDotted": true,
   "buttons": [
     {
       "text": "Кнопка",

package/mobile/src/components/ProductBlock/ProductBlock.tsx

@@ -1,18 +1,23 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { ProductBlockInner } from './ProductBlockInner';
 import type { UniBlockProps } from '../../types';
 import type { ProductBlockContent } from './ProductBlockContent';
-import { ProductBlockInner } from './ProductBlockInner';
+import type { BlockVersion } from '../../model/BlockVersion';
+
+const productBlockStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
 
 export interface ProductBlockProps extends ProductBlockContent, UniBlockProps {}
 
-export const ProductBlock = JSX<ProductBlockProps>(
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  (props /* Get rid of image and benefits */) => {
-    const { className } = props;
-    return (
-      <section className={`font-sans bg-white px-4 py-6 ${className || ''}`}>
-        <ProductBlockInner {...props} />
-      </section>
-    );
-  },
-);
+export const ProductBlock = JSX<ProductBlockProps>((props /* Get rid of image and benefits */) => {
+  const { className = '', version = 'primary' } = props;
+  return (
+    <section
+      className={`font-sans bg-white px-4 py-6 ${productBlockStyleMap[version]} ${className}`}
+    >
+      <ProductBlockInner {...props} />
+    </section>
+  );
+});

package/mobile/src/components/ProductBlock/ProductBlockContent.ts

@@ -20,6 +20,10 @@ export type ProductBlockInnerContent = HeadingContent &
      */
     benefits?: Benefit[];
     version?: BlockVersion;
+    /** @title Буллиты */
+    isDotted?: boolean;
+    /** @title Лейбл (моб.) */
+    label?: string;
     /**
      * @title Стиль для текстовой части
      * @hidden

package/mobile/src/components/ProductBlock/ProductBlockInner.tsx

@@ -7,6 +7,7 @@ import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import { BaseTile } from '../BaseTile/BaseTile';
 import type { ProductBlockInnerContent } from './ProductBlockContent';
+import type { BlockVersion } from '../../model/BlockVersion';
 import { renderBenefit } from './renderBenefit';
 
 export type ProductBlockInnerProps = ProductBlockInnerContent & UniBlockProps;
@@ -23,10 +24,13 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
     image,
     items,
     version = 'primary',
+    isDotted = true,
+    label,
   }) => {
     return (
-      <div className={`w-full text-primary-text ${className}`}>
+      <div className={`w-full ${className}`}>
         <div>
+          {label ? renderLabel(label, version) : null}
           <BaseTile
             context={context}
             title={
@@ -54,7 +58,14 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
             {benefits?.filter((items) => items.label)?.length ? (
               <div className="mt-3">{benefits.map((_, i) => renderBenefit(_, i, version))}</div>
             ) : null}
-            {items?.length ? <List className="mt-3" items={items} /> : null}
+            {items?.length ? (
+              <List
+                className="mt-3 text-m-md"
+                items={items}
+                version={version}
+                isDotted={isDotted}
+              />
+            ) : null}
           </BaseTile>
         </div>
         {renderImage(image)}
@@ -65,8 +76,17 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
 
 function renderImage(image) {
   return image?.src ? (
-    <div className="mt-5">
-      <Img image={{ className: 'block', ...image }} />
-    </div>
+    <Img imageClassName="mt-5 mx-auto block" image={{ className: 'block', ...image }} />
   ) : null;
 }
+
+const labelStyleMap: Record<BlockVersion, string> = {
+  primary: 'text-primary-main border-secondary-hover',
+  secondary: 'text-white/80',
+};
+
+const renderLabel = (label: string, version: BlockVersion) => (
+  <div className={`m-xs px-2.5 py-1.5 mb-5 rounded-md border-2 w-fit ${labelStyleMap[version]}`}>
+    {label}
+  </div>
+);

package/mobile/src/components/ProductBlock/renderBenefit.tsx

@@ -11,7 +11,7 @@ const benefitDescStyleMap: Record<BlockVersion, string> = {
   secondary: 'text-white',
 };
 
-export function renderBenefit(benefit: Benefit, i: number, version: string) {
+export function renderBenefit(benefit: Benefit, i: number, version: BlockVersion) {
   return (
     <div key={String(i)} className="flex gap-3 items-center mb-2.5 last:mb-0">
       {benefit.icon && (
@@ -21,6 +21,7 @@ export function renderBenefit(benefit: Benefit, i: number, version: string) {
           width="24"
           height="24"
           asSVG
+          color={version}
         />
       )}
       <div className={`font-medium text-m-title-xs m-0 ${benefitTitleStyleMap[version]}`}>

package/mobile/src/components/ProductGallery/ProductGalleryContent.ts

@@ -27,6 +27,9 @@ export interface ProductGalleryContent {
    * @hidden //! temporary not used
    */
   duration?: number;
-  /** @title Слайды */
+  /**
+   * @title Слайды
+   * @minItems 2
+   */
   slides?: ProductSlide[];
 }

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

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { BlockItem } from '../../ui-kit/BlockItem/BlockItem';
 import { Button } from '../../ui-kit/Button/Button';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { Img } from '../../ui-kit/Img/Img';
-import type { TariffsTableCellData } from './TariffsTableContent';
+import { List } from '../../ui-kit/List/List';
+import type { TariffsTableCellData, TariffsTableList } from './TariffsTableContent';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 export interface TariffsTableCellProps {
   cell: TariffsTableCellData[];
@@ -32,31 +33,31 @@ const renderCellInner = (
     )}
     {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">
-          {list.items.map((text, idx) => (
-            <BlockItem
-              className="text-sm"
-              key={String(idx)}
-              text={text}
-              version="gray"
-              isDotted={list.isDotted ?? true}
-            />
-          ))}
-        </div>
-      </div>
-    ) : null}
+    {list?.items?.length ? renderList(list) : null}
     {image && <Img image={image} />}
-    {buttons?.length
-      ? buttons.map(({ icon, ...buttonProps }, idx) => (
-          <Button
-            className={`${idx > 0 ? 'ml-3' : ''} w-12 h-12`}
-            key={String(idx)}
-            appendLeft={icon && <Icon name={icon} width="24px" height="24px" asSVG />}
-            {...buttonProps}
-          />
-        ))
-      : null}
+    {buttons?.length ? renderButtons(buttons) : null}
+  </div>
+);
+
+const renderList = (list: TariffsTableList) => (
+  <List
+    className="flex flex-col justify-between items-start text-sm"
+    version="gray"
+    items={list.items}
+    isDotted={list.isDotted ?? true}
+  />
+);
+
+const renderButtons = (buttons: ButtonWithIconProps[]) => (
+  <div>
+    {buttons.map(({ icon, rounded, ...buttonProps }, idx) => (
+      <Button
+        className={`${idx > 0 && rounded ? 'ml-3' : ''} w-12 h-12`}
+        key={String(idx)}
+        rounded={rounded}
+        appendLeft={icon && <Icon name={icon} width="24px" height="24px" asSVG />}
+        {...buttonProps}
+      />
+    ))}
   </div>
 );

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

@@ -56,7 +56,7 @@ export type TariffsTableContent = HeadingContent &
     columns?: TariffsTableColumn[];
     /** @title Параметры */
     rowHeaders?: TariffsTableRowHeader[];
-    /** @title Направление таблицы (моб.) */
+    /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
     orientation?: ListOrientation;
   };
 

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

@@ -1,10 +1,15 @@
 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';
+import { List } from '../../ui-kit/List/List';
+import type {
+  TariffsTableCellData,
+  TariffsTableList,
+  TariffsTableTileCellProps,
+} from './TariffsTableContent';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 export const TariffsTableTileCell = JSX<TariffsTableTileCellProps>(({ header, data }) => {
   return (
@@ -27,35 +32,32 @@ const renderCellInner = (
     {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}
+    {list?.items?.length ? renderList(list) : 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}
+    {buttons?.length ? renderButtons(buttons) : null}
+  </div>
+);
+
+const renderList = (list: TariffsTableList) => (
+  <List
+    className="flex flex-col justify-between items-start text-m-sm"
+    version="gray"
+    items={list.items}
+    isDotted={list.isDotted ?? true}
+  />
+);
+
+const renderButtons = (buttons: ButtonWithIconProps[]) => (
+  <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>
 );

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

@@ -9,5 +9,6 @@
       "width": 43,
       "height": 43
     }
-  }
+  },
+  "isDotted": true
 }

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

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

package/mobile/src/components/Tile/Tile.tsx

@@ -70,5 +70,7 @@ export const Tile = JSX<TileProps>((props) => {
 });
 
 function renderList(items, version) {
-  return items?.length ? <List items={items} version={version} /> : null;
+  return items?.length ? (
+    <List items={items} itemClassName="mt-2.5 first:mt-0" version={version} />
+  ) : null;
 }

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

@@ -6,6 +6,7 @@ import { IconTitleMap } from '../../icons/IconName';
 const svgColorsMap: Record<IconColor, string> = {
   none: '',
   primary: 'text-primary-main',
+  secondary: 'text-primary-text',
 };
 
 export const Icon = JSX<IconProps>(
@@ -22,7 +23,12 @@ export const Icon = JSX<IconProps>(
 
     if (asSVG) {
       return (
-        <svg className={`${svgColorsMap[color]} ${className}`} {...imgProps} aria-hidden="true">
+        <svg
+          className={`${svgColorsMap[color]} ${className}`}
+          {...imgProps}
+          aria-hidden="true"
+          style={color === 'secondary' ? { filter: 'invert(1)' } : null}
+        >
           {title ? <title>{title}</title> : null}
           {alt ? <desc>{alt}</desc> : null}
           <use href={`${href}#icon`} xlinkHref={`${href}#icon`} />

package/mobile/src/ui-kit/Icon/IconProps.ts

@@ -4,9 +4,9 @@ export type { IconName };
 
 /**
  * @title Цвет иконки (svg)
- * @enumNames ["Нет", "Основной"]
+ * @enumNames ["Нет", "Основной", "Второстепенный"]
  */
-export type IconColor = 'none' | 'primary';
+export type IconColor = 'none' | 'primary' | 'secondary';
 
 export interface IconProps {
   className?: string;

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

@@ -1,12 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { ListItem } from './ListItem';
-import { ListProps } from './ListProps';
+import type { ListProps, ListItemVersion } from './ListProps';
+
+const TEXT_STYLE_MAP: Record<ListItemVersion, string> = {
+  primary: 'text-primary-text',
+  secondary: 'text-white',
+  gray: 'text-secondary-text',
+};
 
 export const List = JSX<ListProps>((props) => {
-  const { className = '', itemClassName, isDotted, items, version } = props;
+  const { className = '', itemClassName, isDotted, items, version = 'primary' } = props;
 
   return (
-    <section className={`${className}`} role="list">
+    <section className={`${TEXT_STYLE_MAP[version]} ${className}`} role="list">
       {items?.length
         ? items.map((_, i) => (
             <ListItem

package/mobile/src/ui-kit/List/ListItem.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { ListItemVersion } from './ListProps';
+import type { ListItemVersion } from './ListProps';
 
 /**
  * @title Параметры элемента списка
@@ -13,13 +13,7 @@ export interface ListItemProps {
 
 const LIST_STYLE_CLASSES = 'rounded-full inline-block mr-3 mt-2';
 
-const TEXT_STYLE_MAP: Record<ListItemVersion, string> = {
-  primary: 'text-primary-text',
-  secondary: 'text-white',
-  gray: 'text-secondary-text',
-};
-
-const LIST_STYLE_MAP: Record<ListItemVersion, string> = {
+const LIST_DOT_STYLE_MAP: Record<ListItemVersion, string> = {
   primary: 'bg-primary-main',
   secondary: 'bg-white',
   gray: 'bg-secondary-text',
@@ -30,14 +24,13 @@ export const ListItem = JSX<ListItemProps>(
     return (
       <div className={`font-sans flex items-start ${className}`} role="listitem">
         {isDotted && <div className={getListStyle(version)} />}
-        <span className={`text-m-md ${TEXT_STYLE_MAP[version]}`}>{children}</span>
+        <span>{children}</span>
       </div>
     );
   },
 );
 
 const getListStyle = (version: ListItemVersion) => {
-  const size =
-    version === 'gray' ? 'w-[6px] h-[6px] min-w-[6px] min-h-[6px]' : 'w-2 h-2 min-w-2 min-h-2';
-  return `${LIST_STYLE_CLASSES} ${LIST_STYLE_MAP[version]} ${size}`;
+  const size = version === 'gray' ? 'w-1.5 h-1.5 min-w-1.5 min-h-1.5' : 'w-2 h-2 min-w-2 min-h-2';
+  return `${LIST_STYLE_CLASSES} ${LIST_DOT_STYLE_MAP[version]} ${size}`;
 };

package/mobile/src/ui-kit/List/ListProps.ts

@@ -2,6 +2,7 @@ import type { ListContent } from './ListContent';
 
 /**
  * @title Версия списка
+ * @enumNames ["Основной", "Второстепенный", "Серый"]
  */
 export type ListItemVersion = 'primary' | 'secondary' | 'gray';
 
@@ -10,6 +11,7 @@ export type ListItemVersion = 'primary' | 'secondary' | 'gray';
  */
 export interface ListProps extends ListContent {
   className?: string;
+  /** @title Буллиты */
   isDotted?: boolean;
   version?: ListItemVersion;
   itemClassName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ComparisonTable/ComparisonTable.fixture.mobile.tsx

@@ -143,7 +143,7 @@ export default {
         isColoredFirstColumn={true}
         context={context}
         rowHeaders={rowHeaders}
-        useSwiper={true}
+        useSwiper={'horizontal'}
         columns={Array(2).fill(columns).flat()}
         visibleRowLength={2}
       />