@redneckz/wildless-cms-uni-blocks 0.6.42 → 0.6.44

package/mobile/src/utils/url.ts

@@ -15,6 +15,16 @@ export const getOrigin = (href?: string) => {
   return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
 
+export const getPathname = (href?: string) => {
+  if (!href || !isURL(href)) {
+    return undefined;
+  }
+
+  const url = new URL(href);
+
+  return url.pathname;
+};
+
 export const getHash = (href?: string) => {
   if (!href || !isURL(href)) {
     return undefined;

package/mobile/src/wlc.json

@@ -1,5 +1,7 @@
 {
   "PROD_BRANCH": "master",
   "FORCED_DRAFT_FLOW": false,
-  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b"
+  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
+  "BASE_PATH": "/natural/",
+  "SITEMAP": "sayt-rshb"
 }

package/package.json

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

package/src/ProjectSettings.ts

@@ -7,6 +7,7 @@ export interface ProjectSettings {
   SITEMAP?: string;
   FOOTER?: string;
   CDN?: string; // Should ends with "/"
+  BASE_PATH?: string; // Should ends with "/"
   YANDEX_MAP_API_KEY?: string;
   YANDEX_METRIKA_ID?: string;
 }
@@ -45,6 +46,11 @@ export const projectSettings = new (class implements ProjectSettings {
   get CDN() {
     return this._.CDN;
   }
+  get BASE_PATH() {
+    return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
+      ? `${this._.BASE_PATH}/`
+      : this._.BASE_PATH;
+  }
   get YANDEX_MAP_API_KEY() {
     return this._.YANDEX_MAP_API_KEY;
   }

package/src/api/LikeAPI.ts

@@ -114,7 +114,7 @@ export function LikeAPI() {
 
   async function auth(): Promise<UserData> {
     try {
-      const userData: UserData = JSON.parse(globalThis.localStorage.getItem(STORAGE_KEY) || '');
+      const userData: UserData = JSON.parse(globalThis.localStorage?.getItem(STORAGE_KEY) || '');
       if (userData?.token) {
         return userData;
       }
@@ -136,7 +136,7 @@ export function LikeAPI() {
 
       const { token, name } = await response.json();
 
-      globalThis.localStorage.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
+      globalThis.localStorage?.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
 
       return { token, name } as UserData;
     } catch (e) {

package/src/common.css

@@ -151,6 +151,56 @@ html {
   }
 }
 
+@layer components {
+  .md-container .h1 {
+    @apply text-h1;
+  }
+
+  .md-container .h2 {
+    @apply text-h2;
+  }
+
+  .md-container .h3 {
+    @apply text-h3;
+  }
+
+  .md-container .h4 {
+    @apply text-h4;
+  }
+
+  .md-container .h5 {
+    @apply text-h5;
+  }
+
+  .md-container .h6 {
+    @apply text-h6;
+  }
+
+  .md-container ul {
+    @apply list-inside list-disc;
+  }
+
+  .md-container ol {
+    @apply list-inside list-decimal;
+  }
+
+  .md-container p {
+    @apply text-l font-light;
+  }
+
+  .md-container li {
+    @apply text-l font-light;
+  }
+
+  .md-container li > p {
+    @apply inline;
+  }
+
+  .md-container a {
+    @apply text-primary-main;
+  }
+}
+
 /*
   Styling Yandex Map element
  */

package/src/components/Header/Header.tsx

@@ -1,8 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Router, useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../hooks/useRouter';
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
-import type { TopMenuItem } from '../../model/SitemapProps';
 import { projectSettings } from '../../ProjectSettings';
 import { isTopItemActive } from '../../services/sitemap/isTopItemActive';
 import type { SitemapDataProps } from '../../services/sitemap/SitemapProps';
@@ -31,7 +30,7 @@ export const Header = JSX<HeaderProps>(
         rest.options?.page?.fallback,
       );
 
-    const activeTopItem = showSubMenu ? getActiveItem(topItems, router) : null;
+    const activeTopItem = topItems?.find(isTopItemActive(router));
 
     const topMenu = topItems?.map((_, i) => (
       <TopItem
@@ -72,10 +71,3 @@ export const Header = JSX<HeaderProps>(
     );
   },
 );
-
-const getActiveItem = (topItems: TopMenuItem[] | undefined, router: Router) => {
-  const [firstPortal] = topItems || [];
-
-  // Если по слагу невозможно понять к какому подпорталу этот слаг относиться, то выбираем первый подпортал.
-  return topItems?.find(isTopItemActive(router)) || firstPortal;
-};

package/src/components/ProductTile/ProductTile.example.json

@@ -12,14 +12,17 @@
     "version": "primary",
     "benefits": [
       {
+        "type": "default",
         "label": "Преимущество 1",
         "description": "Описание"
       },
       {
+        "type": "default",
         "label": "Преимущество 2",
         "description": "Описание"
       },
       {
+        "type": "default",
         "label": "Преимущество 3",
         "description": "Описание"
       }

package/src/components/ProductTile/ProductTile.fixture.tsx

@@ -2,7 +2,7 @@ import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { ProductTile } from './ProductTile';
-import type { ProductTileContent } from './ProductTileContent';
+import type { Benefit, ProductTileContent } from './ProductTileContent';
 
 const imageSize = {
   height: 242,
@@ -37,38 +37,45 @@ const building: Picture = {
   size: imageSize,
 };
 
-const benefits = [
+const benefits: Benefit[] = [
   {
+    type: 'default',
     label: 'до 5 млн Р',
     description: 'Кредитный лимит',
   },
   {
+    type: 'default',
     label: 'от 12,5%',
     description: 'Процентная ставка',
   },
   {
+    type: 'default',
     label: 'до 5 лет',
     description: 'Срок кредитования',
   },
 ];
 
-const benefits2 = [
+const benefits2: Benefit[] = [
   {
+    type: 'default',
     label: '1 год',
     description: 'срок программы',
   },
 ];
 
-const multilineBenefits = [
+const multilineBenefits: Benefit[] = [
   {
+    type: 'default',
     label: 'Широкий',
     description: 'выбор платёжных систем',
   },
   {
+    type: 'default',
     label: 'Специальные',
     description: 'условия по снятию наличных условия по снятию наличных',
   },
   {
+    type: 'default',
     label: '0,5 балла',
     description: '«Урожай» за 100 рублей «Урожай» за 100 рублей',
   },

package/src/components/ProductTile/ProductTile.tsx

@@ -1,14 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import { VersionAdditionalStyleMap, VersionStyleMap } from '../../model/BlockVersion';
+import { VersionStyleMap } from '../../model/BlockVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
-import { Img } from '../../ui-kit/Img/Img';
 import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
 import { Headline } from '../Headline/Headline';
-import type { ProductTileContent, TextBenefit } from './ProductTileContent';
+import type { Benefit, ProductTileContent } from './ProductTileContent';
+import { renderAdditionalDescription } from './renderAdditionalDescription';
+import { renderBenefit } from './renderBenefit';
+import { renderImage } from './renderImage';
 
 export interface ProductTileProps extends ProductTileContent, UniBlockProps {}
 
@@ -43,7 +45,7 @@ export const ProductTile = JSX<ProductTileProps>(
           {...rest}
         />
         {renderBenefits(benefits, version, image)}
-        {additionalDescription ? renderAdditionalDescription(additionalDescription, image) : null}
+        {renderAdditionalDescription(additionalDescription, image)}
         {buttons?.length ? (
           <ButtonSection buttons={buttons} className="mt-5 gap-4 z-10 text-l" />
         ) : null}
@@ -53,53 +55,20 @@ export const ProductTile = JSX<ProductTileProps>(
   ),
 );
 
-function renderBenefits(benefits: TextBenefit[], version: BlockVersion, image?: Picture) {
+function renderBenefits(benefits: Benefit[], version: BlockVersion, image?: Picture) {
+  if (!benefits.length) {
+    return null;
+  }
+
   // picture width = 242px. Text can overlay picture 20px deep. Outer paddings_x = 36px. 242-36-20 = 186px
-  const BENEFITS_WIDTH = image?.src ? 'max-w-[calc(100%-186px)]' : '100%';
+  const benefitsWidth = image?.src ? 'max-w-[calc(100%-186px)]' : '100%';
 
   return (
     <div
       className={`z-10 grid grid-cols-[max-content_1fr] auto-rows-auto gap-x-6 gap-y-2.5 items-baseline
-        ${BENEFITS_WIDTH}`}
+        ${benefitsWidth}`}
     >
       {benefits.length ? benefits.map(renderBenefit(version)) : null}
     </div>
   );
 }
-
-const renderBenefit =
-  (version: BlockVersion = 'primary') =>
-  (benefit: TextBenefit, i: number) => {
-    const { label = '', description = '' } = benefit;
-
-    return [
-      <div key={`label-${i}`} className="text-h6">
-        {label}
-      </div>,
-      <div key={`desc-${i}`} className={`text-m-light ${VersionAdditionalStyleMap[version]}`}>
-        {description}
-      </div>,
-    ];
-  };
-
-function renderAdditionalDescription(additionalDescription: string, image?: Picture) {
-  // picture width = 242px. Text can overlay picture 20px deep. Outer paddings_x = 36px. 242-36-20 = 186px
-  const DESCRIPTION_WIDTH = image?.src ? 'max-w-[calc(100%-186px)]' : '100%';
-
-  return (
-    <div className={`text-m-light mt-2.5 z-10 ${DESCRIPTION_WIDTH}`}>{additionalDescription}</div>
-  );
-}
-
-function renderImage(image?: Picture, isImageOnRightSide?: boolean) {
-  if (!image?.src) {
-    return null;
-  }
-
-  return (
-    <Img
-      className={`absolute ${isImageOnRightSide ? 'right-0' : 'left-0'} bottom-0`}
-      image={image}
-    />
-  );
-}

package/src/components/ProductTile/ProductTile.ui.json

@@ -1 +1,14 @@
-{}
+{
+  "content": {
+    "benefits": {
+      "items": {
+        "md": {
+          "ui:widget": "html"
+        },
+        "type": {
+          "ui:widget": "hidden"
+        }
+      }
+    }
+  }
+}

package/src/components/ProductTile/ProductTileContent.ts

@@ -2,8 +2,32 @@ import type { BlockVersion } from '../../model/BlockVersion';
 import type { DescriptionProps, HeadlineProps, LabelProps } from '../../model/HeadlineType';
 import type { Picture } from '../../model/Picture';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { MarkdownTextProps } from '../../ui-kit/MarkdownText/MarkdownTextProps';
 
-export type TextBenefit = DescriptionProps & LabelProps;
+/**
+ * @title Стандартный
+ */
+type TextBenefit = DescriptionProps &
+  LabelProps & {
+    /** @default default */
+    type: 'default';
+  };
+
+/**
+ * @title Форматированный текст
+ */
+type MarkdownTextContent = MarkdownTextProps & {
+  /** @default md */
+  type: 'md';
+};
+
+/**
+ * @title Преимущество
+ * @default{
+ *  "type": "default"
+ * }
+ */
+export type Benefit = TextBenefit | MarkdownTextContent;
 
 /**
  * @title Продуктовая плитка
@@ -30,7 +54,7 @@ export type ProductTileContent = HeadlineProps &
      * @title Преимущества
      * @maxItems 7
      */
-    benefits?: TextBenefit[];
+    benefits?: Benefit[];
     /** @title Дополнительное описание */
     additionalDescription?: string;
     /** @title Картинка справа/текст слева */

package/src/components/ProductTile/renderAdditionalDescription.tsx

@@ -0,0 +1,30 @@
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { Picture } from '../../model/Picture';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
+import type { TextColor } from '../../ui-kit/Text/TextProps';
+
+const DESCRIPTION_STYLE_MAP: Record<BlockVersion, TextColor> = {
+  primary: 'text-secondary-text',
+  secondary: 'text-white',
+};
+
+export function renderAdditionalDescription(
+  additionalDescription?: string,
+  image?: Picture,
+  version: BlockVersion = 'primary',
+) {
+  if (!additionalDescription) {
+    return null;
+  }
+
+  // picture width = 242px. Text can overlay picture 20px deep. Outer paddings_x = 36px. 242-36-20 = 186px
+  const descriptionWidth = image?.src ? 'max-w-[calc(100%-186px)]' : '100%';
+
+  return (
+    <div className={`mt-2.5 z-10 ${descriptionWidth}`}>
+      <Paragraph size="text-m" font="font-light" color={DESCRIPTION_STYLE_MAP[version]}>
+        {additionalDescription}
+      </Paragraph>
+    </div>
+  );
+}

package/src/components/ProductTile/renderBenefit.tsx

@@ -0,0 +1,39 @@
+import type { BlockVersion } from '../../model/BlockVersion';
+import { MarkdownText } from '../../ui-kit/MarkdownText/MarkdownText';
+import { Text } from '../../ui-kit/Text/Text';
+import type { TextColor } from '../../ui-kit/Text/TextProps';
+import { assertUnreachable } from '../../utils/assertUnreachable';
+import type { Benefit } from './ProductTileContent';
+
+const LABEL_STYLE_MAP: Record<BlockVersion, TextColor> = {
+  primary: 'text-secondary-text',
+  secondary: 'text-white',
+};
+
+export const renderBenefit =
+  (version: BlockVersion = 'primary') =>
+  // Linter doesn't understand that switch processes all cases
+  // eslint-disable-next-line consistent-return
+  (benefit: Benefit, i: number) => {
+    const { type } = benefit;
+
+    if (!(type === 'default' || type === 'md')) {
+      return null;
+    }
+
+    switch (type) {
+      case 'default':
+        return [
+          <Text key={`label-${i}`} size="text-h6">
+            {benefit.label}
+          </Text>,
+          <Text key={`desc-${i}`} size="text-m-light" color={LABEL_STYLE_MAP[version]}>
+            {benefit.description}
+          </Text>,
+        ];
+      case 'md':
+        return <MarkdownText md={benefit.md} />;
+      default:
+        assertUnreachable(benefit);
+    }
+  };

package/src/components/ProductTile/renderImage.tsx

@@ -0,0 +1,15 @@
+import type { Picture } from '../../model/Picture';
+import { Img } from '../../ui-kit/Img/Img';
+
+export function renderImage(image?: Picture, isImageOnRightSide?: boolean) {
+  if (!image?.src) {
+    return null;
+  }
+
+  return (
+    <Img
+      className={`absolute ${isImageOnRightSide ? 'right-0' : 'left-0'} bottom-0`}
+      image={image}
+    />
+  );
+}

package/src/components/TextBlock/TextBlock.tsx

@@ -3,51 +3,43 @@ import type { UniBlockProps } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Img } from '../../ui-kit/Img/Img';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
+import { Text } from '../../ui-kit/Text/Text';
 import type { TextBlockContent, TextBlockVersion } from './TextBlockContent';
 
 export interface TextBlockProps extends TextBlockContent, UniBlockProps {}
 
-const textBlockStyleMaps: Record<
-  TextBlockVersion,
-  { background: string; icon: string; title: string; description: string }
-> = {
-  primary: {
-    background: 'bg-white',
-    icon: 'bg-primary-main text-white',
-    title: 'text-primary-text',
-    description: 'text-secondary-text',
-  },
-  secondary: {
-    background: 'bg-primary-main',
-    icon: 'bg-white text-primary-main',
-    title: 'text-white',
-    description: 'text-white',
-  },
-  'secondary-light': {
-    background: 'bg-primary-main/10',
-    icon: 'bg-primary-main text-white',
-    title: 'text-primary-text',
-    description: 'text-secondary-text',
-  },
+const textBlockBack: Record<TextBlockVersion, string> = {
+  primary: 'bg-white',
+  secondary: 'bg-primary-main',
+  'secondary-light': 'bg-primary-main/10',
 };
 
 export const TextBlock = JSX<TextBlockProps>(
-  ({ title, description, blockVersion = 'primary', iconVersion, image, className, ...rest }) => {
-    const textBlockStyleMap = textBlockStyleMaps[blockVersion];
+  ({
+    className = '',
+    title,
+    description,
+    blockVersion = 'primary',
+    iconVersion,
+    image,
+    ...rest
+  }) => {
+    const isSecondaryBlock = blockVersion === 'secondary';
 
     return (
       <BlockWrapper
-        className={`font-sans px-9 py-4 flex ${textBlockStyleMap.background} ${className || ''}`}
+        className={`px-9 py-4 flex gap-3 ${textBlockBack[blockVersion]} ${className}`}
         {...rest}
       >
-        {iconVersion === 'small' ? renderIcon(textBlockStyleMap.icon) : null}
+        {iconVersion === 'small' ? (
+          <div className="mt-1">{renderIcon(isSecondaryBlock)}</div>
+        ) : null}
         {iconVersion === 'big' ? renderImage(image) : null}
-        <div className="py-0.5">
-          {title ? (
-            <div className={`text-l font-medium mb-1 ${textBlockStyleMap.title}`}>{title}</div>
-          ) : null}
+        <div>
+          {title ? renderTitle(title, isSecondaryBlock) : null}
           {description ? (
-            <div className={`text-s ${textBlockStyleMap.description}`}>{description}</div>
+            <div className="mt-1">{renderDescription(description, isSecondaryBlock)}</div>
           ) : null}
         </div>
       </BlockWrapper>
@@ -55,14 +47,30 @@ export const TextBlock = JSX<TextBlockProps>(
   },
 );
 
-function renderIcon(className: string) {
-  return (
-    <div className="pt-1.5 pl-1 pr-4">
-      <div className={`rounded-full h-4 w-4 text-center text-xs-light ${className}`}>i</div>
-    </div>
-  );
-}
+const renderIcon = (isSecondaryBlock: boolean) => (
+  <div
+    className={`rounded-full h-4 w-4 text-center text-xs-light ${
+      isSecondaryBlock ? 'bg-white text-primary-main' : 'bg-primary-main text-white'
+    }`}
+  >
+    i
+  </div>
+);
 
-function renderImage(image?: Picture) {
-  return image?.src ? <Img className="pt-0.5 pr-3" image={image} /> : null;
-}
+const renderImage = (image?: Picture) => (image?.src ? <Img image={image} /> : null);
+
+const renderTitle = (title: string, isSecondaryBlock: boolean) => (
+  <Text
+    size="text-l"
+    font="font-medium"
+    color={isSecondaryBlock ? 'text-white' : 'text-primary-text'}
+  >
+    {title}
+  </Text>
+);
+
+const renderDescription = (description: string, isSecondaryBlock: boolean) => (
+  <Paragraph size="text-s" color={isSecondaryBlock ? 'text-white' : 'text-secondary-text'}>
+    {description}
+  </Paragraph>
+);

package/src/content-page-repository/transformImg.ts

@@ -1,13 +1,13 @@
 import fs from 'fs';
 import path from 'path';
-import util from 'util';
-import sharp from 'sharp';
 import type { ResizeOptions, Sharp } from 'sharp';
+import sharp from 'sharp';
+import util from 'util';
 import type { ImageSize } from '../model/ImageSize';
-import type { TransformationOptions } from './TransformationOptions';
 import type { ImgAlignment, ImgSource, Picture } from '../model/Picture';
-import { transformSrc } from './transformSrc';
 import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty';
+import type { TransformationOptions } from './TransformationOptions';
+import { transformSrc } from './transformSrc';
 
 const mkdir = util.promisify(fs.mkdir);
 
@@ -126,20 +126,12 @@ function getCompositionResizeSize(
   const { width, height } = size;
   const { width: containerWidth, height: containerHeight } = containerSize;
 
-  let widthRatio = 0;
-  let heightRatio = 0;
-
   if (!(width || height)) {
     return undefined;
   }
 
-  if (width) {
-    widthRatio = containerWidth / width;
-  }
-
-  if (height) {
-    heightRatio = containerHeight / height;
-  }
+  const widthRatio = width ? containerWidth / width : 0;
+  const heightRatio = height ? containerHeight / height : 0;
 
   return widthRatio > heightRatio
     ? { width: Math.min(Number(width), containerWidth) }

package/src/content-page-repository/transformMarkdown.ts

@@ -1,6 +1,6 @@
-import { unified } from 'unified';
-import remarkParse from 'remark-parse';
 import remarkHtml from 'remark-html';
+import remarkParse from 'remark-parse';
+import { unified } from 'unified';
 
 export async function transformMarkdown(markdown: string | null | undefined): Promise<string> {
   if (!markdown) {
@@ -9,5 +9,5 @@ export async function transformMarkdown(markdown: string | null | undefined): Pr
 
   const result = await unified().use(remarkParse).use(remarkHtml).process(markdown);
 
-  return result.toString('utf-8');
+  return result.toString('utf-8').replaceAll(/<h(\d)>([^<]*)<\/h\d>/g, '<p class="h$1">$2</p>');
 }