@redneckz/wildless-cms-uni-blocks 0.14.21 → 0.14.22

package/mobile/src/api/CorporateLeadAPI.ts

@@ -22,6 +22,10 @@ export function CorporateLeadAPI() {
         body: JSON.stringify(body),
       });
 
+      if (!response?.ok) {
+        return null;
+      }
+
       const data = await response.json();
 
       return data;

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

@@ -3,7 +3,7 @@
     "title": "Вы можете оплатить бонусными баллами",
     "subtitle": "Удобный каталог с большим ассортиментом товаров и сервисов",
     "columnsCount": "4",
-    "cardTextAlign": "center",
+    "cardTextAlign": "text-center",
     "bonusBenefits": [
       {
         "title": "Верхний заголовок",

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -10,7 +10,7 @@ export interface BenefitsBlockProps extends BonusBenefitsBlockContent, UniBlockP
 export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
   ({
     bonusBenefits,
-    cardTextAlign = 'center',
+    cardTextAlign = 'text-center',
     className = '',
     columnsCount = '4',
     subtitle,

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,4 +1,3 @@
-import { type AlignType } from '../../model/AlignType';
 import {
   type DescriptionProps,
   type SubtitleProps,
@@ -6,6 +5,7 @@ import {
 } from '../../model/HeadlineType';
 import { type UniBlockContent } from '../../model/JSXBlock';
 import { type IconProps } from '../../model/Picture';
+import { type TextAlign } from '../../ui-kit/Text/TextProps';
 
 /**
  * @title Количество элементов в строке
@@ -31,5 +31,5 @@ export type BonusBenefitsBlockContent = UniBlockContent &
     /** @title Список бонусов */
     bonusBenefits?: BonusBenefit[];
     columnsCount?: ColumnsCount;
-    cardTextAlign?: AlignType;
+    cardTextAlign?: TextAlign;
   };

package/mobile/src/components/BonusBenefitsBlock/renderBonusBenefit.tsx

@@ -1,29 +1,32 @@
-import { AlignStyles } from '../../model/AlignStyles';
 import { Img } from '../../ui-kit/Img/Img';
 import { Text } from '../../ui-kit/Text/Text';
+import { type TextAlign } from '../../ui-kit/Text/TextProps';
 import { style } from '../../utils/style';
 import { type BonusBenefit } from './BonusBenefitsBlockContent';
 import { bonusBenefitStyles } from './bonusBenefitStyles';
 
-export const renderBonusBenefit = ({ icon, title, description }: BonusBenefit, i: number) => (
-  <div
-    key={String(i)}
-    className={style(
-      'flex flex-col',
-      bonusBenefitStyles,
-      !description && !title ? 'justify-center' : '',
-    )}
-  >
-    {title ? (
-      <Text size="text-h6" font="font-normal" align={AlignStyles}>
-        {title}
-      </Text>
-    ) : null}
-    {icon ? <Img image={icon} height="180" className="w-auto" /> : null}
-    {description ? (
-      <Text size="text-h6" font="font-normal" align={AlignStyles}>
-        {description}
-      </Text>
-    ) : null}
-  </div>
-);
+export const renderBonusBenefit =
+  (cardTextAlign: TextAlign) =>
+  ({ icon, title, description }: BonusBenefit, i: number) =>
+    (
+      <div
+        key={String(i)}
+        className={style(
+          'flex flex-col gap-1',
+          bonusBenefitStyles,
+          !description && !title ? 'justify-center' : '',
+        )}
+      >
+        {title ? (
+          <Text size="text-h6" font="font-normal" align={cardTextAlign}>
+            {title}
+          </Text>
+        ) : null}
+        {icon ? <Img image={icon} height="180" className="w-auto" /> : null}
+        {description ? (
+          <Text size="text-h6" font="font-normal" align={cardTextAlign}>
+            {description}
+          </Text>
+        ) : null}
+      </div>
+    );

package/mobile/src/components/BonusBenefitsBlock/renderBonusBenefits.tsx

@@ -1,15 +1,10 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { type AlignType } from '../../model/AlignType';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
+import { type TextAlign } from '../../ui-kit/Text/TextProps';
 import { type BonusBenefit, type ColumnsCount } from './BonusBenefitsBlockContent';
 import { renderBonusBenefit } from './renderBonusBenefit';
 
 export const renderBonusBenefits = (
   bonusBenefits: BonusBenefit[],
   _columnsCount: ColumnsCount,
-  _cardTextAlign: AlignType,
-) => (
-  <SwipeListControl>
-    {bonusBenefits.map((_, i) => renderBonusBenefit({ ..._ }, i))}
-  </SwipeListControl>
-);
+  _cardTextAlign: TextAlign,
+) => <SwipeListControl>{bonusBenefits.map(renderBonusBenefit(_cardTextAlign))}</SwipeListControl>;

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

@@ -12,16 +12,23 @@ import { renderBackwardButton } from './renderBackwardButton';
 export interface ProductBlockProps extends UniBlockProps, ProductBlockContent {}
 
 export const ProductBlock = JSX<ProductBlockProps>(
-  ({ className, padding, backwardButton, ...rest }) => {
+  ({ className, padding, backwardButton, showBorder, ...rest }) => {
     const router = useRouter();
     const handleClick = useCallback((ev?: PreventableEvent) => {
       ev?.preventDefault();
       router.back();
     }, []);
+    const borderStyle = showBorder
+      ? 'border border-solid border-gray group-data-secondary:border-white/50 group-data-gray:border-main-divider'
+      : '';
 
     return (
       <BlockWrapper
-        className={style('overflow-hidden flex flex-col gap-3xl box-border', className)}
+        className={style(
+          'overflow-hidden flex flex-col gap-3xl box-border',
+          borderStyle,
+          className,
+        )}
         defaultPadding="p-6xl"
         padding={padding}
         {...rest}

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

@@ -8,4 +8,6 @@ export type ProductBlockContent = UniBlockContent &
   BaseProductTileContent & {
     /** @title Отображать кнопку возврата (только для десктопной версии) */
     backwardButton?: boolean;
+    /** @title Показывать рамку вокруг блока */
+    showBorder?: boolean;
   };

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

@@ -40,7 +40,6 @@ export const StickyBottomMenu = JSX<StickyBottomMenuProps>(({ ...rest }) => {
       <BlockWrapper
         className="@container-normal fixed w-full h-[74px] bottom-0 left-0 my-0 mx-auto bg-transparent z-[100]"
         padding="p-0"
-        data-component="sticky-bottom-menu"
       >
         <RenderMenuItems menuItems={menuItemsWithButton} onClick={toggle} />
       </BlockWrapper>

package/mobile/tailwind.config.cjs

@@ -0,0 +1,127 @@
+const config = require('../tailwind.config.cjs');
+
+const quadXL = '1.5rem 1.25rem'; // 24px 20px
+
+module.exports = {
+  ...config,
+  theme: {
+    ...config.theme,
+    extend: {
+      ...config.theme.extend,
+      borderRadius: {
+        icon: '0.375rem',
+      },
+      spacing: {
+        '6xl': '1.5rem', // 24px
+        '5xl': '1.5rem', // 24px
+        '4xl': '1.5rem', // 24px
+        '3xl': '1rem', // 16px
+        '2xl': '1rem', // 16px
+        xl: '1rem', // 16px
+        lg: '1rem', // 16px
+        m: '0.5rem', // 8px
+        s: '0.5rem', // 8px
+        xs: '0.5rem', // 8px
+        '2xs': '0.25rem', // 4px
+        '3xs': '0', // 0
+      },
+      padding: {
+        '6xl': quadXL,
+        '5xl': quadXL,
+        '4xl': quadXL,
+      },
+      fontSize: {
+        ...config.theme.extend.fontSize,
+        'title-extra': ['9.375rem', '13rem'], // 150px 208px
+        h0: [
+          '1.5rem',
+          {
+            // 24px 34px
+            lineHeight: '2.125rem',
+            fontWeight: '400',
+          },
+        ],
+        h1: [
+          '1.5rem',
+          {
+            // 24px 34px
+            lineHeight: '2.125rem',
+            fontWeight: '400',
+          },
+        ],
+        h2: [
+          '1.5rem',
+          {
+            // 24px 34px
+            lineHeight: '2.125rem',
+            fontWeight: '400',
+          },
+        ],
+        h3: [
+          '1.25rem',
+          {
+            // 20px 28px
+            lineHeight: '1.75rem',
+            fontWeight: '400',
+          },
+        ],
+        h4: [
+          '1.25rem',
+          {
+            // 20px 28px
+            lineHeight: '1.75rem',
+            fontWeight: '400',
+          },
+        ],
+        h5: [
+          '1rem',
+          {
+            // 16px 24px
+            lineHeight: '1.5rem',
+            fontWeight: '400',
+          },
+        ],
+        h6: [
+          '1rem',
+          {
+            // 16px 24px
+            lineHeight: '1.5rem',
+            fontWeight: '400',
+          },
+        ],
+        xl: [
+          '1rem',
+          {
+            // 16px 24px
+            lineHeight: '1.5rem',
+            fontWeight: '400',
+          },
+        ],
+        l: [
+          '1rem',
+          {
+            // 16px 24px
+            lineHeight: '1.5rem',
+            fontWeight: '400',
+          },
+        ],
+        s: [
+          '0.875rem',
+          {
+            // 14px 20px
+            lineHeight: '1.25rem',
+            fontWeight: '400',
+          },
+        ],
+        xs: [
+          '0.75rem',
+          {
+            // 12px 18px
+            lineHeight: '1.125rem',
+            fontWeight: '400',
+          },
+        ],
+      },
+    },
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.21",
+  "version": "0.14.22",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -69,6 +69,7 @@
     "mobile/src",
     "cosmos-static/icons",
     "tailwind.config.cjs",
+    "mobile/tailwind.config.cjs",
     "!**/*.spec.*"
   ],
   "repository": {

package/src/api/CorporateLeadAPI.ts

@@ -22,6 +22,10 @@ export function CorporateLeadAPI() {
         body: JSON.stringify(body),
       });
 
+      if (!response?.ok) {
+        return null;
+      }
+
       const data = await response.json();
 
       return data;

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.example.json

@@ -3,7 +3,7 @@
     "title": "Вы можете оплатить бонусными баллами",
     "subtitle": "Удобный каталог с большим ассортиментом товаров и сервисов",
     "columnsCount": "4",
-    "cardTextAlign": "center",
+    "cardTextAlign": "text-center",
     "bonusBenefits": [
       {
         "title": "Верхний заголовок",

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -10,7 +10,7 @@ export interface BenefitsBlockProps extends BonusBenefitsBlockContent, UniBlockP
 export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
   ({
     bonusBenefits,
-    cardTextAlign = 'center',
+    cardTextAlign = 'text-center',
     className = '',
     columnsCount = '4',
     subtitle,

package/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,4 +1,3 @@
-import { type AlignType } from '../../model/AlignType';
 import {
   type DescriptionProps,
   type SubtitleProps,
@@ -6,6 +5,7 @@ import {
 } from '../../model/HeadlineType';
 import { type UniBlockContent } from '../../model/JSXBlock';
 import { type IconProps } from '../../model/Picture';
+import { type TextAlign } from '../../ui-kit/Text/TextProps';
 
 /**
  * @title Количество элементов в строке
@@ -31,5 +31,5 @@ export type BonusBenefitsBlockContent = UniBlockContent &
     /** @title Список бонусов */
     bonusBenefits?: BonusBenefit[];
     columnsCount?: ColumnsCount;
-    cardTextAlign?: AlignType;
+    cardTextAlign?: TextAlign;
   };

package/src/components/BonusBenefitsBlock/renderBonusBenefit.tsx

@@ -1,29 +1,32 @@
-import { AlignStyles } from '../../model/AlignStyles';
 import { Img } from '../../ui-kit/Img/Img';
 import { Text } from '../../ui-kit/Text/Text';
+import { type TextAlign } from '../../ui-kit/Text/TextProps';
 import { style } from '../../utils/style';
 import { type BonusBenefit } from './BonusBenefitsBlockContent';
 import { bonusBenefitStyles } from './bonusBenefitStyles';
 
-export const renderBonusBenefit = ({ icon, title, description }: BonusBenefit, i: number) => (
-  <div
-    key={String(i)}
-    className={style(
-      'flex flex-col',
-      bonusBenefitStyles,
-      !description && !title ? 'justify-center' : '',
-    )}
-  >
-    {title ? (
-      <Text size="text-h6" font="font-normal" align={AlignStyles}>
-        {title}
-      </Text>
-    ) : null}
-    {icon ? <Img image={icon} height="180" className="w-auto" /> : null}
-    {description ? (
-      <Text size="text-h6" font="font-normal" align={AlignStyles}>
-        {description}
-      </Text>
-    ) : null}
-  </div>
-);
+export const renderBonusBenefit =
+  (cardTextAlign: TextAlign) =>
+  ({ icon, title, description }: BonusBenefit, i: number) =>
+    (
+      <div
+        key={String(i)}
+        className={style(
+          'flex flex-col gap-1',
+          bonusBenefitStyles,
+          !description && !title ? 'justify-center' : '',
+        )}
+      >
+        {title ? (
+          <Text size="text-h6" font="font-normal" align={cardTextAlign}>
+            {title}
+          </Text>
+        ) : null}
+        {icon ? <Img image={icon} height="180" className="w-auto" /> : null}
+        {description ? (
+          <Text size="text-h6" font="font-normal" align={cardTextAlign}>
+            {description}
+          </Text>
+        ) : null}
+      </div>
+    );

package/src/components/BonusBenefitsBlock/renderBonusBenefits.mobile.tsx

@@ -1,15 +1,10 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { type AlignType } from '../../model/AlignType';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
+import { type TextAlign } from '../../ui-kit/Text/TextProps';
 import { type BonusBenefit, type ColumnsCount } from './BonusBenefitsBlockContent';
 import { renderBonusBenefit } from './renderBonusBenefit';
 
 export const renderBonusBenefits = (
   bonusBenefits: BonusBenefit[],
   _columnsCount: ColumnsCount,
-  _cardTextAlign: AlignType,
-) => (
-  <SwipeListControl>
-    {bonusBenefits.map((_, i) => renderBonusBenefit({ ..._ }, i))}
-  </SwipeListControl>
-);
+  _cardTextAlign: TextAlign,
+) => <SwipeListControl>{bonusBenefits.map(renderBonusBenefit(_cardTextAlign))}</SwipeListControl>;

package/src/components/BonusBenefitsBlock/renderBonusBenefits.tsx

@@ -1,15 +1,14 @@
-import { AlignText } from '../../model/AlignText';
-import { type AlignType } from '../../model/AlignType';
+import { type TextAlign } from '../../ui-kit/Text/TextProps';
 import { type BonusBenefit, type ColumnsCount } from './BonusBenefitsBlockContent';
 import { renderBonusBenefit } from './renderBonusBenefit';
 
 export const renderBonusBenefits = (
   bonusBenefits: BonusBenefit[],
   columnsCount: ColumnsCount,
-  cardTextAlign: AlignType,
+  cardTextAlign: TextAlign,
 ) => (
-  <div className={`grid gap-2xs ${AlignText[cardTextAlign]} ${getElementsColsValue(columnsCount)}`}>
-    {bonusBenefits.map(renderBonusBenefit)}
+  <div className={`grid gap-2xs ${getElementsColsValue(columnsCount)}`}>
+    {bonusBenefits.map(renderBonusBenefit(cardTextAlign))}
   </div>
 );
 

package/src/components/ProductBlock/ProductBlock.tsx

@@ -12,16 +12,23 @@ import { renderBackwardButton } from './renderBackwardButton';
 export interface ProductBlockProps extends UniBlockProps, ProductBlockContent {}
 
 export const ProductBlock = JSX<ProductBlockProps>(
-  ({ className, padding, backwardButton, ...rest }) => {
+  ({ className, padding, backwardButton, showBorder, ...rest }) => {
     const router = useRouter();
     const handleClick = useCallback((ev?: PreventableEvent) => {
       ev?.preventDefault();
       router.back();
     }, []);
+    const borderStyle = showBorder
+      ? 'border border-solid border-gray group-data-secondary:border-white/50 group-data-gray:border-main-divider'
+      : '';
 
     return (
       <BlockWrapper
-        className={style('overflow-hidden flex flex-col gap-3xl box-border', className)}
+        className={style(
+          'overflow-hidden flex flex-col gap-3xl box-border',
+          borderStyle,
+          className,
+        )}
         defaultPadding="p-6xl"
         padding={padding}
         {...rest}

package/src/components/ProductBlock/ProductBlockContent.ts

@@ -8,4 +8,6 @@ export type ProductBlockContent = UniBlockContent &
   BaseProductTileContent & {
     /** @title Отображать кнопку возврата (только для десктопной версии) */
     backwardButton?: boolean;
+    /** @title Показывать рамку вокруг блока */
+    showBorder?: boolean;
   };

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

@@ -40,7 +40,6 @@ export const StickyBottomMenu = JSX<StickyBottomMenuProps>(({ ...rest }) => {
       <BlockWrapper
         className="@container-normal fixed w-full h-[74px] bottom-0 left-0 my-0 mx-auto bg-transparent z-[100]"
         padding="p-0"
-        data-component="sticky-bottom-menu"
       >
         <RenderMenuItems menuItems={menuItemsWithButton} onClick={toggle} />
       </BlockWrapper>

package/bundle/model/AlignText.d.ts

@@ -1,6 +0,0 @@
-import { type TextAlign } from '../ui-kit/Text/TextProps';
-import { type AlignType } from './AlignType';
-/**
- * @deprecated
- */
-export declare const AlignText: Record<AlignType, TextAlign>;

package/bundle/model/AlignType.d.ts

@@ -1,21 +0,0 @@
-/**
- * @title Выравнивание
- * @deprecated
- * @enumNames [
- *    "По левому краю",
- *    "По центру",
- *    "По правому краю"
- * ]
- */
-export declare type AlignType = 'left' | 'center' | 'right';
-/**
- * @title Выравнивание
- * @deprecated
- * @enumNames [
- *    "Во всю ширину",
- *    "По левому краю",
- *    "По центру",
- *    "По правому краю"
- * ]
- */
-export declare type AlignTypeWithStretch = 'stretch' | 'left' | 'center' | 'right';

package/dist/model/AlignText.d.ts

@@ -1,6 +0,0 @@
-import { type TextAlign } from '../ui-kit/Text/TextProps';
-import { type AlignType } from './AlignType';
-/**
- * @deprecated
- */
-export declare const AlignText: Record<AlignType, TextAlign>;

package/dist/model/AlignText.js

@@ -1,11 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlignText = void 0;
-/**
- * @deprecated
- */
-exports.AlignText = {
-    left: 'text-left',
-    center: 'text-center',
-    right: 'text-right',
-};
-//# sourceMappingURL=AlignText.js.map

package/dist/model/AlignText.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AlignText.js","sourceRoot":"","sources":["../../src/model/AlignText.ts"],"names":[],"mappings":";;AAGA;;GAEG;AACU,QAAA,SAAS,GAAiC;IACrD,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,aAAa;IACrB,KAAK,EAAE,YAAY;CACpB,CAAC"}

package/dist/model/AlignType.d.ts

@@ -1,21 +0,0 @@
-/**
- * @title Выравнивание
- * @deprecated
- * @enumNames [
- *    "По левому краю",
- *    "По центру",
- *    "По правому краю"
- * ]
- */
-export declare type AlignType = 'left' | 'center' | 'right';
-/**
- * @title Выравнивание
- * @deprecated
- * @enumNames [
- *    "Во всю ширину",
- *    "По левому краю",
- *    "По центру",
- *    "По правому краю"
- * ]
- */
-export declare type AlignTypeWithStretch = 'stretch' | 'left' | 'center' | 'right';

package/dist/model/AlignType.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=AlignType.js.map

package/dist/model/AlignType.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AlignType.js","sourceRoot":"","sources":["../../src/model/AlignType.ts"],"names":[],"mappings":""}

package/lib/model/AlignText.d.ts

@@ -1,6 +0,0 @@
-import { type TextAlign } from '../ui-kit/Text/TextProps';
-import { type AlignType } from './AlignType';
-/**
- * @deprecated
- */
-export declare const AlignText: Record<AlignType, TextAlign>;

package/lib/model/AlignText.js

@@ -1,9 +0,0 @@
-/**
- * @deprecated
- */
-export const AlignText = {
-    left: 'text-left',
-    center: 'text-center',
-    right: 'text-right',
-};
-//# sourceMappingURL=AlignText.js.map

package/lib/model/AlignText.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AlignText.js","sourceRoot":"","sources":["../../src/model/AlignText.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAiC;IACrD,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,aAAa;IACrB,KAAK,EAAE,YAAY;CACpB,CAAC"}

package/lib/model/AlignType.d.ts

@@ -1,21 +0,0 @@
-/**
- * @title Выравнивание
- * @deprecated
- * @enumNames [
- *    "По левому краю",
- *    "По центру",
- *    "По правому краю"
- * ]
- */
-export declare type AlignType = 'left' | 'center' | 'right';
-/**
- * @title Выравнивание
- * @deprecated
- * @enumNames [
- *    "Во всю ширину",
- *    "По левому краю",
- *    "По центру",
- *    "По правому краю"
- * ]
- */
-export declare type AlignTypeWithStretch = 'stretch' | 'left' | 'center' | 'right';

package/lib/model/AlignType.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=AlignType.js.map

package/lib/model/AlignType.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AlignType.js","sourceRoot":"","sources":["../../src/model/AlignType.ts"],"names":[],"mappings":""}