@redneckz/wildless-cms-uni-blocks 0.2.83 → 0.2.86

package/src/index.ts

@@ -1,33 +1,26 @@
 export { setup } from '@redneckz/uni-jsx';
-
-export type { ProjectSettings } from './ProjectSettings';
-export { projectSettings } from './ProjectSettings';
-
-export { LikeAPI } from './api/LikeAPI';
 export { DaDataAPI } from './api/DaDataAPI';
-
-export type { SitemapContent } from './model/SitemapContent';
-
-export type { Img, ImgSource, Picture } from './model/Picture';
-export type { BlockDef, UniBlockProps, ContentPageMeta, ContentPageDef } from './types';
+export { LikeAPI } from './api/LikeAPI';
+export type { BlockContent } from './components/BlockContent';
+export { Blocks } from './components/Blocks';
+export { ContentPage } from './components/ContentPage/ContentPage';
+export type { BlockDecorator } from './components/ContentPage/ContentPage';
 export type {
-  ContentPageContext,
-  Router,
   AsyncDataHook,
+  ContentPageContext,
   GeolocationHook,
-  LikeService,
   HandlerDecorator,
+  LikeService,
+  Router,
   Search,
 } from './components/ContentPage/ContentPageContext';
-
 export { ContentPageHead } from './components/ContentPage/ContentPageHead';
-export type { BlockDecorator } from './components/ContentPage/ContentPage';
-export { ContentPage } from './components/ContentPage/ContentPage';
 export { toMobilePage } from './components/ContentPage/toMobilePage';
-
-export { Blocks } from './components/Blocks';
-export type { BlockContent } from './components/BlockContent';
 export { MobileBlocks } from './components/MobileBlocks';
-
-export * as url from './utils/url';
+export type { Img, ImgSource, Picture } from './model/Picture';
+export type { SitemapProps as SitemapContent } from './model/SitemapProps';
+export { projectSettings } from './ProjectSettings';
+export type { ProjectSettings } from './ProjectSettings';
+export type { BlockDef, ContentPageDef, ContentPageMeta, UniBlockProps } from './types';
 export { joinList } from './utils/joinList';
+export * as url from './utils/url';

package/src/mergeTopItems.ts

@@ -1,13 +1,13 @@
-import type { LinkContent } from './model/LinkContent';
+import type { LinkProps } from './model/LinkProps';
 
-const cmp = (a?: LinkContent) => (b?: LinkContent) => a?.href === b?.href;
+const cmp = (a?: LinkProps) => (b?: LinkProps) => a?.href === b?.href;
 
-const substitute = <L extends LinkContent>(items?: L[], substitution?: L[]): L[] =>
+const substitute = <L extends LinkProps>(items?: L[], substitution?: L[]): L[] =>
   (items || []).map((_) => substitution?.find(cmp(_)) || _);
 
-const subtract = <L extends LinkContent>(minuend?: L[], subtrahend?: L[]): L[] =>
+const subtract = <L extends LinkProps>(minuend?: L[], subtrahend?: L[]): L[] =>
   (minuend || []).filter((_) => !subtrahend?.find(cmp(_)));
 
-export function mergeTopItems<L extends LinkContent>(left?: L[], right?: L[]): L[] {
+export function mergeTopItems<L extends LinkProps>(left?: L[], right?: L[]): L[] {
   return substitute(left, right).concat(subtract(right, left));
 }

package/src/model/BlockVersion.ts

@@ -1 +1,5 @@
+/**
+ * @title Цвет плитки
+ * @enumNames ["Основная", "Второстепенная"]
+ */
 export type BlockVersion = 'primary' | 'secondary';

package/src/model/ButtonVersion.ts

@@ -1 +1,5 @@
+/**
+ * @title Цвет кнопки
+ * @enumNames ["Основная", "Второстепенная"]
+ */
 export type ButtonVersion = 'primary' | 'secondary';

package/src/model/LinkProps.ts

@@ -0,0 +1,22 @@
+/**
+ * @title Таргет (target)
+ * @enumNames [
+ *    "self (текущее окно или фрейм)",
+ *    "blank (новое окно)",
+ *    "parent (фрейм-родитель)",
+ *    "top (текущее окно)"
+ *  ]
+ */
+export type Target = '_blank' | '_self' | '_parent' | '_top';
+
+/**
+ * @title Ссылка
+ * @required ["text", "href"]
+ */
+export interface LinkProps {
+  /** @title Текст */
+  text?: string;
+  /** @title URL (href) */
+  href?: string;
+  target?: Target;
+}

package/src/model/Picture.ts

@@ -1,19 +1,30 @@
 export interface Img {
+  /** @title Картинка */
   src: string;
+  /** @title Альтернативный текст (alt) */
   alt?: string;
+  /** @title Текст подсказки (title) */
   title?: string;
 }
 
 export interface ImgSource {
+  /** @title Картинка */
   src: string;
+  /** @title Формат */
   format?: 'jpeg' | 'jpg' | 'png' | 'gif' | 'webp' | 'heif' | 'avif';
+  /** @hidden */
   options?: Record<string, any>;
+  /** @title Размер изображения */
   size?: {
+    /** @title Ширина */
     width?: number;
+    /** @title Высота */
     height?: number;
   };
 }
 
+/** @title Изображение */
 export interface Picture extends Img, ImgSource {
+  /** @title Другие форматы */
   sources?: ImgSource[];
 }

package/src/model/SitemapProps.ts

@@ -0,0 +1,15 @@
+import type { LinkProps } from './LinkProps';
+
+/**
+ * @title Ссылка
+ * @required ["text", "href"]
+ */
+export interface TopMenuItem extends LinkProps {
+  /** @hidden */
+  items?: LinkProps[];
+}
+
+export interface SitemapProps {
+  /** @title Дополнительное меню */
+  topItems?: TopMenuItem[];
+}

package/src/types.ts

@@ -2,13 +2,13 @@ import type { BlockContent } from './components/BlockContent';
 import type { ContentPageContext } from './components/ContentPage/ContentPageContext';
 import type { BlockVersion } from './model/BlockVersion';
 
-export type ColorPalette = 'pc' | 'bc' | 'eo';
+export type ColorPalette = 'pc' | 'bc' | 'eo' | 'eo2' | 'eo3' | 'eo4';
 
 export interface BlockDef {
   type: string;
   style?: string[];
-  version?: BlockVersion;
   content?: BlockContent;
+  version?: BlockVersion;
   blocks?: BlockDef[];
   mobile?: Pick<BlockDef, 'content' | 'style'> & {
     hidden?: boolean;

package/src/ui-kit/Breadcrumb.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkContent } from '../model/LinkContent';
+import type { LinkProps } from '../model/LinkProps';
 
-export interface BreadcrumbProps extends LinkContent {
+export interface BreadcrumbProps extends LinkProps {
   className?: string;
   onClick?: (ev: MouseEvent) => any;
 }

package/src/ui-kit/Button/Button.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { ButtonVersion } from '../../model/ButtonVersion';
-import type { ButtonInnerProps, ButtonProps } from './ButtonProps';
+import type { ButtonProps, ButtonWithIconProps } from './ButtonProps';
 
 const buttonStyleMap: Record<ButtonVersion, string> = {
   primary: 'text-white bg-primary-main hover:bg-primary-hover active:bg-primary-active',
@@ -15,7 +15,11 @@ const buttonDisabledStyleMap: Record<ButtonVersion, string> = {
 
 const styleButton = 'inline-block text-center font-sans select-none';
 
-export const Button = JSX<ButtonProps>(
+export interface ButtonCommonProps extends ButtonProps, ButtonWithIconProps {}
+
+export type ButtonInner = Pick<ButtonCommonProps, 'text' | 'aboveText' | 'appendLeft' | 'rounded'>;
+
+export const Button = JSX<ButtonCommonProps>(
   ({
     className,
     text,
@@ -69,7 +73,7 @@ export const Button = JSX<ButtonProps>(
   },
 );
 
-export const ButtonInner = JSX<ButtonInnerProps>(({ text, aboveText, appendLeft, rounded }) => {
+export const ButtonInner = JSX<ButtonInner>(({ text, aboveText, appendLeft, rounded }) => {
   const withoutText = !text && !aboveText && Boolean(appendLeft);
 
   const buttonInnerClasses = `flex items-center justify-center ${

package/src/ui-kit/Button/ButtonProps.ts

@@ -1,24 +1,27 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
-import type { LinkContent } from '../../model/LinkContent';
-import { IconName } from '../Icon/IconProps';
+import type { LinkProps } from '../../model/LinkProps';
 
-export interface ButtonInnerProps {
-  text?: string;
-  aboveText?: string;
-  appendLeft?: any;
-  rounded?: boolean;
-}
-
-export interface ButtonProps extends LinkContent, ButtonInnerProps {
+/**
+ * @hidden
+ */
+export interface ButtonAdditionalProps {
   className?: string;
-  version?: ButtonVersion;
   disabled?: boolean;
   rel?: string;
   ariaLabel?: string;
-  /** @hidden */
   onClick?: (ev: MouseEvent) => any;
 }
 
+export interface ButtonProps extends ButtonAdditionalProps, LinkProps {
+  text?: string;
+  version?: ButtonVersion;
+}
+
 export interface ButtonWithIconProps extends ButtonProps {
-  icon?: IconName;
+  /** @hidden */
+  aboveText?: string;
+  /** @hidden */
+  appendLeft?: any;
+  /** @hidden */
+  rounded?: boolean;
 }

package/src/ui-kit/Icon/Icon.tsx

@@ -3,14 +3,28 @@ import { projectSettings } from '../../ProjectSettings';
 import type { IconProps } from './IconProps';
 
 export const Icon = JSX<IconProps>(
-  ({ className, name, alt = `Icon ${name}`, title = alt, ...imgProps }) => (
-    <svg className={className} {...imgProps} aria-hidden="true">
-      {title ? <title>{title}</title> : null}
-      {alt ? <desc>{alt}</desc> : null}
-      <use
-        href={`${projectSettings.CDN || ''}icons/${name}.svg#icon`}
-        xlinkHref={`${projectSettings.CDN || ''}icons/${name}.svg#icon`}
+  ({ className, name, alt = `Icon ${name}`, title = alt, asSVG, ...imgProps }) => {
+    const href = `${projectSettings.CDN || ''}icons/${name}.svg`;
+
+    if (asSVG) {
+      return (
+        <svg className={className} {...imgProps} aria-hidden="true">
+          {title ? <title>{title}</title> : null}
+          {alt ? <desc>{alt}</desc> : null}
+          <use href={`${href}#icon`} xlinkHref={`${href}#icon`} />
+        </svg>
+      );
+    }
+
+    return (
+      <img
+        className={className}
+        src={href}
+        alt={alt}
+        title={title}
+        {...imgProps}
+        aria-hidden="true"
       />
-    </svg>
-  ),
+    );
+  },
 );

package/src/ui-kit/Icon/IconProps.ts

@@ -1,29 +1,60 @@
+/**
+ * Icons sorted by name
+ */
 export enum IconMap {
   'ActualBalanceIcon',
   'AppleIcon',
   'CalendarIcon',
   'ClockIcon',
   'ComfortableCompIcon',
+  'DocIcon',
   'DollarIcon',
   'EmptyWalletIcon',
   'EuroIcon',
+  'GlassIcon',
   'GridIcon',
   'LoupeIcon',
+  'MinusIcon',
   'NewDocIcon',
   'OkIcon',
   'PassSendIcon',
   'PercentageSquareIcon',
   'PlayMarketIcon',
+  'PlusIcon',
   'ProfileIcon',
   'SignDocsIcon',
   'TelegramIcon',
   'VKIcon',
-  'GlassIcon',
-  'DocIcon',
-  'PlusIcon',
-  'MinusIcon',
 }
 
+/**
+ * @title Иконка
+ * @enumNames [
+ *    "Деньги",
+ *    "Лого «Apple»",
+ *    "Календарь",
+ *    "Часы",
+ *    "Кресло",
+ *    "Документ",
+ *    "Доллар",
+ *    "Кошелек",
+ *    "Евро",
+ *    "Зеркало",
+ *    "Сетка",
+ *    "Лупа",
+ *    "Минус",
+ *    "Новый документ",
+ *    "Лого «Одноклассники»",
+ *    "Бизнес",
+ *    "Проценты",
+ *    "Лого «PlayMarket»",
+ *    "Плюс",
+ *    "Профиль",
+ *    "Подписанные документы",
+ *    "Лого «Telegram»",
+ *    "Лого «VK»"
+ *  ]
+ */
 export type IconName = keyof typeof IconMap;
 
 export interface IconProps {
@@ -33,5 +64,5 @@ export interface IconProps {
   title?: string;
   width?: string;
   height?: string;
-  'aria-hidden'?: 'true';
+  asSVG?: boolean;
 }

package/src/ui-kit/TopItem/TopItem.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkContent } from '../../model/LinkContent';
+import type { LinkProps } from '../../model/LinkProps';
 
-export interface TopItemContent extends LinkContent {
+export interface TopItemContent extends LinkProps {
   active?: boolean;
 }
 

package/dist/components/BaseTile/BaseTileContent.d.ts

@@ -1,13 +0,0 @@
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-import type { TitleSize } from '../../ui-kit/Title/TitleProps';
-export interface BaseTileContent {
-    title?: string;
-    titleSize?: TitleSize;
-    description?: string;
-    image?: Picture;
-    items?: string[];
-    buttons?: ButtonWithIconProps[];
-    version?: BlockVersion;
-}

package/dist/components/BaseTile/BaseTileContent.js.map

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

package/dist/model/LinkContent.d.ts

@@ -1,5 +0,0 @@
-export interface LinkContent {
-    text?: string;
-    href?: string;
-    target?: '_blank' | '_self' | '_parent' | '_top' | string;
-}

package/dist/model/LinkContent.js.map

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

package/dist/model/SitemapContent.d.ts

@@ -1,7 +0,0 @@
-import { LinkContent } from '../model/LinkContent';
-export interface TopMenuItem extends LinkContent {
-    items?: LinkContent[];
-}
-export interface SitemapContent {
-    topItems?: TopMenuItem[];
-}

package/dist/model/SitemapContent.js.map

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

package/lib/components/BaseTile/BaseTileContent.d.ts

@@ -1,13 +0,0 @@
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-import type { TitleSize } from '../../ui-kit/Title/TitleProps';
-export interface BaseTileContent {
-    title?: string;
-    titleSize?: TitleSize;
-    description?: string;
-    image?: Picture;
-    items?: string[];
-    buttons?: ButtonWithIconProps[];
-    version?: BlockVersion;
-}

package/lib/components/BaseTile/BaseTileContent.js

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

package/lib/components/BaseTile/BaseTileContent.js.map

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

package/lib/model/LinkContent.d.ts

@@ -1,5 +0,0 @@
-export interface LinkContent {
-    text?: string;
-    href?: string;
-    target?: '_blank' | '_self' | '_parent' | '_top' | string;
-}

package/lib/model/LinkContent.js

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

package/lib/model/LinkContent.js.map

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

package/lib/model/SitemapContent.d.ts

@@ -1,7 +0,0 @@
-import { LinkContent } from '../model/LinkContent';
-export interface TopMenuItem extends LinkContent {
-    items?: LinkContent[];
-}
-export interface SitemapContent {
-    topItems?: TopMenuItem[];
-}

package/lib/model/SitemapContent.js

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

package/lib/model/SitemapContent.js.map

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

package/src/components/BaseTile/BaseTileContent.ts

@@ -1,14 +0,0 @@
-import type { BlockVersion } from '../../model/BlockVersion';
-import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
-import type { TitleSize } from '../../ui-kit/Title/TitleProps';
-
-export interface BaseTileContent {
-  title?: string;
-  titleSize?: TitleSize;
-  description?: string;
-  image?: Picture;
-  items?: string[];
-  buttons?: ButtonWithIconProps[];
-  version?: BlockVersion;
-}

package/src/model/LinkContent.ts

@@ -1,5 +0,0 @@
-export interface LinkContent {
-  text?: string;
-  href?: string;
-  target?: '_blank' | '_self' | '_parent' | '_top' | string;
-}

package/src/model/SitemapContent.ts

@@ -1,9 +0,0 @@
-import { LinkContent } from '../model/LinkContent';
-
-export interface TopMenuItem extends LinkContent {
-  items?: LinkContent[];
-}
-
-export interface SitemapContent {
-  topItems?: TopMenuItem[];
-}