@redneckz/wildless-cms-uni-blocks 0.3.22 → 0.3.25

package/src/components/OtherProducts/OtherProductsItem.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useActiveHandler } from './utils/useActiveHandler';
+import { useActiveHandler } from './useActiveHandler';
 import type { UniBlockProps } from '../../types';
 import type { blockItemCommonProps } from './OtherProductsContent';
 import { Icon } from '../../ui-kit/Icon/Icon';
@@ -7,30 +7,32 @@ import { OtherProductsItemInner } from './OtherProductsItemInner';
 
 export interface BlockItemProps extends blockItemCommonProps, UniBlockProps {}
 
-export const OtherProductsItem = JSX<BlockItemProps>(({ label, blocks, columns, context }) => {
-  const { hasContent, icon, handleToggle, isActive } = useActiveHandler({
-    context,
-    blocks,
-  });
+export const OtherProductsItem = JSX<BlockItemProps>(
+  ({ label, isExpanded, blocks, columns, context }) => {
+    const { hasContent, icon, handleToggle, isActive } = useActiveHandler({
+      context,
+      blocks,
+      initialState: isExpanded,
+    });
 
-  return (
-    <div className="border-0 border-b border-solid border-main-divider">
-      {hasContent ? (
-        <OtherProductsItemInner
-          columns={columns}
-          blocks={blocks}
-          context={context}
-          isActive={isActive}
-        />
-      ) : null}
-      <button
-        className={`border-none bg-primary-main px-0 py-[25px] text-center w-full font-sans text-white text-base
-        ${hasContent ? 'group cursor-pointer' : ''}`}
-        onClick={handleToggle}
-      >
-        <span className="pr-3">{isActive ? 'Скрыть' : label}</span>
-        {hasContent ? <Icon name={icon} width="20" height="20" asSVG /> : null}
-      </button>
-    </div>
-  );
-});
+    return (
+      <div className="border-0 border-b border-solid border-main-divider">
+        {hasContent ? (
+          <OtherProductsItemInner
+            isExpanded={isActive}
+            columns={columns}
+            blocks={blocks}
+            context={context}
+          />
+        ) : null}
+        <button
+          className="border-none bg-primary-main px-0 py-[26px] w-full font-sans text-white text-base flex justify-center cursor-pointer"
+          onClick={handleToggle}
+        >
+          <span className="pr-3">{isActive ? 'Скрыть' : label}</span>
+          {hasContent ? <Icon name={icon} width="20" height="20" asSVG /> : null}
+        </button>
+      </div>
+    );
+  },
+);

package/{mobile/src/components/OtherProducts/utils → src/components/OtherProducts}/useActiveHandler.ts

@@ -1,7 +1,8 @@
-import type { IconName } from '../../../icons/IconName';
+import type { IconName } from '../../icons/IconName';
+import { ActiveHandler } from '../../ui-kit/BlocksList/BlocksListProps';
 
-export const useActiveHandler = ({ context, blocks }) => {
-  const [isActive, setIsActive] = context.useState(false);
+export const useActiveHandler = ({ context, blocks, initialState = false }: ActiveHandler) => {
+  const [isActive, setIsActive] = context.useState(initialState);
   const hasContent = blocks?.length;
   const icon: IconName = isActive ? 'ArrowUpIcon' : 'ArrowDownIcon';
 

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

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

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

@@ -4,6 +4,11 @@ import { ProductBlock } from './ProductBlock';
 import { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 
+const title = 'Кредит до 5 000 000 Р\nбез залога и поручителей';
+const description =
+  'Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт.';
+const label = 'Самое лучшее предложение';
+
 const image: Picture = {
   src: 'money-1.png',
   format: 'webp',
@@ -20,7 +25,7 @@ const image: Picture = {
   ],
 };
 
-const benefits = [
+const benefits: Benefit[] = [
   {
     label: 'До 5 млн ₽',
     description: 'Кредитный лимит',
@@ -38,7 +43,7 @@ const benefits = [
   },
 ];
 
-const buttons = [
+const buttons: ButtonWithIconProps[] = [
   {
     href: 'https://rshb.ru',
     text: 'Оформить карту',
@@ -51,7 +56,7 @@ const buttons = [
     target: '_blank',
     version: 'secondary',
   },
-] as ButtonWithIconProps;
+];
 
 const items = [
   'Совершайте любые личные покупки',
@@ -59,30 +64,61 @@ const items = [
   'Расходы для бизнеса на УСН 15% позволят снизить налоговую базу',
 ];
 
+const props = { title, description, image, buttons };
+
 export default {
   default: (
+    <div className="container grid grid-cols-12">
+      <ProductBlock className="col-span-12" context={context} {...props} benefits={benefits} />
+    </div>
+  ),
+  items: (
+    <div className="container grid grid-cols-12">
+      <ProductBlock className="col-span-12" context={context} {...props} items={items} />
+    </div>
+  ),
+  'primary with label': (
     <div className="container grid grid-cols-12">
       <ProductBlock
         className="col-span-12"
         context={context}
-        title={'Кредит до 5 000 000 Р\nбез залога и поручителей'}
-        description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
-        benefits={benefits as Benefit[]}
-        buttons={buttons as ButtonWithIconProps[]}
-        image={image}
+        {...props}
+        benefits={benefits}
+        label={label}
       />
     </div>
   ),
-  items: (
+  secondary: (
     <div className="container grid grid-cols-12">
       <ProductBlock
         className="col-span-12"
         context={context}
-        title={'Кредит до 5 000 000 Р\nбез залога и поручителей'}
-        description="Кредит наличными без залога и поручительства. Потребительский кредит на любые цели. Нужен только паспорт."
+        {...props}
+        benefits={benefits}
+        version="secondary"
+      />
+    </div>
+  ),
+  'secondary with items': (
+    <div className="container grid grid-cols-12">
+      <ProductBlock
+        className="col-span-12"
+        context={context}
+        {...props}
         items={items}
-        buttons={buttons as ButtonWithIconProps[]}
-        image={image}
+        version="secondary"
+      />
+    </div>
+  ),
+  'secondary with label': (
+    <div className="container grid grid-cols-12">
+      <ProductBlock
+        className="col-span-12"
+        context={context}
+        {...props}
+        benefits={benefits}
+        label={label}
+        version="secondary"
       />
     </div>
   ),

package/src/components/ProductBlock/ProductBlock.mobile.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/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/src/components/ProductBlock/ProductBlockInner.mobile.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/src/components/ProductBlock/ProductBlockInner.tsx

@@ -23,6 +23,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
     image,
     items,
     version = 'primary',
+    isDotted = true,
     textBlockClassName = '',
   }) => {
     const textColor = version === 'secondary' ? 'text-white' : '';
@@ -43,7 +44,13 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
               </div>
             ) : null}
             {items?.length ? (
-              <List className="mt-5" items={items} itemClassName="mb-[10px]" version={version} />
+              <List
+                className="mt-5"
+                items={items}
+                itemClassName="mb-[10px]"
+                version={version}
+                isDotted={isDotted}
+              />
             ) : null}
           </BaseTile>
         </div>

package/src/components/ProductBlock/renderBenefit.mobile.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/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/src/components/TariffsTable/TariffsTable.mobile.tsx

@@ -18,7 +18,9 @@ export const TariffsTable = JSX<TariffsTableProps>(
     const tiles = getTiles(rowHeaders, colData);
 
     return (
-      <section className={`px-4 py-6 bg-white font-sans text-primary-text ${className}`}>
+      <section
+        className={`px-4 py-6 bg-white font-sans text-primary-text overflow-x-hidden ${className}`}
+      >
         {title ? (
           <Heading
             headingType="h2"

package/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/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/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/src/components/TextBlock/TextBlock.example.json

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

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

@@ -75,6 +75,14 @@ export default {
               iconVersion="small"
               items={items}
             />
+            <TextBlock
+              context={mobileContext}
+              title="Все карты Россельхозбанка работают"
+              description="Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу"
+              blockVersion="secondary-light"
+              iconVersion="small"
+              items={items}
+            />
           </div>
         </div>
         <div>

package/src/components/TextBlock/TextBlock.mobile.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/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/src/content-page-repository/transformPicture.ts

@@ -13,8 +13,9 @@ export async function transformPicture(
   options: TransformationOptions,
 ): Promise<Picture> {
   const sources = picture.sources || [];
+  const src = picture?.src || '';
   const [transformedPicture, ...transformedSources] = await Promise.all(
-    [picture].concat(sources).map((_) => transformImg(pagePath, picture.src, { ...options, ..._ })),
+    [picture].concat(sources).map((_) => transformImg(pagePath, src, { ...options, ..._ })),
   );
   return {
     ...picture,

package/src/model/Picture.ts

@@ -1,6 +1,6 @@
 export interface Img {
   /** @title Картинка */
-  src: string;
+  src?: string;
   /** @title Альтернативный текст (alt) */
   alt?: string;
   /** @title Текст подсказки (title) */
@@ -9,7 +9,7 @@ export interface Img {
 
 export interface ImgSource {
   /** @title Картинка */
-  src: string;
+  src?: string;
   /** @title Формат */
   format?: 'jpeg' | 'jpg' | 'png' | 'gif' | 'webp' | 'heif' | 'avif';
   /** @hidden */