@redneckz/wildless-cms-uni-blocks 0.2.71 → 0.2.72

package/lib/ui-kit/Title.js

@@ -1,12 +1,6 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-export var SizeTableClass;
-(function (SizeTableClass) {
-    SizeTableClass["XL"] = "text-title-lg";
-    SizeTableClass["L"] = "text-title";
-    SizeTableClass["M"] = "text-title-sm";
-    SizeTableClass["S"] = "text-title-xs";
-})(SizeTableClass || (SizeTableClass = {}));
+import { SizeTableClass } from './TitleProps.js';
 export const Title = JSX(({ size = 'L', className, children, ...rest }) => {
     const Tag = size === 'XL' ? 'h1' : 'h2';
     return (_jsx(Tag, { className: getClasses(SizeTableClass[size], className), ...rest, children: children }));

package/lib/ui-kit/Title.js.map

@@ -1 +1 @@
-{"version":3,"file":"Title.js","sourceRoot":"","sources":["../../src/ui-kit/Title.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,sCAAsB,CAAA;IACtB,kCAAkB,CAAA;IAClB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;AACvB,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB;AAQD,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpF,MAAM,GAAG,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACxC,OAAO,CACL,KAAC,GAAG,IAAC,SAAS,EAAE,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,KAAM,IAAI,YAClE,QAAQ,GACL,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,CAAC,GAAG,OAA+B,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"Title.js","sourceRoot":"","sources":["../../src/ui-kit/Title.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAc,MAAM,cAAc,CAAC;AAE1D,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACpF,MAAM,GAAG,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACxC,OAAO,CACL,KAAC,GAAG,IAAC,SAAS,EAAE,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,KAAM,IAAI,YAClE,QAAQ,GACL,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,CAAC,GAAG,OAA+B,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC"}

package/lib/ui-kit/TitleProps.d.ts

@@ -0,0 +1,10 @@
+export declare enum SizeTableClass {
+    'XL' = "text-title-lg",
+    'L' = "text-title",
+    'M' = "text-title-sm",
+    'S' = "text-title-xs"
+}
+export declare type TitleSize = keyof typeof SizeTableClass;
+export interface TitleProps extends Partial<HTMLHeadingElement> {
+    size?: TitleSize;
+}

package/lib/ui-kit/TitleProps.js

@@ -0,0 +1,8 @@
+export var SizeTableClass;
+(function (SizeTableClass) {
+    SizeTableClass["XL"] = "text-title-lg";
+    SizeTableClass["L"] = "text-title";
+    SizeTableClass["M"] = "text-title-sm";
+    SizeTableClass["S"] = "text-title-xs";
+})(SizeTableClass || (SizeTableClass = {}));
+//# sourceMappingURL=TitleProps.js.map

package/lib/ui-kit/TitleProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TitleProps.js","sourceRoot":"","sources":["../../src/ui-kit/TitleProps.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,sCAAsB,CAAA;IACtB,kCAAkB,CAAA;IAClB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;AACvB,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB"}

package/lib/ui-kit/TopItem.d.ts

@@ -1,4 +1,4 @@
-import type { LinkContent } from '../types';
+import type { LinkContent } from '../model/LinkContent';
 export interface TopItemContent extends LinkContent {
     active?: boolean;
 }

package/lib/useLink.d.ts

@@ -1,12 +1,15 @@
 import { HandlerDecorator, Router } from './ContentPageContext';
-import type { LinkContent } from './types';
+import type { LinkContent } from './model/LinkContent';
 export declare function useLink({ router, handlerDecorator, }: {
     router: Router;
     handlerDecorator?: HandlerDecorator;
-}, link: Partial<LinkContent>): {
+}, link: Partial<LinkContent & {
+    className: string;
+}>): {
     href: string | undefined;
     ariaLabel: string | undefined;
     onClick: (ev: MouseEvent) => void;
     text?: string | undefined;
     target?: string | undefined;
+    className?: string | undefined;
 };

package/lib/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../src/useLink.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,uBAAuB,GAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC;AAEtF,MAAM,UAAU,OAAO,CACrB,EACE,MAAM,EACN,gBAAgB,GAAG,uBAAuB,GACc,EAC1D,IAA0B;IAE1B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO;QACL,GAAG,IAAI;QACP,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAc,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YAC9D,IAAI,WAAW,IAAI,aAAa,EAAE;gBAChC,EAAE,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,EAAE,IAAI,CAAC;KACT,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../src/useLink.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,uBAAuB,GAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,OAAO,CAAC;AAEtF,MAAM,UAAU,OAAO,CACrB,EACE,MAAM,EACN,gBAAgB,GAAG,uBAAuB,GACc,EAC1D,IAAkD;IAElD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO;QACL,GAAG,IAAI;QACP,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAc,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YAC9D,IAAI,WAAW,IAAI,aAAa,EAAE;gBAChC,EAAE,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,EAAE,IAAI,CAAC;KACT,CAAC;AACJ,CAAC"}

package/lib/useSitemap.d.ts

@@ -1,3 +1,3 @@
 import type { AsyncDataHook } from './ContentPageContext';
-import type { HeaderContent } from './Header/index';
+import type { HeaderContent } from './Header/HeaderContent';
 export declare function useSitemap(useAsyncData: AsyncDataHook): HeaderContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.2.71",
+  "version": "0.2.72",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -54,6 +54,7 @@
       "types": "./lib/utils/*.d.ts"
     },
     "./bundle/*.js": "./bundle/*.js",
+    "./bundle/*.json": "./bundle/*.json",
     "./*.json": "./*.json",
     "./*.js": "./*.js",
     "./*.cjs": "./*.cjs"
@@ -82,7 +83,8 @@
     "build:lib": "rimraf ./lib && tsc --build --verbose",
     "postbuild:lib": "replace-in-file --configFile=replace-config.lib.cjs --verbose",
     "build:commonjs": "rimraf ./dist && tsc --module commonjs --noImplicitUseStrict --outDir dist",
-    "bundle": "rimraf ./bundle && rollup -c",
+    "bundle": "rimraf ./bundle && rollup -c && npm run build:schema",
+    "build:schema": "ts-json-schema-generator --path './src/**/*Content.ts' --no-type-check --type '*' -o ./bundle/blocks.schema.json",
     "build:style": "postcss './src/**/*.css' --env production --dir ./lib",
     "build:icons": "svgo -f ./src/icons -o ./cosmos-static/icons",
     "size": "size-limit",
@@ -139,6 +141,7 @@
     "svgo": "^2.8.0",
     "tailwindcss": "^3.1.1",
     "ts-jest": "^28.0.4",
+    "ts-json-schema-generator": "^1.0.0",
     "ts-loader": "^9.3.0",
     "typescript": "^4.7.3",
     "webpack": "^5.73.0",

package/src/BaseTile.tsx

@@ -1,25 +1,17 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { BaseTileContent } from './BaseTileContent';
 import { Img } from './Img';
-import type { BlockVersion, Picture, UniBlockProps } from './types';
+import type { BlockVersion } from './model/BlockVersion';
+import type { UniBlockProps } from './types';
 import { BlockItem } from './ui-kit/BlockItem';
-import type { IconButtonProps } from './ui-kit/IconButton';
 import { IconButton } from './ui-kit/IconButton';
+import type { IconButtonProps } from './ui-kit/IconButtonProps';
 import { Title } from './ui-kit/Title';
-import type { TitleSize } from './ui-kit/Title';
 import { useLink } from './useLink';
 import { getColSpan } from './utils/getColSpan';
 
-export interface BaseTileContent {
-  title?: string;
-  titleSize?: TitleSize;
-  description?: string;
-  image?: Picture;
-  items?: string[];
-  buttons?: IconButtonProps[];
-  version?: BlockVersion;
-}
-
 export interface BaseTileProps extends BaseTileContent, UniBlockProps {}
+
 const TITLE_CLASSES = 'font-medium m-0 mb-4 whitespace-pre-wrap max-w-[600px]';
 
 export const BaseTile = JSX<BaseTileProps>(

package/src/BaseTileContent.ts

@@ -0,0 +1,14 @@
+import type { BlockVersion } from './model/BlockVersion';
+import type { Picture } from './model/Picture';
+import type { IconButtonProps } from './ui-kit/IconButtonProps';
+import type { TitleSize } from './ui-kit/TitleProps';
+
+export interface BaseTileContent {
+  title?: string;
+  titleSize?: TitleSize;
+  description?: string;
+  image?: Picture;
+  items?: string[];
+  buttons?: Omit<IconButtonProps, 'className' | 'onClick' | 'ariaLabel'>[];
+  version?: BlockVersion;
+}

package/src/BenefitsBlock.tsx

@@ -1,17 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { Benefit, BenefitsBlockContent } from './BenefitsBlockContent';
 import type { UniBlockProps } from './types';
-import { Icon, IconName } from './ui-kit/Icon';
-
-export interface Benefit {
-  label: string;
-  description?: string;
-  icon?: IconName;
-}
-
-export interface BenefitsBlockContent {
-  title?: string;
-  benefits?: Benefit[];
-}
+import { Icon } from './ui-kit/Icon';
 
 export interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
 

package/src/BenefitsBlockContent.ts

@@ -0,0 +1,12 @@
+import type { IconName } from './ui-kit/IconProps';
+
+export interface Benefit {
+  label: string;
+  description?: string;
+  icon?: IconName;
+}
+
+export interface BenefitsBlockContent {
+  title?: string;
+  benefits?: Benefit[];
+}

package/src/BlockContent.ts

@@ -0,0 +1,30 @@
+import type { BenefitsBlockContent } from './BenefitsBlockContent';
+import type { ExchangeRateTileContent } from './ExchangeRateTileContent';
+import type { FooterContent } from './Footer/FooterContent';
+import type { GalleryContent } from './GalleryContent';
+import type { HeaderContent } from './Header/HeaderContent';
+import type { MobileAppTileContent } from './MobileAppTileContent';
+import type { PlaceholderContent } from './PlaceholderContent';
+import type { ProductBlockContent } from './ProductBlockContent';
+import type { ProductGalleryContent } from './ProductGalleryContent';
+import type { ProductTileContent } from './ProductTileContent';
+import type { PromoTileContent } from './PromoTileContent';
+import type { StepsBlockContent } from './StepsBlockContent';
+import type { TextBlockContent } from './TextBlockContent';
+import type { TileContent } from './TileContent';
+
+export type BlockContent =
+  | HeaderContent
+  | FooterContent
+  | PlaceholderContent
+  | TileContent
+  | PromoTileContent
+  | TextBlockContent
+  | ProductTileContent
+  | ProductBlockContent
+  | StepsBlockContent
+  | BenefitsBlockContent
+  | ProductGalleryContent
+  | ExchangeRateTileContent
+  | MobileAppTileContent
+  | GalleryContent;

package/src/Blocks.ts

@@ -1,19 +1,17 @@
-import { BenefitsBlock, BenefitsBlockContent } from './BenefitsBlock';
-import { ExchangeRateTile, ExchangeRateTileContent } from './ExchangeRateTile';
-import { Footer, FooterContent } from './Footer/index';
-import { Header, HeaderContent } from './Header/index';
-import { MobileAppTile, MobileAppTileContent } from './MobileAppTile';
-import { Placeholder, PlaceholderContent } from './Placeholder';
+import { BenefitsBlock } from './BenefitsBlock';
+import { ExchangeRateTile } from './ExchangeRateTile';
+import { Footer } from './Footer/Footer';
+import { Gallery } from './Gallery';
+import { Header } from './Header/Header';
+import { MobileAppTile } from './MobileAppTile';
+import { Placeholder } from './Placeholder';
 import { ProductBlock } from './ProductBlock';
-import { ProductBlockInnerContent } from './ProductBlockInner';
-import { ProductGallery, ProductGalleryContent } from './ProductGallery';
-import { StepsBlock, StepsBlockContent } from './StepsBlock';
-import { ProductTile, ProductTileContent } from './ProductTile';
-import { BaseTileContent } from './BaseTile';
-import { PromoTile, PromoTileContent } from './PromoTile';
+import { ProductGallery } from './ProductGallery';
+import { ProductTile } from './ProductTile';
+import { PromoTile } from './PromoTile';
+import { StepsBlock } from './StepsBlock';
+import { TextBlock } from './TextBlock';
 import { Tile } from './Tile';
-import { TextBlock, TextBlockContent } from './TextBlock';
-import { Gallery, GalleryContent } from './Gallery';
 
 export const Blocks = {
   Header,
@@ -31,19 +29,3 @@ export const Blocks = {
   MobileAppTile,
   Gallery,
 };
-
-export type BlockContent =
-  | HeaderContent
-  | FooterContent
-  | PlaceholderContent
-  | BaseTileContent
-  | TextBlockContent
-  | ProductTileContent
-  | PromoTileContent
-  | ProductBlockInnerContent
-  | StepsBlockContent
-  | BenefitsBlockContent
-  | ProductGalleryContent
-  | ExchangeRateTileContent
-  | MobileAppTileContent
-  | GalleryContent;

package/src/ContentPage.tsx

@@ -1,5 +1,5 @@
 import { JSX, PropsWithChildren } from '@redneckz/uni-jsx';
-import type { BlockContent } from './Blocks';
+import type { BlockContent } from './BlockContent';
 import { LikeControl } from './LikeControl';
 import { Placeholder } from './Placeholder';
 import type { BlockDef, ContentPageDef, UniBlockProps } from './types';

package/src/ExchangeRateTile.tsx

@@ -1,13 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { ExchangeRateTileContent } from './ExchangeRateTileContent';
 import { Tile } from './Tile';
 import type { UniBlockProps } from './types';
-import { ButtonProps } from './ui-kit/Button';
+import { ButtonProps } from './ui-kit/ButtonProps';
 import { Icon } from './ui-kit/Icon';
 
-export interface ExchangeRateTileContent {
-  title?: string;
-}
-
 export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlockProps {}
 
 const CBR_EXCHANGE_RATE_URL = 'https://www.cbr-xml-daily.ru/daily_json.js';

package/src/ExchangeRateTileContent.ts

@@ -0,0 +1,3 @@
+export interface ExchangeRateTileContent {
+  title?: string;
+}

package/src/Footer/Contacts.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps, ContactInfo } from '../types';
+import type { UniBlockProps } from '../types';
 import { Button } from '../ui-kit/Button';
 import { useLink } from '../useLink';
+import type { ContactInfo } from './FooterContent';
 
 export interface ContactsProps extends UniBlockProps {
   items?: ContactInfo[];

package/src/Footer/Footer.mobile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../types';
-import type { FooterContent } from './Footer';
+import type { FooterContent } from './FooterContent';
 import { TextInformation } from './TextInformation';
 
 export interface FooterProps extends FooterContent, UniBlockProps {}

package/src/Footer/Footer.tsx

@@ -1,24 +1,17 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../types';
 import { Logo } from '../ui-kit/Logo';
 import { SearchBar } from '../ui-kit/SearchBar';
 import { Contacts } from './Contacts';
+import type { FooterContent } from './FooterContent';
+import { HorizontalNavigation } from './HorizontalNavigation';
 import { Sitemap } from './Sitemap';
 import { SocialMedia } from './SocialMedia';
-import { HorizontalNavigation } from './HorizontalNavigation';
 import { TextInformation } from './TextInformation';
-import type { LinkContent, UniBlockProps, ContactInfo, TopMenuItem } from '../types';
 
 const LEFT_COL_WIDTH_FULL_HD = 'w-[280px]';
 const LEFT_COL_WIDTH_SMALL_DESKTOP = 'xl:w-[220px]';
 
-export interface FooterContent {
-  documents?: LinkContent[];
-  relatedEnterprises?: LinkContent[];
-  contacts?: ContactInfo[];
-  socialMedia?: Omit<LinkContent, 'text'>[];
-  topItems?: TopMenuItem[];
-}
-
 export interface FooterProps extends FooterContent, UniBlockProps {}
 
 export const Footer = JSX<FooterProps>(

package/src/Footer/FooterContent.ts

@@ -0,0 +1,15 @@
+import type { LinkContent } from '../model/LinkContent';
+import type { SitemapContent } from '../model/SitemapContent';
+
+export interface ContactInfo {
+  text: string;
+  type: 'tel' | 'email';
+  description: string;
+}
+
+export interface FooterContent extends SitemapContent {
+  documents?: LinkContent[];
+  relatedEnterprises?: LinkContent[];
+  contacts?: ContactInfo[];
+  socialMedia?: Omit<LinkContent, 'text'>[];
+}

package/src/Footer/FooterLink.ts

@@ -1,4 +1,4 @@
-import type { LinkContent } from '../types';
+import type { LinkContent } from '../model/LinkContent';
 import type { UniBlockProps } from '../types';
 
 export interface FooterLink extends UniBlockProps {

package/src/Footer/HorizontalNavigation.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { FooterLink } from './FooterLink';
+import { LinkContent } from '../model/LinkContent';
 import { useLink } from '../useLink';
-import { LinkContent } from '../types';
+import type { FooterLink } from './FooterLink';
 
 export const HorizontalNavigation = JSX<FooterLink>(({ className, links, context }) => {
   const router = context.useRouter();

package/src/Footer/Sitemap.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Router, HandlerDecorator } from '../ContentPageContext';
 import { mergeTopItems } from '../mergeTopItems';
-import type { LinkContent, TopMenuItem, UniBlockProps } from '../types';
+import type { LinkContent } from '../model/LinkContent';
+import type { TopMenuItem } from '../model/SitemapContent';
+import type { UniBlockProps } from '../types';
 import { useLink } from '../useLink';
 import { useSitemap } from '../useSitemap';
 export interface SitemapProps extends UniBlockProps {

package/src/Footer/SocialMedia.tsx

@@ -1,6 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkContent, UniBlockProps } from '../types';
-import { Icon, IconName } from '../ui-kit/Icon';
+import type { LinkContent } from '../model/LinkContent';
+import type { UniBlockProps } from '../types';
+import { Icon } from '../ui-kit/Icon';
+import type { IconName } from '../ui-kit/IconProps';
 import { useLink } from '../useLink';
 
 const ICONS_MAP: Array<{ origins: string[]; icon: IconName; label: string }> = [

package/src/Footer/TextInformation.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkContent } from '../types';
+import type { LinkContent } from '../model/LinkContent';
 import { useLink } from '../useLink';
 import { FooterLink } from './FooterLink';
 

package/src/Gallery.fixture.tsx

@@ -2,7 +2,7 @@ import { context } from './setup-fixture';
 
 import { Gallery, GalleryProps } from './Gallery';
 import { Gallery as MobileGallery } from './Gallery.mobile';
-import { Picture } from './types';
+import { Picture } from './model/Picture';
 
 const image: Picture = {
   src: 'money-1.png',

package/src/Gallery.mobile.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { GalleryCard, GalleryProps } from './Gallery';
+import type { GalleryProps } from './Gallery';
+import type { GalleryCard } from './GalleryContent';
 import { Img } from './Img';
 import { BlockItem } from './ui-kit/BlockItem';
 import { Button } from './ui-kit/Button';

package/src/Gallery.tsx

@@ -1,25 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { GalleryCard, GalleryContent } from './GalleryContent';
 import { Img } from './Img';
-import { Picture, UniBlockProps } from './types';
+import { UniBlockProps } from './types';
 import { ArrowButton } from './ui-kit/ArrowButton';
 import { BlockItem } from './ui-kit/BlockItem';
 import { Button } from './ui-kit/Button';
 import { Title } from './ui-kit/Title';
 
-export interface GalleryCard {
-  title?: string;
-  description?: string;
-  image?: Picture;
-  href?: string;
-  items?: string[];
-}
-
-export interface GalleryContent {
-  title?: string;
-  description?: string;
-  cards?: GalleryCard[];
-}
-
 export interface GalleryProps extends GalleryContent, UniBlockProps {}
 
 const CARD_WIDTH = 384;

package/src/GalleryContent.ts

@@ -0,0 +1,15 @@
+import type { Picture } from './model/Picture';
+
+export interface GalleryCard {
+  title?: string;
+  description?: string;
+  image?: Picture;
+  href?: string;
+  items?: string[];
+}
+
+export interface GalleryContent {
+  title?: string;
+  description?: string;
+  cards?: GalleryCard[];
+}

package/src/Header/HeaderContent.ts

@@ -1,6 +1,5 @@
-import type { TopMenuItem } from '../types';
+import { SitemapContent } from '../model/SitemapContent';
 
-export interface HeaderContent {
+export interface HeaderContent extends SitemapContent {
   defaultLocation?: string;
-  topItems?: TopMenuItem[];
 }

package/src/Header/isSubItemActive.ts

@@ -1,5 +1,5 @@
 import type { Router } from '../ContentPageContext';
-import type { LinkContent } from '../types';
+import type { LinkContent } from '../model/LinkContent';
 import { isHrefActive } from '../utils/url';
 
 export function isSubItemActive(router: Router) {

package/src/Header/isTopItemActive.ts

@@ -1,5 +1,5 @@
 import type { Router } from '../ContentPageContext';
-import type { LinkContent } from '../types';
+import type { LinkContent } from '../model/LinkContent';
 import { isHrefActive } from '../utils/url';
 
 export function isTopItemActive(router: Router) {

package/src/Img.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { Picture, ImgSource } from './types';
+import type { Picture, ImgSource } from './model/Picture';
 
 export interface TextWithImageProps {
   className?: string;

package/src/MobileAppTile.tsx

@@ -1,18 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { MobileAppTileContent } from './MobileAppTileContent';
 import { Tile } from './Tile';
-import type { BaseTileContent } from './BaseTile';
 import type { UniBlockProps } from './types';
 
-export interface QRCode {
-  src?: string;
-  href?: string;
-}
-
-export interface MobileAppTileContent extends BaseTileContent {
-  title?: string;
-  qr?: QRCode;
-}
-
 export interface MobileAppTileProps extends MobileAppTileContent, UniBlockProps {}
 
 export const MobileAppTile = JSX<MobileAppTileProps>(

package/src/MobileAppTileContent.ts

@@ -0,0 +1,11 @@
+import type { BaseTileContent } from './BaseTileContent';
+
+export interface QRCode {
+  src?: string;
+  href?: string;
+}
+
+export interface MobileAppTileContent extends BaseTileContent {
+  title?: string;
+  qr?: QRCode;
+}

package/src/MobileBlocks.ts

@@ -1,7 +1,7 @@
 import { ExchangeRateTile } from './ExchangeRateTile';
 import { Footer } from './Footer/Footer.mobile';
 import { Gallery } from './Gallery.mobile';
-import { Header } from './Header/index';
+import { Header } from './Header/Header';
 import { MobileAppTile } from './MobileAppTile';
 import { Placeholder } from './Placeholder';
 import { ProductBlock } from './ProductBlock.mobile';

package/src/Placeholder.tsx

@@ -1,11 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { PlaceholderContent } from './PlaceholderContent';
 import { Tile } from './Tile';
 import type { UniBlockProps } from './types';
 
-export interface PlaceholderContent {
-  title?: string;
-}
-
 export interface PlaceholderProps extends PlaceholderContent, UniBlockProps {
   className?: string;
 }

package/src/PlaceholderContent.ts

@@ -0,0 +1,3 @@
+export interface PlaceholderContent {
+  title?: string;
+}

package/src/ProductBlock.fixture.tsx

@@ -1,7 +1,7 @@
 import { context } from './setup-fixture';
 
 import { ProductBlock } from './ProductBlock';
-import { Picture } from './types';
+import { Picture } from './model/Picture';
 
 const image: Picture = {
   src: 'money-1.png',

package/src/ProductBlock.mobile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ProductBlockInnerContent } from './ProductBlockInner';
 import { ProductBlockInner } from './ProductBlockInner';
+import type { ProductBlockInnerContent } from './ProductBlockInnerContent';
 import type { UniBlockProps } from './types';
 
 export interface ProductBlockProps extends ProductBlockInnerContent, UniBlockProps {}

package/src/ProductBlock.tsx

@@ -1,14 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { ProductBlockContent } from './ProductBlockContent';
 import { ProductBlockInner } from './ProductBlockInner';
-import type { ProductBlockInnerContent } from './ProductBlockInner';
 import type { UniBlockProps } from './types';
-import { Breadcrumb, BreadcrumbProps } from './ui-kit/Breadcrumb';
+import { Breadcrumb } from './ui-kit/Breadcrumb';
 import { useLink } from './useLink';
 import { joinList } from './utils/joinList';
 
-export interface ProductBlockProps extends ProductBlockInnerContent, UniBlockProps {
-  breadcrumbs?: BreadcrumbProps[];
-}
+export interface ProductBlockProps extends ProductBlockContent, UniBlockProps {}
 
 export const ProductBlock = JSX<ProductBlockProps>((props) => {
   const { context, className, breadcrumbs } = props;