@redneckz/wildless-cms-uni-blocks 0.8.18 → 0.8.20

package/src/components/CarouselLinks/CarouselLinks.tsx

@@ -10,7 +10,7 @@ import type { CarouselLinksContent } from './CarouselLinksContent';
 
 export interface CarouselLinksProps extends CarouselLinksContent, UniBlockProps {}
 
-const MAX_LINKS_COUNT = 12;
+const MAX_LINKS_COUNT = 10;
 
 export const CarouselLinks = JSX<CarouselLinksProps>(
   ({

package/src/components/CarouselLinks/CarouselLinks.ui.json

@@ -0,0 +1,8 @@
+{
+  "content": {},
+  "style": {
+    "ui:options": {
+      "minCols": 12
+    }
+  }
+}

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkProps } from '../../model/LinkProps';
 import { Img } from '../Img/Img';
+import { useLink } from '../../hooks/useLink';
+import type { LinkProps } from '../../model/LinkProps';
 
 const LINK_CLASS_NAME = `absolute border border-primary-main ml-3 px-6 py-5
   text-l-light bg-white text-primary-text flex w-[316px]
@@ -15,13 +16,12 @@ export type LinkButtonProps = LinkProps & {
 
 export const LinkButton = JSX<LinkButtonProps>(
   ({ text, href = '', target = '', className = '' }) => {
-    if (!text) {
-      return null;
-    }
+    const link = useLink();
+    const adjustedProps = link({ href, target });
 
-    return (
+    return text ? (
       <div className={`relative group/link cursor-pointer w-[328px] h-[82px] ${className}`}>
-        <a className={LINK_CLASS_NAME} role="link" href={href} target={target}>
+        <a className={LINK_CLASS_NAME} role="link" {...adjustedProps}>
           <div className="p-0.5">{text}</div>
           <div className="w-6 h-6">
             <Img
@@ -37,6 +37,6 @@ export const LinkButton = JSX<LinkButtonProps>(
         <div className={`${LINK_BORDER_CLASS_NAME} mx-1.5 mt-1.5`} />
         <div className={`${LINK_BORDER_CLASS_NAME} mt-3 mr-3`} />
       </div>
-    );
+    ) : null;
   },
 );

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

@@ -3,7 +3,7 @@ import { useCallback, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import type { IntersectionObserverOptions } from '../../hooks/useIntersectionObserver';
 import { mapChildren } from '../../utils/mapChildren';
 import { style } from '../../utils/style';
-import type { SwipeListControlType } from './SwipeListControlContent';
+import { getContainerHeight } from './getContainerHeight';
 import type { SwipeContainerProps } from './SwipeListControlProps';
 import { SwipeListItem } from './SwipeListItem';
 
@@ -22,13 +22,10 @@ interface SwipeListContainerProps extends SwipeContainerProps {
   snapAlign?: 'snap-start' | 'snap-center' | 'snap-end';
   onVisibleItemsChange?: (itemsVisibilityList: ItemsVisibilityList) => void;
   onVisibleIndicesChange?: (indices: number[]) => void;
-  listType?: SwipeListControlType;
 }
 
 const childStyleMap = ['min-w-[100%]', 'min-w-[50%]', 'min-w-[33.33%]', 'min-w-[25%]'];
 
-const DEFAULT_HEIGHT = '866px';
-
 export const SwipeListContainer = JSX<SwipeListContainerProps>(
   ({
     className = '',
@@ -39,6 +36,7 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
     padding = 0,
     listType = 'horizontal-list',
     snapAlign = 'snap-center',
+    minHeight,
     children,
     onVisibleItemsChange,
     onVisibleIndicesChange,
@@ -67,13 +65,9 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
     const isHorizontalList = listType === 'horizontal-list';
     const containerStyle = {
       ...(isHorizontalList ? getContainerOffset(padding, additionPadding) : {}),
-      ...(isVerticalList ? { height: DEFAULT_HEIGHT } : {}),
+      ...(isVerticalList ? getContainerHeight(minHeight) : {}),
       gap: `${gap}px`,
     };
-    const itemContainerStyle = {
-      ...(isHorizontalList ? getContainerOffset(padding / 4) : {}),
-      maxHeight: DEFAULT_HEIGHT,
-    };
 
     return (
       <div
@@ -90,7 +84,7 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
               visibleItemCount ? childStyleMap[visibleItemCount - 1] : '',
               isVerticalList ? 'h-full' : '',
             )}
-            style={itemContainerStyle}
+            style={isHorizontalList ? getContainerOffset(padding / 4) : {}}
             activeIndex={activeIndex}
             idx={idx}
             observerOptions={observerOptions}

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

@@ -20,6 +20,7 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
     gap = DEFAULT_GAP,
     padding = DEFAULT_PADDING,
     showDots = true,
+    minHeight,
     children,
     onVisibleIndicesChange,
     listType = 'horizontal-list',
@@ -42,6 +43,7 @@ export const SwipeListControl = JSX<SwipeListControlProps>(
           padding={padding}
           onVisibleIndicesChange={scroll.handleVisibleIndicesChange}
           listType={listType}
+          minHeight={minHeight}
         >
           {children}
         </SwipeListContainer>

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

@@ -1,17 +1,11 @@
 import type { BlockVersion } from '../../model/BlockVersion';
-
-/**
- * @title Вид
- * @enumNames ["Горизонтальный", "Вертикальный"]
- */
-export type SwipeListControlType = 'horizontal-list' | 'vertical-list';
+import type { SwipeContainerProps } from './SwipeListControlProps';
 
 /**
  * @title Swipe-контроллер
  */
-export interface SwipeListControlContent {
+export interface SwipeListControlContent extends SwipeContainerProps {
   /** @title Точки-индикаторы */
   showDots?: boolean;
-  listType?: SwipeListControlType;
   version?: BlockVersion;
 }

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { SwipeListControlType } from './SwipeListControlContent';
+import type { SwipeListControlType } from './SwipeListControlProps';
 
 const containerStyles: Record<SwipeListControlType, string> = {
   'horizontal-list': 'mx-auto mt-5 w-fit',

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

@@ -1,13 +1,24 @@
 import type { SwipeListControlContent } from './SwipeListControlContent';
 
 /**
- * @title Контейнер
+ * @title Вид
+ * @enumNames ["Горизонтальный", "Вертикальный"]
  */
+export type SwipeListControlType = 'horizontal-list' | 'vertical-list';
+
+/**
+ * @title Минимальная высота
+ * @enumNames ['Стандартная', 'Маленькая']
+ */
+export type ContainerMinHeight = 866 | 720;
+
 export interface SwipeContainerProps {
-  /** @title Расстояние между элементами */
+  /** @hidden */
   gap?: number;
-  /** @title Отступы */
+  /** @hidden */
   padding?: number;
+  listType?: SwipeListControlType;
+  minHeight?: ContainerMinHeight;
 }
 
 /**

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

@@ -0,0 +1,10 @@
+const HEADER_HEIGHT = 170;
+const FOOTER_HEIGHT = 48;
+const BLOCKS_GAP = 4;
+const PAGE_PADDINGS_X = 20;
+const DEFAULT_HEIGHT = 866;
+
+export const getContainerHeight = (minHeight?: number) => ({
+  height: `calc(100vh - ${HEADER_HEIGHT + FOOTER_HEIGHT + BLOCKS_GAP + PAGE_PADDINGS_X}px)`,
+  minHeight: `${minHeight || DEFAULT_HEIGHT}px`,
+});