@redneckz/wildless-cms-uni-blocks 0.8.21 → 0.8.23

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

@@ -77,6 +77,7 @@ export default {
         className="col-span-12"
         align="right"
         version="secondary"
+        isTheme={false}
         block={{
           type: 'VerticalLayout',
           blocks: [
@@ -95,6 +96,7 @@ export default {
         gap="XL"
         align="left"
         version="secondary"
+        isTheme={false}
         block={{
           type: 'VerticalLayout',
           blocks: [

package/src/components/VerticalLayout/VerticalLayoutContent.ts

@@ -1,18 +1,17 @@
 import type { AlignTypeWithStretch } from '../../model/AlignType';
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { ColorPalette } from '../../model/ContentPageDef';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
 
 /**
  * @title Вертикальный компоновщик
  */
-export interface VerticalLayoutContent {
+export type VerticalLayoutContent = UniBlockContent & {
   colorPalette?: ColorPalette;
-  version?: BlockVersion;
   align?: AlignTypeWithStretch;
   gap?: GapVersion;
   /** @title Внутренний отступ компоновщика */
   isPadding?: boolean;
   /** @title Отступы вложенных компонентов */
   isInnerPadding?: boolean;
-}
+};

package/src/components/Video/VideoContent.ts

@@ -1,4 +1,5 @@
 import type { TitleProps } from '../../model/HeadlineType';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 
 /**
@@ -7,19 +8,20 @@ import type { Picture } from '../../model/Picture';
  *   "title": "Заголовок блока"
  * }
  */
-export interface VideoContent extends TitleProps {
-  /**
-   * @title Ссылка на видео
-   */
-  url?: string;
-  /**
-   * @title Заставка в блоке
-   * @default {
-   *   "format": "webp",
-   *   "size": {
-   *       "width": 1004
-   *   },
-   * }
-   */
-  previewImg?: Picture;
-}
+export type VideoContent = UniBlockContent &
+  TitleProps & {
+    /**
+     * @title Ссылка на видео
+     */
+    url?: string;
+    /**
+     * @title Заставка в блоке
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 1004
+     *   },
+     * }
+     */
+    previewImg?: Picture;
+  };

package/src/model/HeadlineType.ts

@@ -25,6 +25,11 @@ export type LabelProps = {
   label?: string;
 };
 
+export type AdditionalDescriptionProps = {
+  /** @title Дополнительное описание */
+  additionalDescription?: string;
+};
+
 export type HeadlineCommonProps = TitleProps & DescriptionProps;
 
 export type HeadlineProps = HeadlineCommonProps & {

package/src/model/JSXBlock.ts

@@ -5,13 +5,21 @@ import type { BlockVersion } from './BlockVersion';
 import type { BlockDef } from './ContentPageDef';
 import type { VNode } from './VNode';
 
-export interface UniBlockProps {
+export interface UniBlockProps extends UniBlockContent {
   className?: string;
-  version?: BlockVersion;
   block?: BlockDef;
   options?: BlockRendererOptions;
 }
 
+export interface UniBlockContent {
+  version?: BlockVersion;
+  /**
+   *  @title Наследование темы
+   *  @default true
+   */
+  isTheme?: boolean;
+}
+
 export type JSXBlock<BlockProps extends UniBlockProps = UniBlockProps> = UNIComponent<
   BlockProps,
   any,

package/src/model/LogoType.ts

@@ -1,6 +1,4 @@
-import type { Picture } from './Picture';
+import type { ImageContent } from '../ui-kit/Img/ImgProps';
+import type { TitleProps } from './HeadlineType';
 
-export type LogoType = {
-  image?: Picture;
-  title?: string;
-};
+export type LogoType = ImageContent & TitleProps;

package/src/services/sitemap/SitemapProps.ts

@@ -1,6 +1,6 @@
 import type { LinkProps } from '../../model/LinkProps';
 import type { LogoType } from '../../model/LogoType';
-import type { Picture } from '../../model/Picture';
+import type { IconProps, Picture } from '../../model/Picture';
 
 /**
  * @title Ссылка
@@ -24,9 +24,7 @@ export interface DispositionItem extends LinkProps {
  * @title Представительства за рубежом
  * @required ["text", "href"]
  */
-export interface ForeignOffice extends LinkProps {
-  icon?: Picture;
-}
+export type ForeignOffice = LinkProps & IconProps;
 
 export interface SitemapDataProps {
   topItems?: TopMenuItem[];

package/src/ui-kit/BlockWrapper.tsx

@@ -20,7 +20,15 @@ export const blockStyles: Record<BlockVersion, string> = {
 };
 
 export const BlockWrapper = JSX<BlockWrapperProps>(
-  ({ className = '', version = 'primary', block, tag = 'section', role, children }) => {
+  ({
+    className = '',
+    version = 'primary',
+    block,
+    tag = 'section',
+    role,
+    isTheme = true,
+    children,
+  }) => {
     const Tag: any = tag;
 
     const ref = useBlockIntersectionObserver(block);
@@ -43,8 +51,13 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
 
     return (
       <Tag
-        className={style('group', blockStyles[version], isHidden ? 'hidden' : '', className)}
-        {...(version ? { 'data-ver': version } : {})}
+        className={style(
+          isTheme ? 'group' : '',
+          blockStyles[version],
+          isHidden ? 'hidden' : '',
+          className,
+        )}
+        {...(version && isTheme ? { 'data-ver': version } : {})}
         {...(block?.anchor ? { id: block.anchor, ref } : {})}
         role={role}
       >

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

@@ -24,6 +24,7 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
     children,
     onVisibleIndicesChange,
     listType = 'horizontal-list',
+    version,
   }) => {
     const itemCount = Array.isArray(children) ? children.length : 0;
 
@@ -53,6 +54,7 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
             activeIndex={activeIndex}
             dotCount={itemCount}
             listType={listType}
+            version={version}
           />
         ) : null}
       </div>

package/src/ui-kit/SwipeListControl/SwipeListControlContent.ts

@@ -1,11 +1,11 @@
-import type { BlockVersion } from '../../model/BlockVersion';
+import type { UniBlockContent } from '../../model/JSXBlock';
 import type { SwipeContainerProps } from './SwipeListControlProps';
 
 /**
  * @title Swipe-контроллер
  */
-export interface SwipeListControlContent extends SwipeContainerProps {
-  /** @title Точки-индикаторы */
-  showDots?: boolean;
-  version?: BlockVersion;
-}
+export type SwipeListControlContent = UniBlockContent &
+  SwipeContainerProps & {
+    /** @title Точки-индикаторы */
+    showDots?: boolean;
+  };

package/src/ui-kit/SwipeListControl/SwipeListControlDots.tsx

@@ -1,4 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { BlockVersion } from '../../model/BlockVersion';
+import { style } from '../../utils/style';
 import type { SwipeListControlType } from './SwipeListControlProps';
 
 const containerStyles: Record<SwipeListControlType, string> = {
@@ -12,7 +14,7 @@ const activeDotStyles: Record<SwipeListControlType, string> = {
 };
 
 const dotStyle =
-  'cursor-pointer bg-primary-main rounded-full transition-width duration-300 group-data-secondary:bg-white group-data-transparent:bg-white';
+  'cursor-pointer rounded-full transition-width duration-300 bg-primary-main group-data-secondary:bg-white group-data-transparent:bg-white';
 
 const inactiveDotStyle = 'w-2 h-2 opacity-30';
 
@@ -21,10 +23,11 @@ interface SwipeListControlDotsProps {
   activeIndex?: number;
   dotCount?: number;
   listType?: SwipeListControlType;
+  version?: BlockVersion;
 }
 
 export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
-  ({ containerRef, activeIndex, dotCount = 0, listType = 'horizontal-list' }) => {
+  ({ containerRef, activeIndex, dotCount = 0, listType = 'horizontal-list', version }) => {
     const handleClick = (idx: number) => {
       if (idx !== activeIndex && containerRef?.current) {
         containerRef.current.children[idx]?.scrollIntoView({
@@ -35,7 +38,10 @@ export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
     };
 
     return dotCount ? (
-      <div className={`flex gap-2 ${containerStyles[listType]}`}>
+      <div
+        className={style('flex gap-2', containerStyles[listType], version ? 'group' : '')}
+        {...(version ? { 'data-ver': version } : {})}
+      >
         {new Array(dotCount).fill(null).map((_, idx: number) => (
           <div
             key={String(idx)}

package/src/ui-kit/Text/TextProps.ts

@@ -1,4 +1,4 @@
-import { BlockVersionMolecule } from '../../model/BlockVersion';
+import type { BlockVersionMolecule } from '../../model/BlockVersion';
 
 /**
  * @title Размер текста

package/bundle/components/RollupItem/RollupItemProps.d.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {
-}

package/dist/components/RollupItem/RollupItemProps.d.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {
-}

package/dist/components/RollupItem/RollupItemProps.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=RollupItemProps.js.map

package/dist/components/RollupItem/RollupItemProps.js.map

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

package/lib/components/RollupItem/RollupItemProps.d.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {
-}

package/lib/components/RollupItem/RollupItemProps.js

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

package/lib/components/RollupItem/RollupItemProps.js.map

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

package/mobile/bundle/components/RollupItem/RollupItemProps.d.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {
-}

package/mobile/dist/components/RollupItem/RollupItemProps.d.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {
-}

package/mobile/dist/components/RollupItem/RollupItemProps.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=RollupItemProps.js.map

package/mobile/dist/components/RollupItem/RollupItemProps.js.map

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

package/mobile/lib/components/RollupItem/RollupItemProps.d.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {
-}

package/mobile/lib/components/RollupItem/RollupItemProps.js

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

package/mobile/lib/components/RollupItem/RollupItemProps.js.map

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

package/mobile/src/components/RollupItem/RollupItemProps.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {}

package/src/components/RollupItem/RollupItemProps.ts

@@ -1,4 +0,0 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RollupItemContent } from './RollupItemContent';
-
-export interface RollupItemProps extends RollupItemContent, UniBlockProps {}