@redneckz/wildless-cms-uni-blocks 0.6.38 → 0.6.40

package/src/components/ProductTile/ProductTile.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
-import { VersionStyleMap } from '../../model/BlockVersion';
+import { VersionAdditionalStyleMap, VersionStyleMap } from '../../model/BlockVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -41,9 +41,7 @@ export const ProductTile = JSX<ProductTileProps>(
         {...rest}
       />
       {renderBenefits(benefits, version, image)}
-      {additionalDescription
-        ? renderAdditionalDescription(additionalDescription, image, version)
-        : null}
+      {additionalDescription ? renderAdditionalDescription(additionalDescription, image) : null}
       {buttons?.length ? (
         <ButtonSection buttons={buttons} className="flex self-end mt-5 gap-4 z-10 text-l" />
       ) : null}
@@ -66,42 +64,26 @@ function renderBenefits(benefits: TextBenefit[], version: BlockVersion, image?:
   );
 }
 
-function renderBenefit(version: BlockVersion = 'primary') {
-  const labelStyleMap: Record<BlockVersion, string> = {
-    primary: 'text-secondary-text',
-    secondary: 'text-white',
-  };
-
-  return function renderVersionedBenefit(benefit: TextBenefit, i: number) {
+const renderBenefit =
+  (version: BlockVersion = 'primary') =>
+  (benefit: TextBenefit, i: number) => {
     const { label = '', description = '' } = benefit;
 
     return [
       <div key={`label-${i}`} className="text-h6">
         {label}
       </div>,
-      <div key={`desc-${i}`} className={`text-m-light ${labelStyleMap[version]}`}>
+      <div key={`desc-${i}`} className={`text-m-light ${VersionAdditionalStyleMap[version]}`}>
         {description}
       </div>,
     ];
   };
-}
-
-function renderAdditionalDescription(
-  additionalDescription: string,
-  image?: Picture,
-  version: BlockVersion = 'primary',
-) {
-  const descStyleMap: Record<BlockVersion, string> = {
-    primary: 'text-secondary-text',
-    secondary: 'text-white',
-  };
 
+function renderAdditionalDescription(additionalDescription: string, image?: Picture) {
   // picture width = 242px. Text can overlay picture 20px deep. Outer paddings_x = 36px. 242-36-20 = 186px
   const DESCRIPTION_WIDTH = image?.src ? 'max-w-[calc(100%-186px)]' : '100%';
 
   return (
-    <div className={`text-m-light mt-2.5 z-10 ${DESCRIPTION_WIDTH} ${descStyleMap[version]}`}>
-      {additionalDescription}
-    </div>
+    <div className={`text-m-light mt-2.5 z-10 ${DESCRIPTION_WIDTH}`}>{additionalDescription}</div>
   );
 }

package/src/components/VerticalLayout/VerticalLayout.example.json

@@ -1,8 +1,11 @@
 {
-  "title": "Вертикальный компоновщик",
-  "version": "transparent",
-  "align": "left",
-  "gap": "",
+  "content": {
+    "version": "transparent",
+    "isPadding": false,
+    "isInnerPadding": true,
+    "align": "left",
+    "gap": ""
+  },
   "blocks": [
     {
       "type": "Headline",

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

@@ -19,6 +19,25 @@ const options = {
   blocksRegistry: Blocks,
 } as BlockRendererOptions;
 
+const carouselProductCard = {
+  content: {
+    headlineSmallVersion: 'L_R',
+    align: 'left',
+    isDotted: true,
+    title: 'Новость 1',
+    version: 'primary',
+    additionalDescription: '12 сентября 2022',
+    icon: {
+      size: {
+        width: 150,
+        height: 150,
+      },
+    },
+  },
+  style: ['col-span-12'],
+  type: 'CarouselProductCard',
+};
+
 export default {
   default: (
     <div className="container grid grid-cols-12">
@@ -35,12 +54,12 @@ export default {
       />
     </div>
   ),
-  'transparent center': (
+  'white center': (
     <div className="container grid grid-cols-12">
       <VerticalLayout
         className="col-span-12"
         align="center"
-        version="transparent"
+        version="primary"
         block={{
           type: 'VerticalLayout',
           blocks: [
@@ -162,4 +181,42 @@ export default {
       />
     </div>
   ),
+  carousel: (
+    <div className="container grid grid-cols-12">
+      <VerticalLayout
+        align="center"
+        className="col-span-12"
+        version="primary"
+        gap="XL"
+        isPadding={true}
+        isInnerPadding={false}
+        block={{
+          type: 'VerticalLayout',
+          blocks: [
+            {
+              content: {
+                title: 'Заголовок',
+                align: 'center',
+                bgColorHeadline: 'transparent',
+                headlineVersion: 'M',
+              },
+              style: ['col-span-12'],
+              type: 'Headline',
+            },
+            {
+              content: {
+                isBlur: true,
+                visibleItemCount: 3,
+                isCycle: false,
+              },
+              style: ['col-span-12'],
+              type: 'Carousel',
+              blocks: new Array(6).fill(carouselProductCard),
+            },
+          ],
+        }}
+        options={options}
+      />
+    </div>
+  ),
 };

package/src/components/VerticalLayout/VerticalLayout.tsx

@@ -15,10 +15,10 @@ const alignStyle: Record<AlignType, string> = {
 };
 
 const gapStyleMap: Record<GapVersion, string> = {
-  XXL: 'gap-10',
-  XL: 'gap-8',
-  L: 'gap-4',
-  M: 'gap-3',
+  XXL: 'gap-12',
+  XL: 'gap-10',
+  L: 'gap-8',
+  M: 'gap-4',
   S: 'gap-2',
   XS: 'gap-1',
   '': '',
@@ -31,22 +31,37 @@ const backgroundStyleMap: Record<BlockVersionWithTransparent, string> = {
 };
 
 export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutProps>(
-  ({ className = '', gap = '', align, version = 'transparent', ...rest }) => (
-    <BlockWrapper
-      className={[
-        'flex flex-col',
-        gapStyleMap[gap],
-        align && alignStyle[align],
-        backgroundStyleMap[version],
-        className,
-      ]
-        .filter(Boolean)
-        .join(' ')}
-      {...rest}
-    >
-      {renderChildren(rest)}
-    </BlockWrapper>
-  ),
+  ({
+    className = '',
+    gap = '',
+    align,
+    isPadding = false,
+    isInnerPadding = true,
+    version = 'transparent',
+    options,
+    ...rest
+  }) => {
+    const paddingStyle = isPadding ? 'p-12' : '';
+    const innerPaddingStyle = isInnerPadding ? '' : '!p-0';
+
+    return (
+      <BlockWrapper
+        className={[
+          'flex flex-col [&>*]:max-w-full',
+          paddingStyle,
+          gapStyleMap[gap],
+          align && alignStyle[align],
+          backgroundStyleMap[version],
+          className,
+        ]
+          .filter(Boolean)
+          .join(' ')}
+        {...rest}
+      >
+        {renderChildren({ ...rest, options: { ...options, className: innerPaddingStyle } })}
+      </BlockWrapper>
+    );
+  },
 );
 
 VerticalLayout.childrenTypes = {

package/src/components/VerticalLayout/VerticalLayoutContent.ts

@@ -16,4 +16,8 @@ export interface VerticalLayoutContent {
   version?: BlockVersionWithTransparent;
   align?: AlignType;
   gap?: GapVersion;
+  /** @title Внутренний отступ компоновщика */
+  isPadding?: boolean;
+  /** @title Отступы вложенных компонентов */
+  isInnerPadding?: boolean;
 }

package/src/model/BlockVersion.ts

@@ -15,6 +15,11 @@ export const VersionStyleMap: Record<BlockVersion, string> = {
   secondary: 'bg-primary-main text-white',
 };
 
+export const VersionAdditionalStyleMap: Record<BlockVersion, string> = {
+  primary: 'text-secondary-text',
+  secondary: 'text-white',
+};
+
 export const VersionWithTransparentStyleMap: Record<BlockVersionWithTransparent, string> = {
   transparent: '',
   primary: 'bg-white text-primary-text',

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

@@ -22,23 +22,23 @@ export const ButtonSection = JSX<ButtonSectionProps>(({ className = '', buttons
 );
 
 export function renderButton({ button, buttonClassName, index }: RenderButtonProps) {
-  const { icon, iconRight, version, ...rest } = button;
+  const { icon, iconRight, version, text, ...rest } = button;
 
   const iconVersion = version === 'secondary' ? 'color' : 'white';
-
   const leftIcon = renderButtonIcon({ ...icon, iconVersion: iconVersion } as Picture);
   const rightIcon = renderButtonIcon({ ...iconRight, iconVersion: iconVersion } as Picture);
 
-  return (
+  return text ? (
     <Button
       key={index ? String(index) : ''}
       className={buttonClassName}
       appendLeft={leftIcon}
       appendRight={rightIcon}
       version={version}
+      text={text}
       {...rest}
     />
-  );
+  ) : null;
 }
 
 const renderButtonIcon = (icon: Picture) => {

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

@@ -16,13 +16,13 @@ interface SwipeListContainerProps extends SwipeContainerProps {
   className?: string;
   containerRef?: { current: HTMLDivElement | null };
   activeIndex?: number;
-  visibleItemCount?: SwipeListItemWidthAuto | 1 | 2 | 3;
+  visibleItemCount?: SwipeListItemWidthAuto | 1 | 2 | 3 | 4;
   snapAlign?: 'snap-start' | 'snap-center' | 'snap-end';
   onVisibleItemsChange?: (itemsVisibilityList: ItemsVisibilityList) => void;
   onVisibleIndicesChange?: (indices: number[]) => void;
 }
 
-const childStyleMap = ['min-w-[100%]', 'min-w-[50%]', 'min-w-[33.33%]'];
+const childStyleMap = ['min-w-[100%]', 'min-w-[50%]', 'min-w-[33.33%]', 'min-w-[25%]'];
 
 export const SwipeListContainer = JSX<SwipeListContainerProps>(
   ({

package/src/utils/adjustHref.ts

@@ -1,4 +1,3 @@
-import { projectSettings } from '../ProjectSettings';
 import { getOrigin } from './url';
 
 export const adjustHref = (
@@ -9,9 +8,8 @@ export const adjustHref = (
     return href;
   }
 
-  const hrefWithBasePath = `${projectSettings.BASE_PATH || ''}${href}`;
   const origin = getOrigin(router?.href);
 
   // Relative URL
-  return origin ? hrefWithBasePath.replace(origin, '') || '/' : hrefWithBasePath;
+  return origin ? href.replace(origin, '') || '/' : href;
 };