@redneckz/wildless-cms-uni-blocks 0.9.1 → 0.9.3

package/mobile/lib/components/CarouselProductCard/CarouselProductCard.js.map

@@ -1 +1 @@
-{"version":3,"file":"CarouselProductCard.js","sourceRoot":"","sources":["../../../src/components/CarouselProductCard/CarouselProductCard.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CarouselProductCard.js","sourceRoot":"","sources":["../../../src/components/CarouselProductCard/CarouselProductCard.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/components/CarouselProductCard/CarouselProductCardContent.d.ts

@@ -3,6 +3,7 @@ import type { ButtonCommonIconProps } from '../../model/Button';
 import type { AdditionalDescriptionProps, HeadlineSmallProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
+import type { LinkCommonProps } from '../../model/LinkProps';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
 /**
  * @title Элемент списка
@@ -14,7 +15,7 @@ export interface ListProps {
 /**
  * @title Карточка продуктовой карусели
  */
-export declare type CarouselProductCardContent = UniBlockContent & HeadlineSmallProps & AdditionalDescriptionProps & IconProps & ButtonCommonIconProps & BulletsProps & {
+export declare type CarouselProductCardContent = UniBlockContent & HeadlineSmallProps & AdditionalDescriptionProps & IconProps & ButtonCommonIconProps & BulletsProps & LinkCommonProps & {
     /** @title Список */
     items?: ListProps[];
     align?: TextAlign;

package/mobile/lib/components/Footer/FooterContent.d.ts

@@ -1,6 +1,7 @@
 import type { DescriptionProps } from '../../model/HeadlineType';
 import type { LinkProps } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
 /**
  * @title Тип контакта
  * @enumNames [
@@ -23,6 +24,5 @@ export declare type ContactInfo = DescriptionProps & {
 export declare type SubMenuItem = LinkProps & IconProps;
 /**
  * @title Подвал
- * @hidden
  */
-export declare type FooterContent = {};
+export declare type FooterContent = UniBlockContent & {};

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

@@ -9,7 +9,6 @@
     }
   },
   "button": {
-    "href": "",
     "text": "Подробнее",
     "target": "_self",
     "version": "primary",

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

@@ -8,7 +8,5 @@
     }
   },
   "title": "Заголовок",
-  "description": "Описание",
-  "target": null,
-  "href": null
+  "description": "Описание"
 }

package/mobile/src/components/CarouselEventCard/CarouselEventCard.tsx

@@ -1,19 +1,29 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
-import { Text } from '../../ui-kit/Text/Text';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { style } from '../../utils/style';
-import type { UniBlockProps } from '../../model/JSXBlock';
+import { Text } from '../../ui-kit/Text/Text';
+import { useLink } from '../../hooks/useLink';
 import type { CarouselEventCardContent } from './CarouselEventCardContent';
+import type { UniBlockProps } from '../../model/JSXBlock';
 
 export interface CarouselEventCardProps extends CarouselEventCardContent, UniBlockProps {}
 
 export const CarouselEventCard = JSX<CarouselEventCardProps>(
-  ({ className = '', icon, title, description, href, target, ...rest }) => (
-    <BlockWrapper className={style('flex flex-col w-[365px]', className)} {...rest}>
-      <a href={href} target={target} role="link">
+  ({ className = '', icon, title, description, href, target, ...rest }) => {
+    const link = useLink();
+    const adjustedProps = link({ href, target });
+    const tagName = href ? 'a' : 'section';
+
+    return (
+      <BlockWrapper
+        className={style('flex flex-col w-[365px]', className)}
+        extraProps={adjustedProps}
+        tag={tagName}
+        {...rest}
+      >
         {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
         {icon?.src ? <Img image={icon} /> : null}
         {title ? (
@@ -26,7 +36,7 @@ export const CarouselEventCard = JSX<CarouselEventCardProps>(
             </Text>
           </div>
         ) : null}
-      </a>
-    </BlockWrapper>
-  ),
+      </BlockWrapper>
+    );
+  },
 );

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

@@ -17,7 +17,6 @@
     },
     "title": "Заголовок 1",
     "description": "Описание 1",
-    "href": "/credit-cards",
     "version": "primary",
     "isDotted": true,
     "items": [

package/mobile/src/components/CarouselProductCard/CarouselProductCard.tsx

@@ -1,34 +1,41 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
-import { Text } from '../../ui-kit/Text/Text';
+import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
-import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
+import { Text } from '../../ui-kit/Text/Text';
+import { useLink } from '../../hooks/useLink';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { CarouselProductCardContent, ListProps } from './CarouselProductCardContent';
+import type { Picture } from '../../model/Picture';
+import type { UniBlockProps } from '../../model/JSXBlock';
 
 export interface CarouselProductCardProps extends CarouselProductCardContent, UniBlockProps {}
 
 export const CarouselProductCard = JSX<CarouselProductCardProps>(
   ({
+    additionalDescription,
+    align = 'text-center',
+    button = {},
     className = '',
-    title,
-    headlineSmallVersion = 'H6',
     description,
-    additionalDescription,
+    headlineSmallVersion = 'H6',
+    href,
     icon,
+    isDotted = true,
     items = [],
-    button = {},
+    target,
+    title,
     version = 'primary',
-    isDotted = true,
-    align = 'text-center',
     ...rest
   }) => {
+    const link = useLink();
+    const adjustedProps = link({ href, target });
+    const tagName = href ? 'a' : 'section';
+
     return (
       <BlockWrapper
         className={style(
@@ -37,6 +44,8 @@ export const CarouselProductCard = JSX<CarouselProductCardProps>(
           align,
           className,
         )}
+        extraProps={adjustedProps}
+        tag={tagName}
         version={version}
         {...rest}
       >

package/mobile/src/components/CarouselProductCard/CarouselProductCardContent.ts

@@ -3,6 +3,7 @@ import type { ButtonCommonIconProps } from '../../model/Button';
 import type { AdditionalDescriptionProps, HeadlineSmallProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
+import type { LinkCommonProps } from '../../model/LinkProps';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
 /**
@@ -21,7 +22,8 @@ export type CarouselProductCardContent = UniBlockContent &
   AdditionalDescriptionProps &
   IconProps &
   ButtonCommonIconProps &
-  BulletsProps & {
+  BulletsProps &
+  LinkCommonProps & {
     /** @title Список */
     items?: ListProps[];
     align?: TextAlign;

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

@@ -18,8 +18,6 @@
     },
     "title": "Заголовок 1",
     "description": "Описание 1",
-    "target": null,
-    "href": null,
     "socialMedia": [
       {
         "href": "https://t.me",

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

@@ -1,7 +1,6 @@
 {
   "title": "Заголовок карточки",
   "button": {
-    "href": "",
     "text": "Кнопка",
     "target": "_self",
     "version": "secondary"

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

@@ -1,11 +1 @@
-{
-  "content": {
-    "subMenu": {
-      "items": {
-        "icon": {
-          "ui:field": "icon"
-        }
-      }
-    }
-  }
-}
+{}

package/mobile/src/components/Footer/FooterContent.ts

@@ -1,6 +1,7 @@
 import type { DescriptionProps } from '../../model/HeadlineType';
 import type { LinkProps } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
 
 /**
  * @title Тип контакта
@@ -27,7 +28,5 @@ export type SubMenuItem = LinkProps & IconProps;
 
 /**
  * @title Подвал
- * @hidden
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type FooterContent = {};
+export type FooterContent = UniBlockContent & {};

package/package.json

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

package/src/components/CarouselCatalogCard/CarouselCatalogCard.example.json

@@ -9,7 +9,6 @@
     }
   },
   "button": {
-    "href": "",
     "text": "Подробнее",
     "target": "_self",
     "version": "primary",

package/src/components/CarouselEventCard/CarouselEventCard.example.json

@@ -8,7 +8,5 @@
     }
   },
   "title": "Заголовок",
-  "description": "Описание",
-  "target": null,
-  "href": null
+  "description": "Описание"
 }

package/src/components/CarouselEventCard/CarouselEventCard.tsx

@@ -1,19 +1,29 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
-import { Text } from '../../ui-kit/Text/Text';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { style } from '../../utils/style';
-import type { UniBlockProps } from '../../model/JSXBlock';
+import { Text } from '../../ui-kit/Text/Text';
+import { useLink } from '../../hooks/useLink';
 import type { CarouselEventCardContent } from './CarouselEventCardContent';
+import type { UniBlockProps } from '../../model/JSXBlock';
 
 export interface CarouselEventCardProps extends CarouselEventCardContent, UniBlockProps {}
 
 export const CarouselEventCard = JSX<CarouselEventCardProps>(
-  ({ className = '', icon, title, description, href, target, ...rest }) => (
-    <BlockWrapper className={style('flex flex-col w-[365px]', className)} {...rest}>
-      <a href={href} target={target} role="link">
+  ({ className = '', icon, title, description, href, target, ...rest }) => {
+    const link = useLink();
+    const adjustedProps = link({ href, target });
+    const tagName = href ? 'a' : 'section';
+
+    return (
+      <BlockWrapper
+        className={style('flex flex-col w-[365px]', className)}
+        extraProps={adjustedProps}
+        tag={tagName}
+        {...rest}
+      >
         {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
         {icon?.src ? <Img image={icon} /> : null}
         {title ? (
@@ -26,7 +36,7 @@ export const CarouselEventCard = JSX<CarouselEventCardProps>(
             </Text>
           </div>
         ) : null}
-      </a>
-    </BlockWrapper>
-  ),
+      </BlockWrapper>
+    );
+  },
 );

package/src/components/CarouselProductCard/CarouselProductCard.example.json

@@ -17,7 +17,6 @@
     },
     "title": "Заголовок 1",
     "description": "Описание 1",
-    "href": "/credit-cards",
     "version": "primary",
     "isDotted": true,
     "items": [

package/src/components/CarouselProductCard/CarouselProductCard.tsx

@@ -1,34 +1,41 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
-import { Text } from '../../ui-kit/Text/Text';
+import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
-import { HEADLINE_SMALL_VERSION } from '../Headline/headlineVersionStyles';
+import { Text } from '../../ui-kit/Text/Text';
+import { useLink } from '../../hooks/useLink';
+import type { BlockVersion } from '../../model/BlockVersion';
 import type { CarouselProductCardContent, ListProps } from './CarouselProductCardContent';
+import type { Picture } from '../../model/Picture';
+import type { UniBlockProps } from '../../model/JSXBlock';
 
 export interface CarouselProductCardProps extends CarouselProductCardContent, UniBlockProps {}
 
 export const CarouselProductCard = JSX<CarouselProductCardProps>(
   ({
+    additionalDescription,
+    align = 'text-center',
+    button = {},
     className = '',
-    title,
-    headlineSmallVersion = 'H6',
     description,
-    additionalDescription,
+    headlineSmallVersion = 'H6',
+    href,
     icon,
+    isDotted = true,
     items = [],
-    button = {},
+    target,
+    title,
     version = 'primary',
-    isDotted = true,
-    align = 'text-center',
     ...rest
   }) => {
+    const link = useLink();
+    const adjustedProps = link({ href, target });
+    const tagName = href ? 'a' : 'section';
+
     return (
       <BlockWrapper
         className={style(
@@ -37,6 +44,8 @@ export const CarouselProductCard = JSX<CarouselProductCardProps>(
           align,
           className,
         )}
+        extraProps={adjustedProps}
+        tag={tagName}
         version={version}
         {...rest}
       >

package/src/components/CarouselProductCard/CarouselProductCardContent.ts

@@ -3,6 +3,7 @@ import type { ButtonCommonIconProps } from '../../model/Button';
 import type { AdditionalDescriptionProps, HeadlineSmallProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
+import type { LinkCommonProps } from '../../model/LinkProps';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
 /**
@@ -21,7 +22,8 @@ export type CarouselProductCardContent = UniBlockContent &
   AdditionalDescriptionProps &
   IconProps &
   ButtonCommonIconProps &
-  BulletsProps & {
+  BulletsProps &
+  LinkCommonProps & {
     /** @title Список */
     items?: ListProps[];
     align?: TextAlign;

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.example.json

@@ -18,8 +18,6 @@
     },
     "title": "Заголовок 1",
     "description": "Описание 1",
-    "target": null,
-    "href": null,
     "socialMedia": [
       {
         "href": "https://t.me",

package/src/components/CarouselTariffsCard/CarouselTariffsCard.example.json

@@ -1,7 +1,6 @@
 {
   "title": "Заголовок карточки",
   "button": {
-    "href": "",
     "text": "Кнопка",
     "target": "_self",
     "version": "secondary"

package/src/components/Footer/Footer.ui.json

@@ -1,11 +1 @@
-{
-  "content": {
-    "subMenu": {
-      "items": {
-        "icon": {
-          "ui:field": "icon"
-        }
-      }
-    }
-  }
-}
+{}

package/src/components/Footer/FooterContent.ts

@@ -1,6 +1,7 @@
 import type { DescriptionProps } from '../../model/HeadlineType';
 import type { LinkProps } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
+import type { UniBlockContent } from '../../model/JSXBlock';
 
 /**
  * @title Тип контакта
@@ -27,7 +28,5 @@ export type SubMenuItem = LinkProps & IconProps;
 
 /**
  * @title Подвал
- * @hidden
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type FooterContent = {};
+export type FooterContent = UniBlockContent & {};

package/bin/migration-scripts/0.4.5.js

@@ -1,109 +0,0 @@
-import { deleteEmptyProps, renameProp } from '../utils.js';
-
-export const description = 'v0.4.5';
-
-export default (unitPath, content) => {
-  if (!content?.blocks) {
-    return content;
-  }
-
-  for (const block of content.blocks) {
-    adjustNavigatorTabsBlock(block);
-    adjustGroupBlock(block);
-    adjustTariffsTableBlock(block);
-  }
-
-  return { ...content };
-};
-
-function adjustNavigatorTabsBlock(block) {
-  if (block.type !== 'NavigatorTabs') {
-    return;
-  }
-
-  block.type = 'Tabs';
-
-  if (block.content) {
-    renameProp(block.content, 'navigatorTabs', 'tabs');
-
-    for (const item in block.content.tabs) {
-      item.type = 'link';
-      Reflect.deleteProperty(item, 'label');
-    }
-  }
-}
-
-function adjustGroupBlock(block) {
-  if (block.type !== 'GroupBlock') {
-    return;
-  }
-
-  // GroupBlock переделываем в Tabs
-  // Страницы в которых есть GroupBlock credit-cards / debet-cards / deposits / loans / vse-vidy-strahovaniya1
-
-  block.type = 'Tabs';
-
-  if (block.content) {
-    renameProp(block.content, 'tabs', 'labels');
-    renameProp(block.content, 'isShowCounter', 'showCounter');
-
-    for (const item of block.content.labels) {
-      item.type = 'group';
-      renameProp(item, 'tag', 'ref');
-      Reflect.deleteProperty(item, 'index');
-    }
-
-    Reflect.deleteProperty(block.content, 'blocks');
-    Reflect.deleteProperty(block.content, 'groupBlocks');
-  }
-}
-
-function adjustTariffsTableBlock(block) {
-  if (block.type !== 'TariffsTable' || !block.content || !block.content.columns) {
-    return;
-  }
-
-  renameProp(block.content, 'columns', 'tariffsColumns');
-
-  for (const column of block.content.tariffsColumns) {
-    for (const columnInner of column.data) {
-      adjustTariffsColumnsInner(columnInner);
-    }
-  }
-}
-
-function adjustTariffsColumnsInner(columnInner) {
-  for (let index = 0; index < columnInner.length; index++) {
-    const cell = columnInner[index];
-
-    deleteEmptyProps(cell);
-
-    if (Object.keys(cell).length === 2 && cell?.label && cell.description) {
-      addCellType(cell);
-    } else if (Object.keys(cell).length < 2) {
-      addCellType(cell);
-    } else {
-      // Если типов два и более и это не labels и description то разносим по разным ячейкам
-      const newArr = [];
-      for (const key in cell) {
-        newArr.push(addCellType({ [key]: cell[key] }));
-      }
-      columnInner.splice(index, 1, ...newArr);
-    }
-  }
-}
-
-// Добавить тип в ячейку компонента TariffsTable
-function addCellType(cell) {
-  if (cell?.label || cell?.description) {
-    cell.tableCellType = 'LabelDescription';
-  }
-  if (cell?.buttons) {
-    cell.tableCellType = 'Buttons';
-  }
-  if (cell?.list) {
-    cell.tableCellType = 'List';
-  }
-
-  return cell;
-}

package/bin/migration-scripts/0.5.10.js

@@ -1,36 +0,0 @@
-export const description = 'v0.5.10';
-
-export default (unitPath, content) => {
-  if (!content?.blocks) {
-    return content;
-  }
-
-  for (const block of content.blocks) {
-    adjustBonusBlock(block);
-  }
-
-  return { ...content };
-};
-
-function adjustBonusBlock(block) {
-  if (
-    block.type !== 'Bonus' ||
-    !block.content ||
-    !block.content.bonusItems ||
-    !block.content.bonusItems.every((i) => i.bonusCount || i.bonusName)
-  ) {
-    return;
-  }
-
-  if (block.content) {
-    for (const item of block.content.bonusItems) {
-      item.bonusItemContent = {
-        bonusType: 'count',
-        bonusCount: item.bonusCount,
-        bonusName: item.bonusName,
-      };
-      Reflect.deleteProperty(item, 'bonusCount');
-      Reflect.deleteProperty(item, 'bonusName');
-    }
-  }
-}