@redneckz/wildless-cms-uni-blocks 0.8.0 → 0.8.2

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

@@ -27,6 +27,8 @@ interface SwipeListContainerProps extends SwipeContainerProps {
 
 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 = '',
@@ -65,9 +67,13 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
     const isHorizontalList = listType === 'horizontal-list';
     const containerStyle = {
       ...(isHorizontalList ? getContainerOffset(padding, additionPadding) : {}),
-      ...(isVerticalList ? getContainerHeight(containerRef) : {}),
+      ...(isVerticalList ? { height: DEFAULT_HEIGHT } : {}),
       gap: `${gap}px`,
     };
+    const itemContainerStyle = {
+      ...(isHorizontalList ? getContainerOffset(padding / 4) : {}),
+      maxHeight: DEFAULT_HEIGHT,
+    };
 
     return (
       <div
@@ -82,8 +88,9 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
             className={style(
               snapAlign,
               visibleItemCount ? childStyleMap[visibleItemCount - 1] : '',
+              isVerticalList ? 'h-full' : '',
             )}
-            style={isHorizontalList ? getContainerOffset(padding / 4) : {}}
+            style={itemContainerStyle}
             activeIndex={activeIndex}
             idx={idx}
             observerOptions={observerOptions}
@@ -110,7 +117,3 @@ const getVisibleIndices = (itemsVisibilityList: ItemsVisibilityList) =>
     .map((_, i): [IntersectionObserverEntry | undefined, number] => [_, i])
     .filter(([_]) => _ && _.intersectionRatio >= 0.9)
     .map(([, i]) => i);
-
-const getContainerHeight = (ref?: { current: HTMLDivElement | null }) => ({
-  height: ref?.current?.firstElementChild?.clientHeight || 0,
-});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/Tabs/Tabs.tsx

@@ -2,10 +2,10 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { EventBus } from '../../EventBus/EventBus';
 import type { UniBlockProps } from '../../model/JSXBlock';
-import type { TabData, TabsContent } from './TabsContent';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderTab } from './renderTab';
 import { ScrollableTabs } from './ScrollableTabs';
+import type { TabData, TabsContent } from './TabsContent';
 
 export interface TabActivationEvent {
   type?: TabData['type'];
@@ -35,7 +35,7 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
   useEffect(
     () =>
       currentTab?.type === 'group'
-        ? EventBus.inst.subject('tab', { label: currentTab.ref })
+        ? EventBus.inst.subject('tab', { type: currentTab.type, label: currentTab.ref })
         : undefined,
     [currentTab],
   );

package/src/hooks/useLink.ts

@@ -1,6 +1,5 @@
 import type { LinkProps, Target } from '../model/LinkProps';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
-import { adjustHref } from '../utils/adjustHref';
 import { isHash, isLocalURL } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
@@ -31,18 +30,13 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
       }
     };
 
-  return (props) => {
-    const href = adjustHref(props.href);
+  return (props) => ({
+    ...props,
+    'aria-label': props.text,
+    onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
+      props.onClick && props.onClick(ev);
 
-    return {
-      ...props,
-      href,
-      'aria-label': props.text,
-      onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
-        props.onClick && props.onClick(ev);
-
-        handleLocalURL(href, props.target)(ev);
-      }, props),
-    };
-  };
+      handleLocalURL(props.href, props.target)(ev);
+    }, props),
+  });
 }

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

@@ -27,6 +27,8 @@ interface SwipeListContainerProps extends SwipeContainerProps {
 
 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 = '',
@@ -65,9 +67,13 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
     const isHorizontalList = listType === 'horizontal-list';
     const containerStyle = {
       ...(isHorizontalList ? getContainerOffset(padding, additionPadding) : {}),
-      ...(isVerticalList ? getContainerHeight(containerRef) : {}),
+      ...(isVerticalList ? { height: DEFAULT_HEIGHT } : {}),
       gap: `${gap}px`,
     };
+    const itemContainerStyle = {
+      ...(isHorizontalList ? getContainerOffset(padding / 4) : {}),
+      maxHeight: DEFAULT_HEIGHT,
+    };
 
     return (
       <div
@@ -82,8 +88,9 @@ export const SwipeListContainer = JSX<SwipeListContainerProps>(
             className={style(
               snapAlign,
               visibleItemCount ? childStyleMap[visibleItemCount - 1] : '',
+              isVerticalList ? 'h-full' : '',
             )}
-            style={isHorizontalList ? getContainerOffset(padding / 4) : {}}
+            style={itemContainerStyle}
             activeIndex={activeIndex}
             idx={idx}
             observerOptions={observerOptions}
@@ -110,7 +117,3 @@ const getVisibleIndices = (itemsVisibilityList: ItemsVisibilityList) =>
     .map((_, i): [IntersectionObserverEntry | undefined, number] => [_, i])
     .filter(([_]) => _ && _.intersectionRatio >= 0.9)
     .map(([, i]) => i);
-
-const getContainerHeight = (ref?: { current: HTMLDivElement | null }) => ({
-  height: ref?.current?.firstElementChild?.clientHeight || 0,
-});