@redneckz/wildless-cms-uni-blocks 0.12.7 → 0.12.8

package/src/components/LinkDocs/LinkDocsContent.ts

@@ -1,6 +1,8 @@
+import { Attachment } from '../../model/Attachment';
+import { EmptyOption } from '../../model/EmptyOptionType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { LinkProps } from '../../model/LinkProps';
+import type { LinkProps, Target } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
 import type { TextAlign } from '../../ui-kit/Text/TextProps';
 
@@ -13,14 +15,40 @@ import type { TextAlign } from '../../ui-kit/Text/TextProps';
  */
 export type LinkColumnsMode = 'single' | 'double';
 
-/**
- * @title Элемент списка
- */
-export interface LinkDocsItem extends LinkProps {
+export interface LinkDoc extends LinkProps {
   /** @title размер файла */
   fileSize?: string;
 }
 
+export interface AttachmentDoc {
+  /** @title Текст */
+  text?: string;
+  /** @title */
+  attachment?: Attachment;
+  /** @title размер файла */
+  fileSize?: string;
+  /** @default "" */
+  target?: Target;
+}
+
+/**
+ * @title Ссылка на документ
+ * @default {"docType": "Link"}
+ */
+export type LinkDocDef = LinkDoc & {
+  docType: 'Link';
+};
+
+/**
+ * @title Файл
+ * @default {"docType": "Attachment"}
+ */
+export type AttachmentDocDef = AttachmentDoc & {
+  docType: 'Attachment';
+};
+
+export type DocBlockDef = EmptyOption | LinkDocDef | AttachmentDocDef;
+
 /**
  * @title Список документов
  */
@@ -28,7 +56,7 @@ export type LinkDocsContent = UniBlockContent &
   HeadlineCommonProps &
   IconProps & {
     /** @title Список */
-    documents?: LinkDocsItem[];
+    documents?: DocBlockDef[];
     columnsMode?: LinkColumnsMode;
     /** @title Выравнивание */
     align?: TextAlign;

package/src/components/LinkDocs/linkDocsContentExample.ts

@@ -4,20 +4,32 @@ export const linkDocsContentExample: LinkDocsContent = {
   title: 'Дополнительные документы',
   description: 'Ответы на часто задаваемые вопросы',
   documents: [
-    { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
-    { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
-    { text: 'GlassIcon', href: '/abc3/map.jpeg' },
-    { text: 'no icon', href: '/abc4' },
-    { text: 'документ 5', href: '/abc5' },
-    { text: 'документ 6', href: '/abc6/abc.pdf' },
-    { text: 'Text text text', href: '/abc7/yolo.png' },
     {
+      docType: 'Attachment',
+      text: 'target self',
+      attachment: { src: '/abc1/cooldoc.doc' },
+      target: '_self',
+    },
+    { docType: 'Link', text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
+    { docType: 'Link', text: 'GlassIcon', href: '/abc3/map.jpeg' },
+    { docType: 'Link', text: 'no icon', href: '/abc4' },
+    { docType: 'Link', text: 'документ 5', href: '/abc5' },
+    { docType: 'Link', text: 'документ 6', href: '/abc6/abc.pdf' },
+    { docType: 'Link', text: 'Text text text', href: '/abc7/yolo.png' },
+    {
+      docType: 'Link',
       text: 'Some more generic text to stretch item, and even more, more text, and more generic text, and even more, more text, and even more',
       href: '/abc8/archive.zip',
       fileSize: '2.3МБ',
     },
-    { text: 'И ещё немного текста', href: '/abc9/rarniw.rar', fileSize: '666МБ' },
     {
+      docType: 'Link',
+      text: 'И ещё немного текста',
+      href: '/abc9/rarniw.rar',
+      fileSize: '666МБ',
+    },
+    {
+      docType: 'Link',
       text: 'Форматируем, сортируем, смотрим как отображается...',
       href: '/abc10/',
       fileSize: '65ГБ',

package/src/components/LinkDocs/linkIconStyle.mobile.ts

@@ -0,0 +1 @@
+export const linkIconStyle = 'min-w-11 min-h-11 h-fit p-2.5 bg-main-divider rounded-md';

package/src/components/LinkDocs/linkIconStyle.ts

@@ -0,0 +1 @@
+export const linkIconStyle = 'min-w-6 min-h-6';

package/src/components/VerticalLayout/VerticalLayout.fixture.mobile.tsx

@@ -3,11 +3,11 @@ import '../../setup-fixture';
 import { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import type { Picture } from '../../model/Picture';
 import { Blocks } from '../Blocks';
+import type { LinkDocsContent } from '../LinkDocs/LinkDocsContent';
 import { PRODUCT_TILE } from '../ProductTile/ProductTile.fixture';
 import { RICH_TEXT_SEPARATOR } from '../RichTextBlock/RichTextBlock.fixture';
 import type { TextBlockContent } from '../TextBlock/TextBlockContent';
 import { VerticalLayout } from './VerticalLayout';
-import type { LinkDocsContent } from '../LinkDocs/LinkDocsContent';
 
 const options = {
   blocksRegistry: Blocks,
@@ -16,9 +16,9 @@ const options = {
 const linkDocsExample: LinkDocsContent = {
   description: 'Ответы на часто задаваемые вопросы',
   documents: [
-    { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
-    { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
-    { text: 'GlassIcon', href: '/abc3/map.jpeg' },
+    { docType: 'Link', text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
+    { docType: 'Link', text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
+    { docType: 'Link', text: 'GlassIcon', href: '/abc3/map.jpeg' },
   ],
 };
 

package/src/components/VerticalLayout/VerticalLayout.fixture.tsx

@@ -11,9 +11,9 @@ import { VerticalLayout } from './VerticalLayout';
 const linkDocsExample: LinkDocsContent = {
   description: 'Ответы на часто задаваемые вопросы',
   documents: [
-    { text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
-    { text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
-    { text: 'GlassIcon', href: '/abc3/map.jpeg' },
+    { docType: 'Link', text: 'target self', href: '/abc1/cooldoc.doc', target: '_self' },
+    { docType: 'Link', text: 'target blank', href: '/abc2/wtf.rtf', target: '_blank' },
+    { docType: 'Link', text: 'GlassIcon', href: '/abc3/map.jpeg' },
   ],
 };
 

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

@@ -1,12 +1,12 @@
 import fs from 'fs';
 import path from 'path';
 import util from 'util';
+import { Attachment } from '../model/Attachment';
 import type { ContentPageDef } from '../model/ContentPageDef';
-import { LinkProps } from '../model/LinkProps';
 import type { Picture } from '../model/Picture';
 import { mapJSON } from './mapJSON';
 import type { TransformationOptions } from './TransformationOptions';
-import { transformDocumentLink } from './transformDocumentLink';
+import { transformDocument } from './transformDocument';
 import { transformHTML } from './transformHTML';
 import { transformMarkdown } from './transformMarkdown';
 import { transformPicture } from './transformPicture';
@@ -16,7 +16,17 @@ const writeFile = util.promisify(fs.writeFile);
 
 const OUTPUT_SUFFIX = '.static';
 
-const DOCUMENT_EXT_LIST = ['.txt', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.pdf'];
+const DOCUMENT_EXT_LIST = [
+  '.txt',
+  '.doc',
+  '.docx',
+  '.xls',
+  '.xlsx',
+  '.xlsb',
+  '.ppt',
+  '.pptx',
+  '.pdf',
+];
 
 export async function transformContentPage(
   pagePath: string,
@@ -31,8 +41,8 @@ export async function transformContentPage(
         return await transformMarkdown(value as string);
       } else if (isHTML(key, value)) {
         return await transformHTML(value as string);
-      } else if (isDocumentLink(value)) {
-        return await transformDocumentLink(value, pagePath, options);
+      } else if (isDocument(value)) {
+        return await transformDocument(value, pagePath, options);
       } else if (isPicture(value)) {
         return await transformPicture(value, pagePath, options);
       }
@@ -55,8 +65,8 @@ const isMarkdown = (key: string, value: any): value is string =>
   isString(value) && key?.endsWith('__md');
 const isHTML = (key: string, value: any): value is string =>
   isString(value) && key?.endsWith('__html');
-const isDocumentLink = (_: any): _ is LinkProps =>
-  Boolean(_ && isLocalPath(_?.href) && isDocumentExt(path.extname(_?.href as string)));
+const isDocument = (_: any): _ is Attachment =>
+  Boolean(_ && isLocalPath(_?.src) && isDocumentExt(path.extname(_?.src as string)));
 const isDocumentExt = (input: string) =>
   DOCUMENT_EXT_LIST.some((ext) => input.toLowerCase().endsWith(ext));
 const isPicture = (_: any): _ is Picture => Boolean(_ && isLocalPath(_?.src));

package/{mobile/src/content-page-repository/transformDocumentLink.ts → src/content-page-repository/transformDocument.ts}

@@ -1,22 +1,22 @@
 import fs from 'fs';
 import path from 'path';
 import util from 'util';
-import type { LinkProps } from '../model/LinkProps';
+import { Attachment } from '../model/Attachment';
 import type { TransformationOptions } from './TransformationOptions';
 
 const copyFile = util.promisify(fs.copyFile);
 
-export async function transformDocumentLink(
-  link: LinkProps,
+export async function transformDocument(
+  attachment: Attachment,
   pagePath: string,
   options: TransformationOptions,
-): Promise<LinkProps> {
-  if (!link?.href) {
-    return link;
+): Promise<Attachment> {
+  if (!attachment?.src) {
+    return attachment;
   }
 
   const { contentDir, publicDir } = options;
-  const input = path.join(path.dirname(pagePath), link.href);
+  const input = path.join(path.dirname(pagePath), attachment.src);
   const docRelativePath = path.relative(contentDir, input);
   const output = path.join(publicDir, docRelativePath);
 
@@ -25,13 +25,13 @@ export async function transformDocumentLink(
   } catch (e) {
     console.info(`No "${input}" attachment found on page: "${pagePath}"`);
 
-    return link;
+    return attachment;
   }
 
-  const href = path.join('/', docRelativePath);
+  const src = path.join('/', docRelativePath);
 
   return {
-    ...link,
-    href,
+    ...attachment,
+    src,
   };
 }

package/src/hooks/useRouter.ts

@@ -9,6 +9,7 @@ export interface Router {
   basePath?: string;
   push: (url: string, as?: string, options?: RouterOptions) => void;
   replace: (url: string, as?: string, options?: RouterOptions) => void;
+  back: () => void;
 }
 
 export function useRouter(): Router {
@@ -25,6 +26,9 @@ useRouter._impl = (): Router => ({
   replace: () => {
     // Do nothing
   },
+  back: () => {
+    // Do nothing
+  },
 });
 
 useRouter.setup = (impl: () => Router) => {

package/src/icons/ChevronLeft.svg

@@ -1,3 +1,3 @@
-<svg title="Стрелка 'Вправо'" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg title="Стрелка 'Влево'" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M14.7071 6.29289C15.0976 6.68342 15.0976 7.31658 14.7071 7.70711L10.4142 12L14.7071 16.2929C15.0976 16.6834 15.0976 17.3166 14.7071 17.7071C14.3166 18.0976 13.6834 18.0976 13.2929 17.7071L8.29289 12.7071C7.90237 12.3166 7.90237 11.6834 8.29289 11.2929L13.2929 6.29289C13.6834 5.90237 14.3166 5.90237 14.7071 6.29289Z" fill="currentColor"/>
 </svg>