@redneckz/wildless-cms-uni-blocks 0.14.532 → 0.14.534

package/src/components/StepsBlock/renderStepMobile.tsx

@@ -1,6 +1,5 @@
 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';
@@ -17,14 +16,11 @@ 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;
+    const { button } = step;
 
     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="flex items-center relative flex-row">
           <div className="overflow-hidden flex flex-shrink-0 items-center">
             {renderIconArea(stepsSize, stepVersion)(step, i)}
           </div>
@@ -33,11 +29,11 @@ export const renderStepMobile =
               'min-h-6xl': stepsSize,
             })}
           >
-            {image?.src ? null : renderText(step)}
-            {styleStepMobile ? (
+            {renderText(step)}
+            {button?.text ? (
               <LinkButton
                 className="box-border py-s w-full max-w-60 mt-lg"
-                version={version as LinkButtonVersion}
+                version={version}
                 {...button}
               >
                 {button?.text}
@@ -55,15 +51,10 @@ const renderIconArea =
     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,
-        )}
+        className={style('z-10 mr-s flex justify-center content-center rounded-md', iconAreaSize)}
         defaultPadding=""
         version={containerVersion as BlockVersion}
       >
@@ -75,14 +66,8 @@ const renderIconArea =
   };
 
 const renderText = (step: StepProps) => {
-  const visibleStyle = Boolean(step.button?.text && step.image?.src);
-
   return (
-    <div
-      className={style({
-        'mb-lg w-full': visibleStyle,
-      })}
-    >
+    <div>
       {step?.label ? (
         <Paragraph size="text-l" align="text-left">
           {step.label}
@@ -112,21 +97,15 @@ const renderIcon = ({
   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 (
+}) =>
+  isIcon(step?.icon) ? (
+    <Img
+      image={{ ...step.icon, iconVersion: step.icon?.iconVersion || iconVersion }}
+      imageClassName="max-w-full max-h-full"
+      width="24"
+      height="24"
+    />
+  ) : (
     <span
       className={style(
         'text-h4',
@@ -136,4 +115,3 @@ const renderIcon = ({
       {i + 1}
     </span>
   );
-};

package/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/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/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/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/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/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/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,

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

@@ -6,10 +6,6 @@ import { type ControlStateProps } from '../ControlStateProps';
 import type { PreventableEvent } from '../PreventableEvent';
 import { useButton } from './useButton';
 
-const activeButtonStyleMap = 'text-white bg-primary-active';
-
-const disabledButtonStyle = 'bg-main-gray text-main-disabled cursor-not-allowed';
-
 const buttonStyleMap: Record<ButtonVersion, string> = {
   primary: 'text-white bg-primary-main hover:bg-primary-hover active:bg-primary-active',
   secondary:
@@ -57,12 +53,14 @@ export const Button = JSX<ButtonProps>(({ children, ...props }) => {
       className={style(
         'font-sans px-9 py-4',
         'flex justify-center items-center gap-xs',
-        active ? activeButtonStyleMap : '',
-        disabled ? disabledButtonStyle : '',
+        {
+          'text-white bg-primary-active': active,
+          'bg-main-gray text-main-disabled cursor-not-allowed': disabled,
+          'rounded-md': rounded,
+        },
         !active && !disabled
           ? style(buttonStyleMap[version], secondaryButtonStyleMap[version])
           : '',
-        rounded ? 'rounded-md' : '',
         className,
       )}
       type={type}

package/src/ui-kit/Checkbox/Checkbox.tsx

@@ -82,4 +82,4 @@ const getCursorStyle = (disabled = false) => (disabled ? 'cursor-not-allowed' :
 
 const role = (isRadio = false) => (isRadio ? 'radio' : 'checkbox');
 
-const checkboxStyle = (value = false) => style('rounded border', value ? 'bg-primary-main' : '');
+const checkboxStyle = (value = false) => style('rounded border', { 'bg-primary-main': value });

package/src/ui-kit/DatePicker/renderCalendarCells.tsx

@@ -71,6 +71,8 @@ const checkIsDisabled = (currentDate: Date, min: Date | undefined, max: Date | u
 const getDayStyles = (isToday: boolean | undefined, isDisabled: boolean | undefined) =>
   style(
     'p-s text-center rounded-md border',
-    isToday ? '' : 'border-transparent hover:bg-gray',
+    {
+      'border-transparent hover:bg-gray': !isToday,
+    },
     isDisabled ? 'text-gray hover:bg-transparent' : 'cursor-pointer',
   );

package/src/ui-kit/DialogManager/DialogManager.tsx

@@ -46,7 +46,9 @@ export const DialogManager = JSX(() => {
           key={String(id || i)}
           className={style(
             'absolute inset-0 overflow-x-hidden overflow-y-scroll no-scrollbar bg-black/50',
-            i === dialogs.length - 1 ? '' : 'hidden',
+            {
+              hidden: i !== dialogs.length - 1,
+            },
           )}
         >
           {dialog}

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

@@ -53,7 +53,9 @@ export const Icon = JSX<IconProps>(
           className={style(
             getSvgSize(width),
             svgUseStyleMap[iconVersion],
-            iconVersion === 'white' ? 'invert' : '',
+            {
+              invert: iconVersion === 'white',
+            },
             imageClassName,
           )}
           width={width}

package/src/ui-kit/InnerTable/InnerTableHeader.tsx

@@ -24,10 +24,9 @@ export const InnerTableHeader = JSX<InnerTableHeaderProps>(
           {currencies.map((currency, idx) => (
             <div
               key={currency}
-              className={style(
-                'rounded-md px-4 py-3 cursor-pointer',
-                idx === activeTabIndex ? 'bg-primary-main' : '',
-              )}
+              className={style('rounded-md px-4 py-3 cursor-pointer', {
+                'bg-primary-main': idx === activeTabIndex,
+              })}
               onClick={() => setActiveTabIndex(idx)}
             >
               <Text size="text-xl" font="font-light" color={TableColor(idx === activeTabIndex)}>

package/src/ui-kit/InnerTable/renderInnerTableRow.tsx

@@ -47,7 +47,7 @@ export const renderInnerTableRow =
 
 const renderCols = (cols: string[], rowIndex: number) =>
   cols?.length > 0 ? (
-    <div className={style('flex', rowIndex === 0 ? 'text-secondary-text' : '')}>
+    <div className={style('flex', { 'text-secondary-text': rowIndex === 0 })}>
       {cols.map((data, i) => (
         <div key={String(i)} className="w-20 mx-lg">
           <Text size="text-h6" font="font-light">

package/src/ui-kit/LinkButton/ButtonInner.tsx

@@ -39,7 +39,9 @@ const getButtonStyle = (props: LinkButtonContent) => {
   return style(
     'group/btn items-center justify-center',
     isWithText(props) ? withTextStyle : 'h-12 w-12 m-auto',
-    rounded ? 'rounded-full' : '',
+    {
+      'rounded-full': rounded,
+    },
   );
 };
 

package/src/ui-kit/Select/Select.tsx

@@ -86,7 +86,7 @@ export const Select = JSX<SelectProps>(
 
 const renderIcon = (isOpen: boolean, iconVersion?: IconVersion) => (
   <Icon
-    className={style('absolute right-3 flex self-center', isOpen ? '' : 'rotate-180')}
+    className={style('absolute right-3 flex self-center', { 'rotate-180': !isOpen })}
     iconVersion={iconVersion}
     name="ArrowUpIcon"
     width="16"

package/src/ui-kit/Select/SelectPopup.tsx

@@ -42,10 +42,9 @@ export const SelectPopup = JSX<SelectPopupProps>(
               width="16"
               height="16"
               iconVersion={iconVersion}
-              className={style(
-                'absolute right-4 pt-3xs',
-                option.key === value?.key ? '' : 'hidden',
-              )}
+              className={style('absolute right-4 pt-3xs', {
+                hidden: option.key !== value?.key,
+              })}
             />
           </div>
         ))}

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

@@ -86,7 +86,9 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
             className={style(
               snapAlign,
               visibleItemCount ? childStyleMap[visibleItemCount - 1] : '',
-              isVerticalList ? 'h-full' : '',
+              {
+                'h-full': isVerticalList,
+              },
               itemClassName,
             )}
             style={isHorizontalList ? getContainerOffset(padding / 4) : {}}

package/src/ui-kit/TopItem/TopItem.tsx

@@ -45,7 +45,9 @@ const getLinkStyle = (active = false, flat = false) =>
     active
       ? 'rounded-md border-primary-main group-data-transparent:border-white'
       : 'border-transparent',
-    flat ? '' : 'px-m py-xs',
+    {
+      'px-m py-xs': !flat,
+    },
   );
 
 const getTextStyle = (active = false, flat = false) => {

package/src/utils/style.ts

@@ -1,5 +1,3 @@
-import { t0, t1 } from './fp/tuple';
-
 type Falsy = null | undefined | false | 0 | '';
 type Atom = string | Falsy;
 
@@ -8,12 +6,16 @@ type StyleElement = Atom | Atom[] | StyleRecord;
 
 export const style = (...atoms: StyleElement[]): string =>
   atoms
-    .map((_) => (isStyleRecord(_) ? styleRecordToAtoms(_) : _))
+    .map((_) =>
+      isStyleRecord(_)
+        ? Object.entries(_)
+            .filter(([, v]) => v)
+            .map(([k]) => k)
+        : _,
+    )
     .flatMap((_) => _)
     .filter(Boolean)
     .join(' ');
 
-const styleRecordToAtoms = (_: StyleRecord) => Object.entries(_).filter(t1()).map(t0());
-
 const isStyleRecord = (_: StyleElement): _ is StyleRecord =>
   Boolean(_ && typeof _ === 'object' && !Array.isArray(_));