@redneckz/wildless-cms-uni-blocks 0.14.531 → 0.14.533

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

@@ -1,32 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type BlockVersion } from '../../model/BlockVersion';
-import { type SizeVersion } from '../../model/SizeVersion';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { Img } from '../../ui-kit/Img/Img';
 import { renderButtonsSection } from '../../ui-kit/LinkButton/renderButtonsSection';
-import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
-import { RichText } from '../../ui-kit/RichText/RichText';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
-import { isIcon } from '../../utils/isIcon';
 import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
-import { getIconTextStyle } from './getIconTextStyle';
-import { type StepProps, type StepsBlockContent } from './StepsBlockContent';
-import { STEPS_BLOCK_STYLE } from './StepsBlockStyleMaps';
-
-type StepIconVersion = Record<'icon' | 'image', string>;
-
-const STEPS_SIZE_MAP: Record<SizeVersion, StepIconVersion> = {
-  normal: { icon: 'h-11 w-11', image: 'h-14 w-14' },
-  small: { icon: 'h-12 w-12', image: 'h-14 w-14' },
-};
-
-const STEPS_TILE_DESCRIPTION_HEIGHT_MAP: Record<SizeVersion, string> = {
-  normal: '',
-  small: 'min-h-6xl',
-};
-
-const styleMap = STEPS_BLOCK_STYLE;
+import { renderStepMobile } from './renderStepMobile';
+import { type StepsBlockContent } from './StepsBlockContent';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
@@ -35,102 +14,35 @@ export const StepsBlock = JSX<StepsBlockProps>(
     className = '',
     title,
     description,
-    steps,
+    steps = [],
     buttons,
-    size = 'normal',
     stepVersion = 'gray',
     version = 'primary',
     ...rest
-  }) => (
-    <BlockWrapper
-      className={style('box-border flex flex-col gap-xl', className)}
-      defaultPadding="p-6xl"
-      version={version}
-      {...rest}
-    >
-      <Headline
-        title={title}
-        description={description}
-        headlineVersion="M"
-        isEmbedded={true}
-        align="text-left"
-      />
-      {steps?.length ? (
-        <div className="box-border">
-          <div className="flex flex-col gap-6xl justify-between">
-            {steps.map(renderStep(size, stepVersion))}
-          </div>
-        </div>
-      ) : null}
-      {renderButtonsSection(buttons, { isVertical: true })}
-    </BlockWrapper>
-  ),
-);
-
-// TODO: Create universal function for this case
-const renderStep = (size: SizeVersion, stepVersion: BlockVersion) => (step: StepProps, i: number) =>
-  (
-    <div key={String(i)} className="contents">
-      <div className="flex flex-row items-center relative">
-        <div className="overflow-hidden flex flex-shrink-0 items-center">
-          {renderIconArea(size, stepVersion)(step, i)}
-        </div>
-        <div
-          className={style(
-            'flex flex-col justify-center h-fit',
-            STEPS_TILE_DESCRIPTION_HEIGHT_MAP[size],
-          )}
-        >
-          {step.label ? (
-            <Paragraph size="text-l" align="text-left">
-              {step.label}
-            </Paragraph>
-          ) : null}
-          {step.description ? (
-            <div className={style('text-s font-light text-left', styleMap.description)}>
-              {step.description}
-            </div>
-          ) : null}
-          <RichText __html={step.__html} />
-        </div>
-      </div>
-    </div>
-  );
-
-const renderIconArea =
-  (size: SizeVersion, stepVersion: BlockVersion) => (step: StepProps, i: number) => {
-    const iconVersion = stepVersion === 'secondary' ? 'white' : 'color';
-    const isImg = Boolean(step?.icon?.src);
-    const iconAreaSize = STEPS_SIZE_MAP[size][isImg ? 'image' : 'icon'];
-    const containerVersion = isImg ? stepVersion === 'transparent' : stepVersion;
+  }) => {
+    const isBigSizeSteps = steps.length > 3;
 
     return (
       <BlockWrapper
-        className={style(iconAreaSize, 'z-10 mr-s flex justify-center content-center rounded-md')}
-        defaultPadding=""
-        version={containerVersion as BlockVersion}
+        className={style('box-border flex flex-col gap-xl', className)}
+        defaultPadding="p-6xl"
+        version={version}
+        {...rest}
       >
-        <span className="flex max-w-full max-h-full items-center justify-center">
-          {isIcon(step?.icon) ? (
-            <Img
-              image={{ ...step.icon, iconVersion: step.icon?.iconVersion || iconVersion }}
-              imageClassName="max-w-full max-h-full"
-              width={getIconSizeStyle(size)}
-              height={getIconSizeStyle(size)}
-            />
-          ) : (
-            <span
-              className={style(
-                'text-h4',
-                stepVersion === 'transparent' ? styleMap.iconText : getIconTextStyle(stepVersion),
-              )}
-            >
-              {i + 1}
-            </span>
-          )}
-        </span>
+        <Headline
+          title={title}
+          description={description}
+          headlineVersion="M"
+          isEmbedded={true}
+          align="text-left"
+        />
+        {steps?.length ? (
+          <div className="flex flex-col gap-6xl justify-between box-border">
+            {steps.map(renderStepMobile(isBigSizeSteps, version, stepVersion))}
+          </div>
+        ) : null}
+        {renderButtonsSection(buttons, { isVertical: true })}
       </BlockWrapper>
     );
-  };
-
-const getIconSizeStyle = (size: string) => (size === 'normal' ? '38' : '24');
+  },
+);

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

@@ -18,6 +18,9 @@
         "icon": {
           "ui:field": "icon"
         },
+        "image": {
+          "ui:field": "picture"
+        },
         "button": {
           "href": {
             "ui:field": "attachmentHref"

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

@@ -2,7 +2,7 @@ import { type BlockVersion } from '../../model/BlockVersion';
 import { type BulletsProps } from '../../model/Bullets';
 import { type DescriptionProps, type LabelProps, type TitleProps } from '../../model/HeadlineType';
 import { type IconProps } from '../../model/Picture';
-import { type SizeVersion } from '../../model/SizeVersion';
+import { type ImageContent } from '../../ui-kit/Img/ImgProps';
 import { type ButtonsSectionContent } from '../../ui-kit/LinkButton/ButtonsSectionContent';
 import { type LinkButtonContent } from '../../ui-kit/LinkButton/LinkButtonContent';
 import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
@@ -12,6 +12,7 @@ import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
  * @title Шаг
  */
 export type StepProps = DescriptionProps &
+  ImageContent &
   LabelProps &
   RichTextProps &
   IconProps &
@@ -34,10 +35,6 @@ export type StepsBlockContent = UniBlockContent &
      * @maxItems 5
      */
     steps?: StepProps[];
-    /**
-     * @title Тема шагов
-     */
+    /** @title Тема шагов */
     stepVersion?: BlockVersion;
-    /** @title Размер шагов */
-    size?: SizeVersion; // TODO: mobile content
   };

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

@@ -0,0 +1,139 @@
+import { type BlockVersion } from '../../model/BlockVersion';
+import { type IconVersion } from '../../model/IconVersion';
+import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { Img } from '../../ui-kit/Img/Img';
+import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
+import { RichText } from '../../ui-kit/RichText/RichText';
+import { isIcon } from '../../utils/isIcon';
+import { style } from '../../utils/style';
+import { getIconTextStyle } from './getIconTextStyle';
+import { type StepProps } from './StepsBlockContent';
+import { STEPS_BLOCK_STYLE } from './StepsBlockStyleMaps';
+
+const styleMap = STEPS_BLOCK_STYLE;
+
+export const renderStepMobile =
+  (stepsSize: boolean, version: BlockVersion, stepVersion: BlockVersion) =>
+  (step: StepProps, i: number) => {
+    const { button, image } = step;
+
+    const styleStepMobile = button?.text && image?.src;
+
+    return (
+      <div key={String(i)} className="contents">
+        <div className={style('flex items-center relative', image?.src ? 'flex-col' : 'flex-row')}>
+          {image?.src ? renderText(step) : null}
+          <div className="overflow-hidden flex flex-shrink-0 items-center">
+            {renderIconArea(stepsSize, stepVersion)(step, i)}
+          </div>
+          <div
+            className={style('flex flex-col justify-center h-fit w-full', {
+              'min-h-6xl': stepsSize,
+            })}
+          >
+            {image?.src ? null : renderText(step)}
+            {styleStepMobile ? (
+              <LinkButton
+                className="box-border py-s w-full max-w-60 mt-lg"
+                version={version as LinkButtonVersion}
+                {...button}
+              >
+                {button?.text}
+              </LinkButton>
+            ) : null}
+          </div>
+        </div>
+      </div>
+    );
+  };
+
+const renderIconArea =
+  (stepsSize: boolean, stepVersion: BlockVersion) => (step: StepProps, i: number) => {
+    const iconVersion = stepVersion === 'secondary' ? 'white' : 'color';
+    const isImg = Boolean(step?.icon?.src);
+    const iconAreaSize = getIconAreaSize(stepsSize, isImg);
+    const containerVersion = isImg ? stepVersion === 'transparent' : stepVersion;
+    const isImgSrc = step.image?.src;
+
+    return (
+      <BlockWrapper
+        className={style(
+          { 'w-32': Boolean(isImgSrc) },
+          'z-10 mr-s flex justify-center content-center rounded-md',
+          !isImgSrc && iconAreaSize,
+        )}
+        defaultPadding=""
+        version={containerVersion as BlockVersion}
+      >
+        <div className="flex max-w-full max-h-full items-center justify-center">
+          {renderIcon({ step, iconVersion, i, stepVersion })}
+        </div>
+      </BlockWrapper>
+    );
+  };
+
+const renderText = (step: StepProps) => {
+  const visibleStyle = Boolean(step.button?.text && step.image?.src);
+
+  return (
+    <div
+      className={style({
+        'mb-lg w-full': visibleStyle,
+      })}
+    >
+      {step?.label ? (
+        <Paragraph size="text-l" align="text-left">
+          {step.label}
+        </Paragraph>
+      ) : null}
+      {step?.description ? (
+        <div className={style('text-s font-light text-left', styleMap.description)}>
+          {step.description}
+        </div>
+      ) : null}
+      <RichText __html={step.__html} />
+    </div>
+  );
+};
+
+const getIconAreaSize = (stepsSize: boolean, isImg: boolean) => {
+  return stepsSize && isImg ? 'h-14 w-14' : 'h-11 w-11';
+};
+
+const renderIcon = ({
+  step,
+  iconVersion,
+  i,
+  stepVersion,
+}: {
+  step: StepProps;
+  iconVersion: IconVersion;
+  i: number;
+  stepVersion: BlockVersion;
+}) => {
+  if (isIcon(step?.icon)) {
+    return (
+      <Img
+        image={{ ...step.icon, iconVersion: step.icon?.iconVersion || iconVersion }}
+        imageClassName="max-w-full max-h-full"
+        width="24"
+        height="24"
+      />
+    );
+  } else if (isIcon(step.image)) {
+    return <Img image={{ ...step.image, size: { width: 120, height: 120 } }} />;
+  }
+
+  return (
+    <span
+      className={style(
+        'text-h4',
+        stepVersion === 'transparent' ? styleMap.iconText : getIconTextStyle(stepVersion),
+      )}
+    >
+      {i + 1}
+    </span>
+  );
+};

package/mobile/src/components/StickyBottomMenu/StickyBottomMenuItem.tsx

@@ -11,23 +11,21 @@ interface StickyBottomMenuItemProps {
 }
 
 export const StickyBottomMenuItem = JSX<StickyBottomMenuItemProps>(
-  ({ isActive, item, onClick }) => {
-    return (
-      <div
-        className={style(
-          isActive ? 'text-primary-main' : 'text-primary-text',
-          `w-10 m-4 flex justify-center items-center flex-col text-xs cursor-pointer`,
-        )}
-        title={item?.title || ''}
-        onClick={onClick}
-      >
-        <Icon
-          className="w-6 h-6"
-          name={item?.icon?.icon}
-          iconVersion={isActive ? 'color' : 'black'}
-        />
-        {item?.title || ''}
-      </div>
-    );
-  },
+  ({ isActive, item, onClick }) => (
+    <div
+      className={style(
+        isActive ? 'text-primary-main' : 'text-primary-text',
+        `w-10 m-4 flex justify-center items-center flex-col text-xs cursor-pointer`,
+      )}
+      title={item?.title || ''}
+      onClick={onClick}
+    >
+      <Icon
+        className="w-6 h-6"
+        name={item?.icon?.icon}
+        iconVersion={isActive ? 'color' : 'black'}
+      />
+      {item?.title || ''}
+    </div>
+  ),
 );

package/mobile/src/components/TabsLayout/TabsLayout.tsx

@@ -91,7 +91,7 @@ export const TabsLayout = UniBlock<TabsLayoutProps>(
       >
         {renderTabsLayout({
           className: style({
-            'pb-1': Boolean(block?.slots) && tabsType === 'default',
+            'pb-1': block?.slots && tabsType === 'default',
             'sticky top-1 z-20': isSticky && !isEveryLink,
           }),
           items: getItems(tabs, tabsCounted),

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

@@ -26,25 +26,23 @@ export const TariffsTableCell = JSX<TariffsTableCellProps>(
     tableInner,
     openTableInnerIdx,
     setOpenTableInnerIdx,
-  }) => {
-    return (
-      <div className="w-80 flex-grow flex flex-col gap-m @4xl:gap-lg" role="cell">
-        {cells?.length
-          ? cells.map((_, i) => (
-              <RenderCellInner
-                key={String(i)}
-                cell={_}
-                fieldIdx={i}
-                rowIdx={rowIdx}
-                cellIdx={cellIdx}
-                setTableInner={setTableInner}
-                tableInner={tableInner}
-                openTableInnerIdx={openTableInnerIdx}
-                setOpenTableInnerIdx={setOpenTableInnerIdx}
-              />
-            ))
-          : null}
-      </div>
-    );
-  },
+  }) => (
+    <div className="w-80 flex-grow flex flex-col gap-m @4xl:gap-lg" role="cell">
+      {cells?.length
+        ? cells.map((_, i) => (
+            <RenderCellInner
+              key={String(i)}
+              cell={_}
+              fieldIdx={i}
+              rowIdx={rowIdx}
+              cellIdx={cellIdx}
+              setTableInner={setTableInner}
+              tableInner={tableInner}
+              openTableInnerIdx={openTableInnerIdx}
+              setOpenTableInnerIdx={setOpenTableInnerIdx}
+            />
+          ))
+        : null}
+    </div>
+  ),
 );

package/mobile/src/ui-kit/BaseFiltration/renderGridBlocks.tsx

@@ -27,7 +27,7 @@ export const renderGridBlocks = ({
       : [blocksToRender, []];
 
   return (
-    <div className={style('space-y-2xs', blocksToRender.length ? '' : 'hidden')}>
+    <div className={style('space-y-2xs', { hidden: !blocksToRender.length })}>
       <div className={style(resultsGridStyle)}>
         {renderBlocksList(visibleBlocks, { ...rest.options, parent: block })}
         {isOdd(visibleBlocks.length) ? <AdTile className="col-span-6" {...rest} /> : null}
@@ -41,7 +41,7 @@ export const renderGridBlocks = ({
         )}
         renderFoldButton={({ isUnfolded, onToggle }) => (
           <DefaultFoldButton
-            className={style(topItemsCount < 1 ? 'hidden' : '')}
+            className={style({ hidden: topItemsCount < 1 })}
             disabled={!hiddenBlocks?.length}
             label={label}
             icon={ICONS[Number(isUnfolded)]}

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

@@ -2,11 +2,13 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
 import { renderBackwardButton } from '../../components/ProductBlock/renderBackwardButton';
+import { useMobileMode } from '../../hooks/useMobileMode';
 import { useRouter } from '../../hooks/useRouter';
 import { type Align } from '../../model/Align';
 import { type VNode } from '../../model/VNode';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
+import { renderImageContainer } from './renderImageContainer';
 
 interface BaseTileProps extends UniBlockProps {
   title?: VNode;
@@ -20,12 +22,6 @@ interface BaseTileProps extends UniBlockProps {
   backwardButton?: boolean;
 }
 
-const imageAlignmentMap: Record<Align, string> = {
-  start: '@xl:self-start',
-  center: '@xl:self-center',
-  end: '@xl:self-end',
-};
-
 export const BaseTile = JSX<BaseTileProps>(
   ({
     className,
@@ -33,63 +29,66 @@ export const BaseTile = JSX<BaseTileProps>(
     defaultPadding,
     padding = '',
     title,
-    insetTitle,
     buttons,
     leftImage,
     rightImage,
     imageAlign,
+    insetTitle,
     isImageAlwaysOnRight = false,
     isImageSecondary = false,
     backwardButton,
     children,
     ...rest
   }) => {
+    const isMobile = useMobileMode();
     const router = useRouter();
-    const handleClick = useCallback(() => {
-      router.back();
-    }, []);
+    const handleClick = useCallback(() => router.back(), []);
     const backwardButtonText = rest.options?.page?.common?.backwardButton;
+    const isBackBtn = backwardButton && !isMobile;
 
     return (
-      <div className={getStyle(padding, defaultPadding, className)}>
-        {backwardButton
-          ? renderBackwardButton({ version, handleClick, text: backwardButtonText })
-          : null}
-        {getTitle(title)}
+      <div
+        className={style(
+          'relative flex flex-col gap-3xl overflow-hidden',
+          padding || defaultPadding,
+          className,
+        )}
+      >
+        {isBackBtn && renderBackwardButton({ version, handleClick, text: backwardButtonText })}
+        {title ? <div className="relative h-full">{title}</div> : null}
         <div
-          className={style(
-            'grow relative flex flex-col @xl:flex-row gap-3xl w-full',
-            leftImage ? 'self-start @xl:w-auto' : '',
-          )}
+          className={style('grow relative flex flex-col @xl:flex-row gap-3xl w-full', {
+            'self-start @xl:w-auto': leftImage,
+          })}
         >
           {renderImageContainer(leftImage, { imageAlign, className: 'mx-auto' })}
           <div
             className={style(
-              'grid gap-3xl',
-              rightImage ? '@xl:grid-cols-2 auto-cols-fr' : '',
-              leftImage ? '' : 'grow',
+              'grid gap-3xl items-center md:items-stretch',
+              {
+                '@xl:grid-cols-2 auto-cols-fr': rightImage,
+                grow: !leftImage,
+              },
               'h-full', //? fix issue https://github.com/redneckz/temp_wcms/issues/1254
               'auto-rows-[max-content_1fr]', //? fix issue https://github.com/redneckz/temp_wcms/issues/1324
-              'items-center md:items-stretch',
             )}
           >
             <div className="grow space-y-lg min-w-fit">
               {insetTitle}
               {children}
             </div>
-            {renderUnitBlock(
+            {renderUnitContainer(
               renderChildren({ ...rest, extraProps: { className: '@container-normal' } }),
             )}
             {renderImageContainer(rightImage, {
-              className: style(
-                '@xl:justify-self-end @xl:col-start-2',
-                buttons ? rowSpanStyle(isImageAlwaysOnRight) : '',
-                positionStyle(isImageAlwaysOnRight),
-                imageSecondaryStyle(isImageSecondary),
-              ),
+              className: style('@xl:justify-self-end @xl:col-start-2', {
+                [imageAlwaysOnRightContainerStyle(isImageAlwaysOnRight)]: buttons,
+                'col-start-2 self-center': isImageAlwaysOnRight,
+                'hidden @xl:block': isImageSecondary,
+              }),
               imageAlign,
             })}
-            {renderButtons(buttons)}
+            {buttons ? <div className="self-end">{buttons}</div> : null}
           </div>
         </div>
       </div>
@@ -97,40 +96,10 @@ export const BaseTile = JSX<BaseTileProps>(
   },
 );
 
-const getTitle = (title?: VNode) => (title ? <div className="relative h-full">{title}</div> : null);
-
-const getStyle = (padding = '', defaultPadding = '', className = '') =>
-  style('relative flex flex-col gap-3xl overflow-hidden', padding || defaultPadding, className);
-
-const rowSpanStyle = (isImageAlwaysOnRight: boolean) =>
-  isImageAlwaysOnRight ? 'row-span-2' : '@xl:row-span-2';
+const imageAlwaysOnRightContainerStyle = (isImage: boolean) =>
+  style(isImage ? 'row-span-2' : '@xl:row-span-2');
 
-const positionStyle = (isImageAlwaysOnRight: boolean) =>
-  isImageAlwaysOnRight ? 'col-start-2 self-center' : '';
-
-const renderButtons = (buttons: VNode) =>
-  buttons ? <div className="self-end">{buttons}</div> : null;
-
-const renderUnitBlock = (unitBlock: VNode | undefined) =>
-  unitBlock && unitBlock?.length ? (
-    <div className="flex items-start justify-end">{unitBlock}</div>
+const renderUnitContainer = (childrenBlocks: VNode[] | null) =>
+  childrenBlocks?.length ? (
+    <div className="flex items-start justify-end">{childrenBlocks}</div>
   ) : null;
-
-const renderImageContainer = (
-  image: VNode | undefined,
-  { className, imageAlign }: { className?: string; imageAlign?: Align },
-) =>
-  image ? (
-    <div
-      className={style(
-        'shrink-1/2 justify-self-center',
-        imageAlign && imageAlignmentMap[imageAlign],
-        className,
-      )}
-    >
-      {image}
-    </div>
-  ) : null;
-
-const imageSecondaryStyle = (isImageSecondary: boolean) =>
-  isImageSecondary ? 'hidden @xl:block' : '';

package/mobile/src/ui-kit/BaseTile/renderImageContainer.tsx

@@ -0,0 +1,25 @@
+import { type Align } from '../../model/Align';
+import { type VNode } from '../../model/VNode';
+import { style } from '../../utils/style';
+
+const imageAlignmentMap: Record<Align, string> = {
+  start: '@xl:self-start',
+  center: '@xl:self-center',
+  end: '@xl:self-end',
+};
+
+export const renderImageContainer = (
+  image: VNode | undefined,
+  { className, imageAlign }: { className?: string; imageAlign?: Align },
+) =>
+  image ? (
+    <div
+      className={style(
+        'shrink-1/2 justify-self-center',
+        imageAlign && imageAlignmentMap[imageAlign],
+        className,
+      )}
+    >
+      {image}
+    </div>
+  ) : null;

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

@@ -38,7 +38,9 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
       <Tag
         className={style(
           '@container font-sans',
-          isGroup ? 'group' : '',
+          {
+            group: isGroup,
+          },
           blockStyles[version],
           padding || defaultPadding,
           className,