@redneckz/wildless-cms-uni-blocks 0.14.73 → 0.14.74
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/migration-scripts/0.14.68.js +20 -0
- package/bundle/blocks.schema.json +1 -1
- package/bundle/bundle.umd.js +4 -4
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/components/HorizontalLayout/HorizontalLayoutContent.d.ts +2 -9
- package/bundle/components/VerticalLayout/VerticalLayout.d.ts +0 -1
- package/bundle/components/VerticalLayout/VerticalLayoutContent.d.ts +7 -6
- package/dist/components/HorizontalLayout/HorizontalLayout.js +1 -1
- package/dist/components/HorizontalLayout/HorizontalLayout.js.map +1 -1
- package/dist/components/HorizontalLayout/HorizontalLayoutContent.d.ts +2 -9
- package/dist/components/VerticalLayout/VerticalLayout.d.ts +0 -1
- package/dist/components/VerticalLayout/VerticalLayout.js +2 -2
- package/dist/components/VerticalLayout/VerticalLayout.js.map +1 -1
- package/dist/components/VerticalLayout/VerticalLayoutContent.d.ts +7 -6
- package/lib/common.css +1 -1
- package/lib/components/HorizontalLayout/HorizontalLayout.js +1 -1
- package/lib/components/HorizontalLayout/HorizontalLayout.js.map +1 -1
- package/lib/components/HorizontalLayout/HorizontalLayoutContent.d.ts +2 -9
- package/lib/components/VerticalLayout/VerticalLayout.d.ts +0 -1
- package/lib/components/VerticalLayout/VerticalLayout.fixture.d.ts +1 -0
- package/lib/components/VerticalLayout/VerticalLayout.fixture.mobile.d.ts +1 -0
- package/lib/components/VerticalLayout/VerticalLayout.js +2 -2
- package/lib/components/VerticalLayout/VerticalLayout.js.map +1 -1
- package/lib/components/VerticalLayout/VerticalLayoutContent.d.ts +7 -6
- package/mobile/bundle/bundle.umd.js +3 -3
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/components/HorizontalLayout/HorizontalLayoutContent.d.ts +2 -9
- package/mobile/bundle/components/VerticalLayout/VerticalLayout.d.ts +0 -1
- package/mobile/bundle/components/VerticalLayout/VerticalLayoutContent.d.ts +7 -6
- package/mobile/dist/components/HorizontalLayout/HorizontalLayoutContent.d.ts +2 -9
- package/mobile/dist/components/VerticalLayout/VerticalLayout.d.ts +0 -1
- package/mobile/dist/components/VerticalLayout/VerticalLayout.js +2 -2
- package/mobile/dist/components/VerticalLayout/VerticalLayout.js.map +1 -1
- package/mobile/dist/components/VerticalLayout/VerticalLayoutContent.d.ts +7 -6
- package/mobile/lib/components/HorizontalLayout/HorizontalLayoutContent.d.ts +2 -9
- package/mobile/lib/components/VerticalLayout/VerticalLayout.d.ts +0 -1
- package/mobile/lib/components/VerticalLayout/VerticalLayout.js +2 -2
- package/mobile/lib/components/VerticalLayout/VerticalLayout.js.map +1 -1
- package/mobile/lib/components/VerticalLayout/VerticalLayoutContent.d.ts +7 -6
- package/mobile/src/components/HorizontalLayout/HorizontalLayoutContent.ts +2 -9
- package/mobile/src/components/VerticalLayout/VerticalLayout.tsx +5 -7
- package/mobile/src/components/VerticalLayout/VerticalLayoutContent.ts +8 -6
- package/package.json +1 -1
- package/src/components/HorizontalLayout/HorizontalLayout.fixture.mobile.tsx +1 -1
- package/src/components/HorizontalLayout/HorizontalLayout.tsx +2 -2
- package/src/components/HorizontalLayout/HorizontalLayoutContent.ts +2 -9
- package/src/components/VerticalLayout/VerticalLayout.fixture.mobile.tsx +19 -2
- package/src/components/VerticalLayout/VerticalLayout.fixture.tsx +22 -4
- package/src/components/VerticalLayout/VerticalLayout.tsx +5 -7
- package/src/components/VerticalLayout/VerticalLayoutContent.ts +8 -6
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ColorPalette } from '../../model/ContentPageDef';
|
|
2
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
|
+
import { type LayoutCommitProps } from '../VerticalLayout/VerticalLayoutContent';
|
|
3
3
|
/**
|
|
4
4
|
* @title Отступ между компонентами
|
|
5
5
|
* @enumNames ["Самый большой", "Очень большой", "Большой", "Средний", "Маленький", "Самый маленький", "Без отступа"]
|
|
@@ -8,11 +8,4 @@ export declare type GapVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S' | 'XS' | '';
|
|
|
8
8
|
/**
|
|
9
9
|
* @title Горизонтальный компоновщик
|
|
10
10
|
*/
|
|
11
|
-
export declare type HorizontalLayoutContent = UniBlockContent &
|
|
12
|
-
colorPalette?: ColorPalette;
|
|
13
|
-
gap?: GapVersion;
|
|
14
|
-
/** @title контур на дочерних элементах */
|
|
15
|
-
isCardBorder?: boolean;
|
|
16
|
-
/** @title Внутренний отступ компоновщика */
|
|
17
|
-
isPadding?: boolean;
|
|
18
|
-
};
|
|
11
|
+
export declare type HorizontalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { type JSXBlock, type UniBlockProps } from '../../model/JSXBlock';
|
|
2
2
|
import { type VerticalLayoutContent } from './VerticalLayoutContent';
|
|
3
3
|
export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {
|
|
4
|
-
isInnerBorder?: boolean;
|
|
5
4
|
}
|
|
6
5
|
export declare const VerticalLayout: JSXBlock<VerticalLayoutProps>;
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
2
|
import { type GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
|
|
3
|
-
|
|
4
|
-
* @title Вертикальный компоновщик
|
|
5
|
-
*/
|
|
6
|
-
export declare type VerticalLayoutContent = UniBlockContent & {
|
|
3
|
+
export declare type LayoutCommitProps = {
|
|
7
4
|
gap?: GapVersion;
|
|
8
|
-
/** @title
|
|
9
|
-
|
|
5
|
+
/** @title контур на дочерних элементах */
|
|
6
|
+
isCardBorder?: boolean;
|
|
10
7
|
/** @title Отступы вложенных компонентов */
|
|
11
8
|
isInnerPadding?: boolean;
|
|
12
9
|
};
|
|
10
|
+
/**
|
|
11
|
+
* @title Вертикальный компоновщик
|
|
12
|
+
*/
|
|
13
|
+
export declare type VerticalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ColorPalette } from '../../model/ContentPageDef';
|
|
2
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
|
+
import { type LayoutCommitProps } from '../VerticalLayout/VerticalLayoutContent';
|
|
3
3
|
/**
|
|
4
4
|
* @title Отступ между компонентами
|
|
5
5
|
* @enumNames ["Самый большой", "Очень большой", "Большой", "Средний", "Маленький", "Самый маленький", "Без отступа"]
|
|
@@ -8,11 +8,4 @@ export declare type GapVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S' | 'XS' | '';
|
|
|
8
8
|
/**
|
|
9
9
|
* @title Горизонтальный компоновщик
|
|
10
10
|
*/
|
|
11
|
-
export declare type HorizontalLayoutContent = UniBlockContent &
|
|
12
|
-
colorPalette?: ColorPalette;
|
|
13
|
-
gap?: GapVersion;
|
|
14
|
-
/** @title контур на дочерних элементах */
|
|
15
|
-
isCardBorder?: boolean;
|
|
16
|
-
/** @title Внутренний отступ компоновщика */
|
|
17
|
-
isPadding?: boolean;
|
|
18
|
-
};
|
|
11
|
+
export declare type HorizontalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { type JSXBlock, type UniBlockProps } from '../../model/JSXBlock';
|
|
2
2
|
import { type VerticalLayoutContent } from './VerticalLayoutContent';
|
|
3
3
|
export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {
|
|
4
|
-
isInnerBorder?: boolean;
|
|
5
4
|
}
|
|
6
5
|
export declare const VerticalLayout: JSXBlock<VerticalLayoutProps>;
|
|
@@ -7,10 +7,10 @@ const BlockWrapper_1 = require("../../ui-kit/BlockWrapper");
|
|
|
7
7
|
const getBorderStyle_1 = require("../../utils/getBorderStyle");
|
|
8
8
|
const style_1 = require("../../utils/style");
|
|
9
9
|
const gapStyles_1 = require("../HorizontalLayout/gapStyles");
|
|
10
|
-
exports.VerticalLayout = (0, uni_jsx_1.JSX)(({ className = '',
|
|
10
|
+
exports.VerticalLayout = (0, uni_jsx_1.JSX)(({ className = '', padding = 'p-0', gap = '', isInnerPadding = true, version = 'transparent', isTheme = false, isCardBorder = false, ...rest }) => ((0, jsx_runtime_1.jsx)(BlockWrapper_1.BlockWrapper, { className: (0, style_1.style)('relative flex flex-col', gapStyles_1.gapStyles[gap], className), padding: padding, version: version, isTheme: isTheme, ...rest, children: (0, renderChildren_1.renderChildren)({
|
|
11
11
|
...rest,
|
|
12
12
|
extraProps: {
|
|
13
|
-
className: (0, style_1.style)('w-full', (0, getBorderStyle_1.getBorderStyle)(
|
|
13
|
+
className: (0, style_1.style)('w-full', (0, getBorderStyle_1.getBorderStyle)(isCardBorder)),
|
|
14
14
|
padding: isInnerPadding ? '' : 'p-0',
|
|
15
15
|
},
|
|
16
16
|
}) })));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerticalLayout.js","sourceRoot":"","sources":["../../../src/components/VerticalLayout/VerticalLayout.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uEAAoE;AAEpE,4DAAyD;AACzD,+DAA4D;AAC5D,6CAA0C;AAC1C,6DAA0D;
|
|
1
|
+
{"version":3,"file":"VerticalLayout.js","sourceRoot":"","sources":["../../../src/components/VerticalLayout/VerticalLayout.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uEAAoE;AAEpE,4DAAyD;AACzD,+DAA4D;AAC5D,6CAA0C;AAC1C,6DAA0D;AAK7C,QAAA,cAAc,GAAkC,IAAA,aAAG,EAC9D,CAAC,EACC,SAAS,GAAG,EAAE,EACd,OAAO,GAAG,KAAK,EACf,GAAG,GAAG,EAAE,EACR,cAAc,GAAG,IAAI,EACrB,OAAO,GAAG,aAAa,EACvB,OAAO,GAAG,KAAK,EACf,YAAY,GAAG,KAAK,EACpB,GAAG,IAAI,EACR,EAAE,EAAE,CAAC,CACJ,uBAAC,2BAAY,IACX,SAAS,EAAE,IAAA,aAAK,EAAC,wBAAwB,EAAE,qBAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,EACrE,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,KACZ,IAAI,YAEP,IAAA,+BAAc,EAAC;QACd,GAAG,IAAI;QACP,UAAU,EAAE;YACV,SAAS,EAAE,IAAA,aAAK,EAAC,QAAQ,EAAE,IAAA,+BAAc,EAAC,YAAY,CAAC,CAAC;YACxD,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK;SACrC;KACF,CAAC,GACW,CAChB,CACF,CAAC;AAEF,sBAAc,CAAC,aAAa,GAAG,EAAE,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
2
|
import { type GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
|
|
3
|
-
|
|
4
|
-
* @title Вертикальный компоновщик
|
|
5
|
-
*/
|
|
6
|
-
export declare type VerticalLayoutContent = UniBlockContent & {
|
|
3
|
+
export declare type LayoutCommitProps = {
|
|
7
4
|
gap?: GapVersion;
|
|
8
|
-
/** @title
|
|
9
|
-
|
|
5
|
+
/** @title контур на дочерних элементах */
|
|
6
|
+
isCardBorder?: boolean;
|
|
10
7
|
/** @title Отступы вложенных компонентов */
|
|
11
8
|
isInnerPadding?: boolean;
|
|
12
9
|
};
|
|
10
|
+
/**
|
|
11
|
+
* @title Вертикальный компоновщик
|
|
12
|
+
*/
|
|
13
|
+
export declare type VerticalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ColorPalette } from '../../model/ContentPageDef';
|
|
2
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
|
+
import { type LayoutCommitProps } from '../VerticalLayout/VerticalLayoutContent';
|
|
3
3
|
/**
|
|
4
4
|
* @title Отступ между компонентами
|
|
5
5
|
* @enumNames ["Самый большой", "Очень большой", "Большой", "Средний", "Маленький", "Самый маленький", "Без отступа"]
|
|
@@ -8,11 +8,4 @@ export declare type GapVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S' | 'XS' | '';
|
|
|
8
8
|
/**
|
|
9
9
|
* @title Горизонтальный компоновщик
|
|
10
10
|
*/
|
|
11
|
-
export declare type HorizontalLayoutContent = UniBlockContent &
|
|
12
|
-
colorPalette?: ColorPalette;
|
|
13
|
-
gap?: GapVersion;
|
|
14
|
-
/** @title контур на дочерних элементах */
|
|
15
|
-
isCardBorder?: boolean;
|
|
16
|
-
/** @title Внутренний отступ компоновщика */
|
|
17
|
-
isPadding?: boolean;
|
|
18
|
-
};
|
|
11
|
+
export declare type HorizontalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { type JSXBlock, type UniBlockProps } from '../../model/JSXBlock';
|
|
2
2
|
import { type VerticalLayoutContent } from './VerticalLayoutContent';
|
|
3
3
|
export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {
|
|
4
|
-
isInnerBorder?: boolean;
|
|
5
4
|
}
|
|
6
5
|
export declare const VerticalLayout: JSXBlock<VerticalLayoutProps>;
|
|
@@ -5,10 +5,10 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
|
|
|
5
5
|
import { getBorderStyle } from '../../utils/getBorderStyle.js';
|
|
6
6
|
import { style } from '../../utils/style.js';
|
|
7
7
|
import { gapStyles } from '../HorizontalLayout/gapStyles.js';
|
|
8
|
-
export const VerticalLayout = JSX(({ className = '',
|
|
8
|
+
export const VerticalLayout = JSX(({ className = '', padding = 'p-0', gap = '', isInnerPadding = true, version = 'transparent', isTheme = false, isCardBorder = false, ...rest }) => (_jsx(BlockWrapper, { className: style('relative flex flex-col', gapStyles[gap], className), padding: padding, version: version, isTheme: isTheme, ...rest, children: renderChildren({
|
|
9
9
|
...rest,
|
|
10
10
|
extraProps: {
|
|
11
|
-
className: style('w-full', getBorderStyle(
|
|
11
|
+
className: style('w-full', getBorderStyle(isCardBorder)),
|
|
12
12
|
padding: isInnerPadding ? '' : 'p-0',
|
|
13
13
|
},
|
|
14
14
|
}) })));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerticalLayout.js","sourceRoot":"","sources":["../../../src/components/VerticalLayout/VerticalLayout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"VerticalLayout.js","sourceRoot":"","sources":["../../../src/components/VerticalLayout/VerticalLayout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAK1D,MAAM,CAAC,MAAM,cAAc,GAAkC,GAAG,CAC9D,CAAC,EACC,SAAS,GAAG,EAAE,EACd,OAAO,GAAG,KAAK,EACf,GAAG,GAAG,EAAE,EACR,cAAc,GAAG,IAAI,EACrB,OAAO,GAAG,aAAa,EACvB,OAAO,GAAG,KAAK,EACf,YAAY,GAAG,KAAK,EACpB,GAAG,IAAI,EACR,EAAE,EAAE,CAAC,CACJ,KAAC,YAAY,IACX,SAAS,EAAE,KAAK,CAAC,wBAAwB,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,EACrE,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,KACZ,IAAI,YAEP,cAAc,CAAC;QACd,GAAG,IAAI;QACP,UAAU,EAAE;YACV,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;YACxD,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK;SACrC;KACF,CAAC,GACW,CAChB,CACF,CAAC;AAEF,cAAc,CAAC,aAAa,GAAG,EAAE,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
2
|
import { type GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
|
|
3
|
-
|
|
4
|
-
* @title Вертикальный компоновщик
|
|
5
|
-
*/
|
|
6
|
-
export declare type VerticalLayoutContent = UniBlockContent & {
|
|
3
|
+
export declare type LayoutCommitProps = {
|
|
7
4
|
gap?: GapVersion;
|
|
8
|
-
/** @title
|
|
9
|
-
|
|
5
|
+
/** @title контур на дочерних элементах */
|
|
6
|
+
isCardBorder?: boolean;
|
|
10
7
|
/** @title Отступы вложенных компонентов */
|
|
11
8
|
isInnerPadding?: boolean;
|
|
12
9
|
};
|
|
10
|
+
/**
|
|
11
|
+
* @title Вертикальный компоновщик
|
|
12
|
+
*/
|
|
13
|
+
export declare type VerticalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ColorPalette } from '../../model/ContentPageDef';
|
|
2
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
|
+
import { type LayoutCommitProps } from '../VerticalLayout/VerticalLayoutContent';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* @title Отступ между компонентами
|
|
@@ -10,11 +10,4 @@ export type GapVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S' | 'XS' | '';
|
|
|
10
10
|
/**
|
|
11
11
|
* @title Горизонтальный компоновщик
|
|
12
12
|
*/
|
|
13
|
-
export type HorizontalLayoutContent = UniBlockContent &
|
|
14
|
-
colorPalette?: ColorPalette;
|
|
15
|
-
gap?: GapVersion;
|
|
16
|
-
/** @title контур на дочерних элементах */
|
|
17
|
-
isCardBorder?: boolean;
|
|
18
|
-
/** @title Внутренний отступ компоновщика */
|
|
19
|
-
isPadding?: boolean;
|
|
20
|
-
};
|
|
13
|
+
export type HorizontalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -7,24 +7,22 @@ import { style } from '../../utils/style';
|
|
|
7
7
|
import { gapStyles } from '../HorizontalLayout/gapStyles';
|
|
8
8
|
import { type VerticalLayoutContent } from './VerticalLayoutContent';
|
|
9
9
|
|
|
10
|
-
export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {
|
|
11
|
-
isInnerBorder?: boolean;
|
|
12
|
-
}
|
|
10
|
+
export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {}
|
|
13
11
|
|
|
14
12
|
export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutProps>(
|
|
15
13
|
({
|
|
16
14
|
className = '',
|
|
15
|
+
padding = 'p-0',
|
|
17
16
|
gap = '',
|
|
18
|
-
isPadding = false,
|
|
19
17
|
isInnerPadding = true,
|
|
20
18
|
version = 'transparent',
|
|
21
19
|
isTheme = false,
|
|
22
|
-
|
|
20
|
+
isCardBorder = false,
|
|
23
21
|
...rest
|
|
24
22
|
}) => (
|
|
25
23
|
<BlockWrapper
|
|
26
24
|
className={style('relative flex flex-col', gapStyles[gap], className)}
|
|
27
|
-
|
|
25
|
+
padding={padding}
|
|
28
26
|
version={version}
|
|
29
27
|
isTheme={isTheme}
|
|
30
28
|
{...rest}
|
|
@@ -32,7 +30,7 @@ export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutP
|
|
|
32
30
|
{renderChildren({
|
|
33
31
|
...rest,
|
|
34
32
|
extraProps: {
|
|
35
|
-
className: style('w-full', getBorderStyle(
|
|
33
|
+
className: style('w-full', getBorderStyle(isCardBorder)),
|
|
36
34
|
padding: isInnerPadding ? '' : 'p-0',
|
|
37
35
|
},
|
|
38
36
|
})}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
2
|
import { type GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
|
|
3
3
|
|
|
4
|
-
|
|
5
|
-
* @title Вертикальный компоновщик
|
|
6
|
-
*/
|
|
7
|
-
export type VerticalLayoutContent = UniBlockContent & {
|
|
4
|
+
export type LayoutCommitProps = {
|
|
8
5
|
gap?: GapVersion;
|
|
9
|
-
/** @title
|
|
10
|
-
|
|
6
|
+
/** @title контур на дочерних элементах */
|
|
7
|
+
isCardBorder?: boolean;
|
|
11
8
|
/** @title Отступы вложенных компонентов */
|
|
12
9
|
isInnerPadding?: boolean;
|
|
13
10
|
};
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* @title Вертикальный компоновщик
|
|
14
|
+
*/
|
|
15
|
+
export type VerticalLayoutContent = UniBlockContent & LayoutCommitProps;
|
package/package.json
CHANGED
|
@@ -12,8 +12,8 @@ interface HorizontalLayoutProps extends HorizontalLayoutContent, UniBlockProps {
|
|
|
12
12
|
export const HorizontalLayout: JSXBlock<HorizontalLayoutProps> = JSX<HorizontalLayoutProps>(
|
|
13
13
|
({
|
|
14
14
|
className = '',
|
|
15
|
+
padding = 'p-0',
|
|
15
16
|
gap = 'XS',
|
|
16
|
-
isPadding = false,
|
|
17
17
|
version = 'transparent',
|
|
18
18
|
isTheme = false,
|
|
19
19
|
isCardBorder,
|
|
@@ -21,7 +21,7 @@ export const HorizontalLayout: JSXBlock<HorizontalLayoutProps> = JSX<HorizontalL
|
|
|
21
21
|
}) => (
|
|
22
22
|
<BlockWrapper
|
|
23
23
|
className={style('relative', 'grid grid-cols-12', gapStyles[gap], className)}
|
|
24
|
-
|
|
24
|
+
padding={padding}
|
|
25
25
|
version={version}
|
|
26
26
|
isTheme={isTheme}
|
|
27
27
|
{...rest}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type ColorPalette } from '../../model/ContentPageDef';
|
|
2
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
|
+
import { type LayoutCommitProps } from '../VerticalLayout/VerticalLayoutContent';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* @title Отступ между компонентами
|
|
@@ -10,11 +10,4 @@ export type GapVersion = 'XXL' | 'XL' | 'L' | 'M' | 'S' | 'XS' | '';
|
|
|
10
10
|
/**
|
|
11
11
|
* @title Горизонтальный компоновщик
|
|
12
12
|
*/
|
|
13
|
-
export type HorizontalLayoutContent = UniBlockContent &
|
|
14
|
-
colorPalette?: ColorPalette;
|
|
15
|
-
gap?: GapVersion;
|
|
16
|
-
/** @title контур на дочерних элементах */
|
|
17
|
-
isCardBorder?: boolean;
|
|
18
|
-
/** @title Внутренний отступ компоновщика */
|
|
19
|
-
isPadding?: boolean;
|
|
20
|
-
};
|
|
13
|
+
export type HorizontalLayoutContent = UniBlockContent & LayoutCommitProps;
|
|
@@ -76,7 +76,7 @@ export default {
|
|
|
76
76
|
className="col-span-12"
|
|
77
77
|
gap="M"
|
|
78
78
|
version="primary"
|
|
79
|
-
|
|
79
|
+
padding="p-6xl"
|
|
80
80
|
isInnerPadding={false}
|
|
81
81
|
isTheme={false}
|
|
82
82
|
block={{
|
|
@@ -113,12 +113,29 @@ export default {
|
|
|
113
113
|
/>
|
|
114
114
|
</div>
|
|
115
115
|
),
|
|
116
|
+
innerBorder: (
|
|
117
|
+
<div className="container grid grid-cols-12">
|
|
118
|
+
<VerticalLayout
|
|
119
|
+
className="col-span-12"
|
|
120
|
+
isCardBorder={true}
|
|
121
|
+
gap="M"
|
|
122
|
+
block={{
|
|
123
|
+
type: 'VerticalLayout',
|
|
124
|
+
blocks: [
|
|
125
|
+
{ type: 'ProductBlock', content: PRODUCT_BLOCK_WITH_IMAGE },
|
|
126
|
+
{ type: 'ProductBlock', content: PRODUCT_BLOCK_WITH_IMAGE },
|
|
127
|
+
],
|
|
128
|
+
}}
|
|
129
|
+
options={options}
|
|
130
|
+
/>
|
|
131
|
+
</div>
|
|
132
|
+
),
|
|
116
133
|
rollup: (
|
|
117
134
|
<div className="container grid grid-cols-12">
|
|
118
135
|
<VerticalLayout
|
|
119
136
|
className="col-span-12"
|
|
120
137
|
version="primary"
|
|
121
|
-
|
|
138
|
+
padding="p-6xl"
|
|
122
139
|
block={{
|
|
123
140
|
type: 'VerticalLayout',
|
|
124
141
|
blocks: [
|
|
@@ -86,6 +86,24 @@ export default {
|
|
|
86
86
|
/>
|
|
87
87
|
</div>
|
|
88
88
|
),
|
|
89
|
+
innerBorder: (
|
|
90
|
+
<div className="container grid grid-cols-12">
|
|
91
|
+
<VerticalLayout
|
|
92
|
+
className="col-span-12 border-1 border-red-500"
|
|
93
|
+
padding="p-6xl"
|
|
94
|
+
isCardBorder={true}
|
|
95
|
+
gap="M"
|
|
96
|
+
block={{
|
|
97
|
+
type: 'VerticalLayout',
|
|
98
|
+
blocks: [
|
|
99
|
+
{ type: 'ProductBlock', content: PRODUCT_BLOCK_WITH_IMAGE },
|
|
100
|
+
{ type: 'ProductBlock', content: PRODUCT_BLOCK_WITH_IMAGE },
|
|
101
|
+
],
|
|
102
|
+
}}
|
|
103
|
+
options={options}
|
|
104
|
+
/>
|
|
105
|
+
</div>
|
|
106
|
+
),
|
|
89
107
|
white: (
|
|
90
108
|
<div className="container grid grid-cols-12">
|
|
91
109
|
<VerticalLayout
|
|
@@ -181,7 +199,7 @@ export default {
|
|
|
181
199
|
<VerticalLayout
|
|
182
200
|
className="col-span-12"
|
|
183
201
|
version="primary"
|
|
184
|
-
|
|
202
|
+
padding="p-6xl"
|
|
185
203
|
block={{
|
|
186
204
|
type: 'VerticalLayout',
|
|
187
205
|
blocks: [
|
|
@@ -231,7 +249,7 @@ export default {
|
|
|
231
249
|
className="col-span-12"
|
|
232
250
|
version="primary"
|
|
233
251
|
gap="XL"
|
|
234
|
-
|
|
252
|
+
padding="p-6xl"
|
|
235
253
|
isInnerPadding={false}
|
|
236
254
|
block={{
|
|
237
255
|
type: 'VerticalLayout',
|
|
@@ -271,7 +289,7 @@ export default {
|
|
|
271
289
|
gap="M"
|
|
272
290
|
options={options}
|
|
273
291
|
version="primary"
|
|
274
|
-
|
|
292
|
+
padding="p-6xl"
|
|
275
293
|
isInnerPadding={true}
|
|
276
294
|
>
|
|
277
295
|
<Headline
|
|
@@ -279,7 +297,7 @@ export default {
|
|
|
279
297
|
headlineVersion="M"
|
|
280
298
|
isEmbedded={true}
|
|
281
299
|
/>
|
|
282
|
-
<HorizontalLayout isCardBorder={true}
|
|
300
|
+
<HorizontalLayout isCardBorder={true} padding="p-0">
|
|
283
301
|
<ProductBlock className="col-span-6" {...PRODUCT_BLOCK_CONTENT} />
|
|
284
302
|
<ProductBlock className="col-span-6" {...PRODUCT_BLOCK_CONTENT} />
|
|
285
303
|
</HorizontalLayout>
|
|
@@ -7,24 +7,22 @@ import { style } from '../../utils/style';
|
|
|
7
7
|
import { gapStyles } from '../HorizontalLayout/gapStyles';
|
|
8
8
|
import { type VerticalLayoutContent } from './VerticalLayoutContent';
|
|
9
9
|
|
|
10
|
-
export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {
|
|
11
|
-
isInnerBorder?: boolean;
|
|
12
|
-
}
|
|
10
|
+
export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {}
|
|
13
11
|
|
|
14
12
|
export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutProps>(
|
|
15
13
|
({
|
|
16
14
|
className = '',
|
|
15
|
+
padding = 'p-0',
|
|
17
16
|
gap = '',
|
|
18
|
-
isPadding = false,
|
|
19
17
|
isInnerPadding = true,
|
|
20
18
|
version = 'transparent',
|
|
21
19
|
isTheme = false,
|
|
22
|
-
|
|
20
|
+
isCardBorder = false,
|
|
23
21
|
...rest
|
|
24
22
|
}) => (
|
|
25
23
|
<BlockWrapper
|
|
26
24
|
className={style('relative flex flex-col', gapStyles[gap], className)}
|
|
27
|
-
|
|
25
|
+
padding={padding}
|
|
28
26
|
version={version}
|
|
29
27
|
isTheme={isTheme}
|
|
30
28
|
{...rest}
|
|
@@ -32,7 +30,7 @@ export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutP
|
|
|
32
30
|
{renderChildren({
|
|
33
31
|
...rest,
|
|
34
32
|
extraProps: {
|
|
35
|
-
className: style('w-full', getBorderStyle(
|
|
33
|
+
className: style('w-full', getBorderStyle(isCardBorder)),
|
|
36
34
|
padding: isInnerPadding ? '' : 'p-0',
|
|
37
35
|
},
|
|
38
36
|
})}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { type UniBlockContent } from '../../model/JSXBlock';
|
|
2
2
|
import { type GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
|
|
3
3
|
|
|
4
|
-
|
|
5
|
-
* @title Вертикальный компоновщик
|
|
6
|
-
*/
|
|
7
|
-
export type VerticalLayoutContent = UniBlockContent & {
|
|
4
|
+
export type LayoutCommitProps = {
|
|
8
5
|
gap?: GapVersion;
|
|
9
|
-
/** @title
|
|
10
|
-
|
|
6
|
+
/** @title контур на дочерних элементах */
|
|
7
|
+
isCardBorder?: boolean;
|
|
11
8
|
/** @title Отступы вложенных компонентов */
|
|
12
9
|
isInnerPadding?: boolean;
|
|
13
10
|
};
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* @title Вертикальный компоновщик
|
|
14
|
+
*/
|
|
15
|
+
export type VerticalLayoutContent = UniBlockContent & LayoutCommitProps;
|