@redneckz/wildless-cms-uni-blocks 0.14.72 → 0.14.74

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

@@ -86,6 +86,24 @@ export default {
       />
     </div>
   ),
+  innerBorder: (
+    <div className="container grid grid-cols-12">
+      <VerticalLayout
+        className="col-span-12 border-1 border-red-500"
+        padding="p-6xl"
+        isCardBorder={true}
+        gap="M"
+        block={{
+          type: 'VerticalLayout',
+          blocks: [
+            { type: 'ProductBlock', content: PRODUCT_BLOCK_WITH_IMAGE },
+            { type: 'ProductBlock', content: PRODUCT_BLOCK_WITH_IMAGE },
+          ],
+        }}
+        options={options}
+      />
+    </div>
+  ),
   white: (
     <div className="container grid grid-cols-12">
       <VerticalLayout
@@ -181,7 +199,7 @@ export default {
       <VerticalLayout
         className="col-span-12"
         version="primary"
-        isPadding={true}
+        padding="p-6xl"
         block={{
           type: 'VerticalLayout',
           blocks: [
@@ -231,7 +249,7 @@ export default {
         className="col-span-12"
         version="primary"
         gap="XL"
-        isPadding={true}
+        padding="p-6xl"
         isInnerPadding={false}
         block={{
           type: 'VerticalLayout',
@@ -271,7 +289,7 @@ export default {
         gap="M"
         options={options}
         version="primary"
-        isPadding={true}
+        padding="p-6xl"
         isInnerPadding={true}
       >
         <Headline
@@ -279,7 +297,7 @@ export default {
           headlineVersion="M"
           isEmbedded={true}
         />
-        <HorizontalLayout isCardBorder={true} isPadding={false}>
+        <HorizontalLayout isCardBorder={true} padding="p-0">
           <ProductBlock className="col-span-6" {...PRODUCT_BLOCK_CONTENT} />
           <ProductBlock className="col-span-6" {...PRODUCT_BLOCK_CONTENT} />
         </HorizontalLayout>

package/src/components/VerticalLayout/VerticalLayout.tsx

@@ -7,24 +7,22 @@ import { style } from '../../utils/style';
 import { gapStyles } from '../HorizontalLayout/gapStyles';
 import { type VerticalLayoutContent } from './VerticalLayoutContent';
 
-export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {
-  isInnerBorder?: boolean;
-}
+export interface VerticalLayoutProps extends VerticalLayoutContent, UniBlockProps {}
 
 export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutProps>(
   ({
     className = '',
+    padding = 'p-0',
     gap = '',
-    isPadding = false,
     isInnerPadding = true,
     version = 'transparent',
     isTheme = false,
-    isInnerBorder = false,
+    isCardBorder = false,
     ...rest
   }) => (
     <BlockWrapper
       className={style('relative flex flex-col', gapStyles[gap], className)}
-      defaultPadding={isPadding ? 'p-6xl' : ''}
+      padding={padding}
       version={version}
       isTheme={isTheme}
       {...rest}
@@ -32,7 +30,7 @@ export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutP
       {renderChildren({
         ...rest,
         extraProps: {
-          className: style('w-full', getBorderStyle(isInnerBorder)),
+          className: style('w-full', getBorderStyle(isCardBorder)),
           padding: isInnerPadding ? '' : 'p-0',
         },
       })}

package/src/components/VerticalLayout/VerticalLayoutContent.ts

@@ -1,13 +1,15 @@
 import { type UniBlockContent } from '../../model/JSXBlock';
 import { type GapVersion } from '../HorizontalLayout/HorizontalLayoutContent';
 
-/**
- * @title Вертикальный компоновщик
- */
-export type VerticalLayoutContent = UniBlockContent & {
+export type LayoutCommitProps = {
   gap?: GapVersion;
-  /** @title Внутренний отступ компоновщика */
-  isPadding?: boolean;
+  /** @title контур на дочерних элементах */
+  isCardBorder?: boolean;
   /** @title Отступы вложенных компонентов */
   isInnerPadding?: boolean;
 };
+
+/**
+ * @title Вертикальный компоновщик
+ */
+export type VerticalLayoutContent = UniBlockContent & LayoutCommitProps;