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

package/mobile/src/components/Footer/SocialMedia.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import { type Picture } from '../../model/Picture';
-import { type ButtonContent } from '../../ui-kit/Button/ButtonContent';
+import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { Picture } from '../../model/Picture';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
@@ -12,25 +13,27 @@ export interface SocialMediaProps {
   media?: ButtonContent[];
   showButtonText?: boolean;
   stretched?: boolean;
+  version?: ButtonVersion;
 }
 
 export const SocialMedia = JSX<SocialMediaProps>(
-  ({ className = '', media, showButtonText, stretched, children }) => {
+  ({ className = '', media, showButtonText, stretched, version = 'white', children }) => {
     const [hasText, setHasText] = useState<boolean | undefined>();
     const buttons: ButtonContent[] | undefined = media?.map((_) => {
       const { href, icon, text } = _;
       const { iconMapped } = findIconByHref(href);
       const iconCustom = getFilteredIcon(icon) ?? iconMapped;
-      const buttonText = showButtonText ? { text } : {};
+      const buttonText = showButtonText ? { text } : { text: '' };
 
       if (!hasText && text) {
         setHasText(true);
       }
 
       return {
+        ..._,
         ...buttonText,
         icon: { ...iconCustom, iconVersion: 'color' },
-        version: 'white',
+        version,
       };
     });
 

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

@@ -15,6 +15,9 @@
           },
           "buttons": {
             "items": {
+              "href": {
+                "ui:field": "attachmentHref"
+              },
               "icon": {
                 "ui:field": "icon"
               },

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

@@ -4,6 +4,9 @@
       "ui:widget": "html"
     },
     "button": {
+      "href": {
+        "ui:field": "attachmentHref"
+      },
       "icon": {
         "ui:field": "icon"
       },

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

@@ -2,6 +2,9 @@
   "content": {
     "buttons": {
       "items": {
+        "href": {
+          "ui:field": "attachmentHref"
+        },
         "icon": {
           "ui:field": "icon"
         },
@@ -16,6 +19,9 @@
           "ui:field": "icon"
         },
         "button": {
+          "href": {
+            "ui:field": "attachmentHref"
+          },
           "icon": {
             "ui:field": "icon"
           },

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

@@ -16,6 +16,9 @@
               },
               "buttons": {
                 "items": {
+                  "href": {
+                    "ui:field": "attachmentHref"
+                  },
                   "icon": {
                     "ui:field": "icon"
                   },

package/mobile/src/content-page-repository/transformAttachmentLink.ts

@@ -0,0 +1,38 @@
+import fs from 'fs';
+import path from 'path';
+import util from 'util';
+import type { LinkProps } from '../model/LinkProps';
+import type { TransformationOptions } from './TransformationOptions';
+import { ATTACHMENT_PREFIX } from './transformContentPage';
+
+const copyFile = util.promisify(fs.copyFile);
+
+export async function transformAttachmentLink(
+  link: LinkProps,
+  pagePath: string,
+  options: TransformationOptions,
+): Promise<LinkProps> {
+  if (!link?.href) {
+    return link;
+  }
+
+  const { contentDir, publicDir } = options;
+  const input = link.href.replace(ATTACHMENT_PREFIX, '');
+  const docRelativePath = path.relative(contentDir, input);
+  const output = path.join(publicDir, docRelativePath);
+
+  try {
+    await copyFile(input, output);
+  } catch (e) {
+    console.info(`No "${input}" attachment found on page: "${pagePath}"`);
+
+    return link;
+  }
+
+  const href = path.join('/', docRelativePath);
+
+  return {
+    ...link,
+    href,
+  };
+}

package/mobile/src/content-page-repository/transformContentPage.ts

@@ -2,11 +2,13 @@ import { fileResolver, resolveRef } from '@redneckz/json-ref';
 import { type JSONNode } from '@redneckz/json-ref/lib/JSONNode';
 import fs from 'fs';
 import util from 'util';
-import { type Attachment } from '../model/Attachment';
-import { type ContentPageDef } from '../model/ContentPageDef';
-import { type Picture } from '../model/Picture';
+import type { Attachment } from '../model/Attachment';
+import type { ContentPageDef } from '../model/ContentPageDef';
+import type { LinkProps } from '../model/LinkProps';
+import type { Picture } from '../model/Picture';
 import { mapJSON } from './mapJSON';
-import { type TransformationOptions } from './TransformationOptions';
+import type { TransformationOptions } from './TransformationOptions';
+import { transformAttachmentLink } from './transformAttachmentLink';
 import { transformDocument } from './transformDocument';
 import { transformHTML } from './transformHTML';
 import { transformMarkdown } from './transformMarkdown';
@@ -17,6 +19,8 @@ const writeFile = util.promisify(fs.writeFile);
 
 const OUTPUT_SUFFIX = '.static';
 
+export const ATTACHMENT_PREFIX = 'file://';
+
 const DOCUMENT_EXT_LIST = [
   '.txt',
   '.doc',
@@ -42,6 +46,8 @@ export async function transformContentPage(
         return await transformMarkdown(value as string);
       } else if (isHTML(key, value)) {
         return await transformHTML(value as string);
+      } else if (isAttachmentLink(value)) {
+        return await transformAttachmentLink(value, pagePath, options);
       } else if (isDocumentRef(value)) {
         return await transformDocument(value, pagePath, options);
       } else if (isPicture(value)) {
@@ -67,6 +73,9 @@ const isMarkdown = (key: string, value: any): value is string =>
 const isHTML = (key: string, value: any): value is string =>
   isString(value) && key?.endsWith('__html');
 
+const isAttachmentLink = (_: any): _ is LinkProps =>
+  isLocalPath(_?.href) && _.href.startsWith(ATTACHMENT_PREFIX);
+
 const isDocumentRef = (_: any): _ is Attachment =>
   isLocalPath(_?.src) && DOCUMENT_EXT_LIST.some((ext) => _.src.toLowerCase().endsWith(ext));
 

package/mobile/src/content-page-repository/transformDocument.ts

@@ -17,7 +17,7 @@ export async function transformDocument(
   }
 
   const { contentDir, publicDir } = options;
-  const input = path.join(path.dirname(pagePath), attachment.src);
+  const input = attachment.src;
   const docRelativePath = path.relative(contentDir, input);
   const output = path.join(publicDir, docRelativePath);
   const inputFileSize = (await stat(input)).size;

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

@@ -37,7 +37,7 @@ export function transformImg(
     return src || '';
   }
 
-  const input = path.join(path.dirname(pagePath), src);
+  const input = src;
   const output = computeImgOutputPath(input, options);
 
   const { cache = defaultTransformationCache } = options;

package/mobile/src/ui-kit/List/ListContent.ts

@@ -1,6 +1,5 @@
 /**
  * @title Размер пунктов списка
- * @default M
  * @enumNames ["Очень маленький", "Маленький", "Средний", "Большой"]
  */
 export type ListItemSize = 'XS' | 'S' | 'M' | 'L';

package/package.json

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

package/src/components/Bonus/Bonus.ui.json

@@ -12,6 +12,9 @@
         },
         "buttons": {
           "items": {
+            "href": {
+              "ui:field": "attachmentHref"
+            },
             "icon": {
               "ui:field": "icon"
             },

package/src/components/BusinessBlock/BusinessBlock.ui.json

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

package/src/components/ButtonsBlock/ButtonsBlock.ui.json

@@ -2,6 +2,9 @@
   "content": {
     "buttons": {
       "items": {
+        "href": {
+          "ui:field": "attachmentHref"
+        },
         "icon": {
           "ui:field": "icon"
         },

package/src/components/Calculator/Calculator.ui.json

@@ -24,6 +24,9 @@
           },
           "buttons": {
             "items": {
+              "href": {
+                "ui:field": "attachmentHref"
+              },
               "icon": {
                 "ui:field": "icon"
               },

package/src/components/CarouselProductCard/CarouselProductCard.ui.json

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

package/src/components/CarouselRecommendationCard/CarouselRecommendationCard.tsx

@@ -54,7 +54,9 @@ export const CarouselRecommendationCard = JSX<RecommendationCardProps>(
             }
             rightImage={icon?.icon || icon?.src ? <Img image={icon} /> : null}
             buttons={
-              socialMedia.length ? <SocialMedia media={socialMedia} showButtonText={true} /> : null
+              socialMedia.length ? (
+                <SocialMedia media={socialMedia} showButtonText={true} version={rest.version} />
+              ) : null
             }
             isImageAlwaysOnRight={isImageAlwaysOnRight}
           >

package/src/components/CarouselTariffsCard/CarouselTariffsCard.ui.json

@@ -4,6 +4,9 @@
       "items": {
         "buttons": {
           "items": {
+            "href": {
+              "ui:field": "attachmentHref"
+            },
             "icon": {
               "ui:field": "icon"
             },

package/src/components/Footer/Footer.tsx

@@ -33,7 +33,9 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
         <div className={style(LEFT_COL_WIDTH, 'flex flex-col shrink-0 overflow-hidden space-y-xl')}>
           <Contacts items={contacts} />
           <SocialMedia media={socialMedia}>Соцсети</SocialMedia>
-          <SocialMedia media={mobileApps}>Мобильное приложение</SocialMedia>
+          <SocialMedia media={mobileApps} showButtonText={false}>
+            Мобильное приложение
+          </SocialMedia>
         </div>
         <Sitemap className="flex-grow" topItems={topItems} />
       </div>

package/src/components/Footer/SocialMedia.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import { type Picture } from '../../model/Picture';
-import { type ButtonContent } from '../../ui-kit/Button/ButtonContent';
+import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { Picture } from '../../model/Picture';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Text } from '../../ui-kit/Text/Text';
 import { style } from '../../utils/style';
@@ -12,25 +13,27 @@ export interface SocialMediaProps {
   media?: ButtonContent[];
   showButtonText?: boolean;
   stretched?: boolean;
+  version?: ButtonVersion;
 }
 
 export const SocialMedia = JSX<SocialMediaProps>(
-  ({ className = '', media, showButtonText, stretched, children }) => {
+  ({ className = '', media, showButtonText, stretched, version = 'white', children }) => {
     const [hasText, setHasText] = useState<boolean | undefined>();
     const buttons: ButtonContent[] | undefined = media?.map((_) => {
       const { href, icon, text } = _;
       const { iconMapped } = findIconByHref(href);
       const iconCustom = getFilteredIcon(icon) ?? iconMapped;
-      const buttonText = showButtonText ? { text } : {};
+      const buttonText = showButtonText ? { text } : { text: '' };
 
       if (!hasText && text) {
         setHasText(true);
       }
 
       return {
+        ..._,
         ...buttonText,
         icon: { ...iconCustom, iconVersion: 'color' },
-        version: 'white',
+        version,
       };
     });
 

package/src/components/ProductGallery/ProductGallery.ui.json

@@ -15,6 +15,9 @@
           },
           "buttons": {
             "items": {
+              "href": {
+                "ui:field": "attachmentHref"
+              },
               "icon": {
                 "ui:field": "icon"
               },

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.ui.json

@@ -4,6 +4,9 @@
       "ui:widget": "html"
     },
     "button": {
+      "href": {
+        "ui:field": "attachmentHref"
+      },
       "icon": {
         "ui:field": "icon"
       },

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

@@ -2,6 +2,9 @@
   "content": {
     "buttons": {
       "items": {
+        "href": {
+          "ui:field": "attachmentHref"
+        },
         "icon": {
           "ui:field": "icon"
         },
@@ -16,6 +19,9 @@
           "ui:field": "icon"
         },
         "button": {
+          "href": {
+            "ui:field": "attachmentHref"
+          },
           "icon": {
             "ui:field": "icon"
           },

package/src/components/TariffsTable/TariffsTable.ui.json

@@ -16,6 +16,9 @@
               },
               "buttons": {
                 "items": {
+                  "href": {
+                    "ui:field": "attachmentHref"
+                  },
                   "icon": {
                     "ui:field": "icon"
                   },

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

@@ -0,0 +1,38 @@
+import fs from 'fs';
+import path from 'path';
+import util from 'util';
+import type { LinkProps } from '../model/LinkProps';
+import type { TransformationOptions } from './TransformationOptions';
+import { ATTACHMENT_PREFIX } from './transformContentPage';
+
+const copyFile = util.promisify(fs.copyFile);
+
+export async function transformAttachmentLink(
+  link: LinkProps,
+  pagePath: string,
+  options: TransformationOptions,
+): Promise<LinkProps> {
+  if (!link?.href) {
+    return link;
+  }
+
+  const { contentDir, publicDir } = options;
+  const input = link.href.replace(ATTACHMENT_PREFIX, '');
+  const docRelativePath = path.relative(contentDir, input);
+  const output = path.join(publicDir, docRelativePath);
+
+  try {
+    await copyFile(input, output);
+  } catch (e) {
+    console.info(`No "${input}" attachment found on page: "${pagePath}"`);
+
+    return link;
+  }
+
+  const href = path.join('/', docRelativePath);
+
+  return {
+    ...link,
+    href,
+  };
+}

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

@@ -2,11 +2,13 @@ import { fileResolver, resolveRef } from '@redneckz/json-ref';
 import { type JSONNode } from '@redneckz/json-ref/lib/JSONNode';
 import fs from 'fs';
 import util from 'util';
-import { type Attachment } from '../model/Attachment';
-import { type ContentPageDef } from '../model/ContentPageDef';
-import { type Picture } from '../model/Picture';
+import type { Attachment } from '../model/Attachment';
+import type { ContentPageDef } from '../model/ContentPageDef';
+import type { LinkProps } from '../model/LinkProps';
+import type { Picture } from '../model/Picture';
 import { mapJSON } from './mapJSON';
-import { type TransformationOptions } from './TransformationOptions';
+import type { TransformationOptions } from './TransformationOptions';
+import { transformAttachmentLink } from './transformAttachmentLink';
 import { transformDocument } from './transformDocument';
 import { transformHTML } from './transformHTML';
 import { transformMarkdown } from './transformMarkdown';
@@ -17,6 +19,8 @@ const writeFile = util.promisify(fs.writeFile);
 
 const OUTPUT_SUFFIX = '.static';
 
+export const ATTACHMENT_PREFIX = 'file://';
+
 const DOCUMENT_EXT_LIST = [
   '.txt',
   '.doc',
@@ -42,6 +46,8 @@ export async function transformContentPage(
         return await transformMarkdown(value as string);
       } else if (isHTML(key, value)) {
         return await transformHTML(value as string);
+      } else if (isAttachmentLink(value)) {
+        return await transformAttachmentLink(value, pagePath, options);
       } else if (isDocumentRef(value)) {
         return await transformDocument(value, pagePath, options);
       } else if (isPicture(value)) {
@@ -67,6 +73,9 @@ const isMarkdown = (key: string, value: any): value is string =>
 const isHTML = (key: string, value: any): value is string =>
   isString(value) && key?.endsWith('__html');
 
+const isAttachmentLink = (_: any): _ is LinkProps =>
+  isLocalPath(_?.href) && _.href.startsWith(ATTACHMENT_PREFIX);
+
 const isDocumentRef = (_: any): _ is Attachment =>
   isLocalPath(_?.src) && DOCUMENT_EXT_LIST.some((ext) => _.src.toLowerCase().endsWith(ext));
 

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

@@ -17,7 +17,7 @@ export async function transformDocument(
   }
 
   const { contentDir, publicDir } = options;
-  const input = path.join(path.dirname(pagePath), attachment.src);
+  const input = attachment.src;
   const docRelativePath = path.relative(contentDir, input);
   const output = path.join(publicDir, docRelativePath);
   const inputFileSize = (await stat(input)).size;

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

@@ -37,7 +37,7 @@ export function transformImg(
     return src || '';
   }
 
-  const input = path.join(path.dirname(pagePath), src);
+  const input = src;
   const output = computeImgOutputPath(input, options);
 
   const { cache = defaultTransformationCache } = options;

package/src/ui-kit/List/ListContent.ts

@@ -1,6 +1,5 @@
 /**
  * @title Размер пунктов списка
- * @default M
  * @enumNames ["Очень маленький", "Маленький", "Средний", "Большой"]
  */
 export type ListItemSize = 'XS' | 'S' | 'M' | 'L';