@redneckz/wildless-cms-uni-blocks 0.3.74 → 0.3.76

package/src/ui-kit/BlocksList/BlocksListProps.ts

@@ -17,71 +17,81 @@ export interface ActiveHandler {
   initialState?: boolean;
 }
 
-/**
- * @title Количество колонок
- * @enumNames ["1 колонка", "2 колонки"]
- */
-export type ColumnsCount = 1 | 2;
+export interface BlocksCommonProps {
+  /**
+   * @title Стиль
+   * @default ["col-span-12"]
+   **/
+  style?: string[];
+}
 
 /**
  * @title Заголовок
  * @default {"blockListType": "Headline"}
  */
-export type HeadlineBlockListDef = HeadlineContent & { blockListType: 'Headline' };
+export type HeadlineBlockListDef = HeadlineContent &
+  BlocksCommonProps & { blockListType: 'Headline' };
 
 /**
  * @title Список документов
  * @default {"blockListType": "LinkDocs"}
  */
-export type LinkDocsBlockListDef = LinkDocsContent & { blockListType: 'LinkDocs' };
+export type LinkDocsBlockListDef = LinkDocsContent &
+  BlocksCommonProps & { blockListType: 'LinkDocs' };
 
 /**
  * @title Текстовый блок
  * @default {"blockListType": "TextBlock"}
  */
-export type TextBlockBlockListDef = TextBlockContent & { blockListType: 'TextBlock' };
+export type TextBlockBlockListDef = TextBlockContent &
+  BlocksCommonProps & { blockListType: 'TextBlock' };
 
 /**
  * @title Картинка с текстом
  * @default {"blockListType": "PictureText"}
  */
-export type PictureTextBlockListDef = PictureTextContent & { blockListType: 'PictureText' };
+export type PictureTextBlockListDef = PictureTextContent &
+  BlocksCommonProps & { blockListType: 'PictureText' };
 
 /**
  * @title Продуктовый блок
  * @default {"blockListType": "ProductBlock"}
  */
-export type ProductBlockBlockListDef = ProductBlockContent & { blockListType: 'ProductBlock' };
+export type ProductBlockBlockListDef = ProductBlockContent &
+  BlocksCommonProps & { blockListType: 'ProductBlock' };
 
 /**
  * @title Плитка
  * @default {"blockListType": "Tile"}
  */
-export type TileBlockListDef = TileContent & { blockListType: 'Tile' };
+export type TileBlockListDef = TileContent & BlocksCommonProps & { blockListType: 'Tile' };
 
 /**
  * @title Продуктовая плитка
  * @default {"blockListType": "ProductTile"}
  */
-export type ProductTileBlockListDef = ProductTileContent & { blockListType: 'ProductTile' };
+export type ProductTileBlockListDef = ProductTileContent &
+  BlocksCommonProps & { blockListType: 'ProductTile' };
 
 /**
  * @title Галерея
  * @default {"blockListType": "Gallery"}
  */
-export type GalleryBlockListDef = GalleryContent & { blockListType: 'Gallery' };
+export type GalleryBlockListDef = GalleryContent & BlocksCommonProps & { blockListType: 'Gallery' };
 
 /**
  * @title Мини-галлерея
  * @default {"blockListType": "MiniGallery"}
  */
-export type MiniGalleryBlockListDef = MiniGalleryContent & { blockListType: 'MiniGallery' };
+export type MiniGalleryBlockListDef = MiniGalleryContent &
+  BlocksCommonProps & { blockListType: 'MiniGallery' };
 
 /**
  * @title Список ссылок
  * @default {"blockListType": "LinkList"}
  */
-export type LinkListBlockListDef = LinkListContent & { blockListType: 'LinkList' };
+export type LinkListBlockListDef = LinkListContent &
+  BlocksCommonProps & { blockListType: 'LinkList' };
 
 /**
  * @title Содержимое блока

package/src/ui-kit/BlocksList/renderBlocksList.tsx

@@ -1,30 +1,35 @@
 import type { JSXBlock } from '../../components/ContentPage/ContentPage';
 import type { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
-import type { BlockDef, ColumnsCount } from './BlocksListProps';
+import type { UniBlockProps } from '../../types';
+import { style2className } from '../../utils/style2className';
+import type { BlockDef } from './BlocksListProps';
 import { EmbeddableBlocks } from './EmbeddableBlocks';
 
 type EmbeddableBlocksProps = {
   blocks?: BlockDef[];
   context: ContentPageContext;
-  columns?: ColumnsCount;
   className?: string;
 };
 
-export const renderBlocksList = ({ blocks, context, className, columns }: EmbeddableBlocksProps) =>
-  blocks?.length ? blocks.map(renderBlock({ context, className, columns })) : null;
+export const renderBlocksList = ({ blocks, context, className = '' }: EmbeddableBlocksProps) =>
+  blocks?.length ? blocks.map(renderBlock({ context, className })) : null;
 
 const renderBlock =
-  ({ context, columns, className }: EmbeddableBlocksProps) =>
+  ({ context, className }: UniBlockProps) =>
   (block: BlockDef, i: number) => {
     const type = block?.blockListType;
     if (!type || !(type in EmbeddableBlocks)) {
       return null;
     }
-    const columnsCountClass = columns === 2 ? 'w-1/2' : '';
+    const classNameBlock = style2className(block?.style);
     const EmbeddedBlock: JSXBlock = EmbeddableBlocks[type];
+
     return (
-      <div className={`${className} ${columnsCountClass}`} key={`block_${i}`}>
-        <EmbeddedBlock context={context} {...block} className="!p-0" />
-      </div>
+      <EmbeddedBlock
+        key={`block_${i}`}
+        context={context}
+        {...block}
+        className={`${className} ${classNameBlock}`}
+      />
     );
   };

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

@@ -8,13 +8,14 @@ interface ButtonInnerProps extends ButtonWithIconProps {
 
 export const ButtonInner = JSX<ButtonInnerProps>((props) => {
   const { text, aboveText, appendLeft, appendRight } = props;
+
   return (
     <div className={getButtonStyle(props)}>
       {appendLeft ? appendLeft : null}
       {isWithText(props) ? (
         <div>
           <div className="text-m-2xs font-light text-left">{aboveText}</div>
-          <div className="text-button text-left">{text}</div>
+          <div className="text-base text-left">{text}</div>
         </div>
       ) : null}
       {appendRight ? appendRight : null}
@@ -29,7 +30,7 @@ const getButtonStyle = (props: ButtonInnerProps) => {
     return '';
   }
 
-  const withTextStyle = `px-8 gap-2 ${aboveText ? 'py-2' : 'py-[18px]'}`;
+  const withTextStyle = `px-9 gap-2 ${aboveText ? 'py-2' : 'py-4'}`;
 
   return [
     'flex items-center justify-center',

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

@@ -10,6 +10,7 @@ export interface ButtonSectionProps extends ButtonContent, UniBlockProps {}
 export const ButtonSection = JSX<ButtonSectionProps>(({ context, className = '', buttons }) => {
   const { handlerDecorator } = context;
   const router = context.useRouter();
+
   return buttons?.length ? (
     <div className={className}>
       {buttons.map((button, index) =>

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

@@ -8,6 +8,7 @@ import { foldableBlockClassNames, useActiveHandler } from './useActiveHandler';
 
 export type FoldableBlocks = VNode[];
 export type Render = (_: VNode, isActive: boolean) => VNode;
+
 export interface FoldableProps {
   context: ContentPageContext;
   foldButtonLabel?: string;
@@ -17,11 +18,13 @@ export interface FoldableProps {
   foldButtonDataTheme?: ColorPalette;
   isUnfolded?: boolean;
   render?: Render;
+  containerClasses?: string;
 }
 
 export interface RenderBlocksParams {
   blocksToHide: number;
   isActive: boolean;
+  containerClasses?: string;
 }
 
 export const Foldable = JSX<FoldableProps>(
@@ -33,6 +36,7 @@ export const Foldable = JSX<FoldableProps>(
     foldButtonLabel,
     foldButtonDataTheme,
     isUnfolded,
+    containerClasses,
     render = (_) => _,
   }) => {
     const blocksToHide = clamp(hiddenBlocksNum, 0, blocks.length);
@@ -44,7 +48,7 @@ export const Foldable = JSX<FoldableProps>(
 
     return blocks ? (
       <div>
-        {renderBlocks(blocks, render, { blocksToHide, isActive })}
+        {renderBlocks(blocks, render, { blocksToHide, isActive, containerClasses })}
         {hiddenBlocksNum ? (
           <button
             className={
@@ -55,7 +59,7 @@ export const Foldable = JSX<FoldableProps>(
             onClick={handleToggle}
           >
             <span className="pr-3">{isActive ? 'Скрыть' : foldButtonLabel}</span>
-            <Icon name={icon} iconVersion="white" width="20" height="20" asSVG />
+            {icon ? <Icon name={icon} iconVersion="white" width="20" height="20" asSVG /> : null}
           </button>
         ) : null}
       </div>
@@ -66,7 +70,7 @@ export const Foldable = JSX<FoldableProps>(
 const renderBlocks = (
   blocks: FoldableBlocks,
   render: Render,
-  { blocksToHide, isActive }: RenderBlocksParams,
+  { blocksToHide, isActive, containerClasses }: RenderBlocksParams,
 ) => {
   const visibleBlocks = blocks.slice(0, blocks.length - blocksToHide);
   const hiddenBlocks = blocks.slice(-blocksToHide);
@@ -74,7 +78,7 @@ const renderBlocks = (
   return render(
     <div>
       {visibleBlocks}
-      <div className={foldableBlockClassNames}>{hiddenBlocks}</div>
+      <div className={`${foldableBlockClassNames} ${containerClasses}`}>{hiddenBlocks}</div>
     </div>,
     isActive,
   );

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

@@ -8,6 +8,7 @@ export const Input = JSX<InputProps>(
       const validInputValue = e.target.validity.valid ? e.target.value : value;
       onChange(validInputValue);
     };
+
     return (
       <input
         className={className}

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

@@ -25,6 +25,7 @@ export const InputRange = JSX<InputRangeProps>(
         onChange(max);
       }
     };
+
     return (
       <div className={className}>
         <label className="block relative">

package/src/ui-kit/List/ListItem.tsx

@@ -46,5 +46,6 @@ export const getListStyle = (version: ListItemVersion) => {
     tile: 'w-[7px] h-[7px] min-w-[7px] min-h-[7px]',
     'tile-white': 'w-[7px] h-[7px] min-w-[7px] min-h-[7px]',
   };
+
   return `${LIST_STYLE_CLASSES[version]} ${LIST_DOT_STYLE_MAP[version]} ${size[version]}`;
 };

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

@@ -66,5 +66,6 @@ export const Logo = JSX<Partial<LogoProps>>(
 
 const renderTitle = (children, bgColor, title) => {
   const text = children || title || 'Россельхозбанк';
+
   return <span className={`${TEXT_COLOR[bgColor]} font-medium ml-2.5`}>{text}</span>;
 };

package/src/ui-kit/SearchBar/SearchBar.mobile.tsx

@@ -4,6 +4,7 @@ import { Img } from '../Img/Img';
 
 export const SearchBar = JSX<UniBlockProps>(({ className, context }) => {
   const { term, setTerm } = context.useSearch();
+
   return (
     <form className={`relative ${className || ''}`}>
       <div className="absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none">

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

@@ -5,6 +5,7 @@ import { Img } from '../Img/Img';
 
 export const SearchBar = JSX<UniBlockProps>(({ className, context }) => {
   const { term, setTerm } = context.useSearch();
+
   return (
     <form className={`relative ${className || ''}`}>
       <div className="absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none">

package/src/ui-kit/SearchBar.mobile.tsx

@@ -5,6 +5,7 @@ import { Img } from './Img/Img';
 
 export const SearchBar = JSX<UniBlockProps>(({ className, context }) => {
   const { term, setTerm } = context.useSearch();
+
   return (
     <form className={`relative ${className || ''}`}>
       <div className="absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none">

package/src/ui-kit/SwipeListControl/utils/getIndexParts.ts

@@ -20,5 +20,6 @@ export const getIndexParts = (
 
   const [start, end] = scrollPoints[index];
   const fraction = (scrollLeft - start) / (end - start);
+
   return { index, fraction };
 };

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

@@ -19,6 +19,7 @@ const tabDescriptionStyle = (isActive = false) =>
 const renderTab =
   (currentTabIndex: number, onTabClick: TabClickHandler) => (tab: Tab, index: number) => {
     const isActive = currentTabIndex === index;
+
     return (
       <div
         key={String(index)}

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

@@ -60,5 +60,6 @@ const getTextClasses = (bgColor: BgColorVersion, active = false, flat = false) =
   const nonActiveAtoms = `${
     flat ? 'text-primary-text' : 'text-secondary-text'
   } hover:text-primary-main`;
+
   return `${active ? 'text-primary-main' : nonActiveAtoms} ${TEXT_CLASSES}`;
 };

package/src/utils/adjustHref.ts

@@ -11,6 +11,7 @@ export const adjustHref = (
 
   const relativeHref = toRelativeHref(href, router) || '';
   const isMobilePage = router?.pathname.startsWith(MOBILE_URL_PATH);
+
   return isMobilePage && !isURL(relativeHref) ? `${MOBILE_URL_PATH}${relativeHref}` : relativeHref;
 };
 
@@ -20,5 +21,6 @@ const toRelativeHref = (href: string | undefined, router: { href?: string }) =>
   }
 
   const origin = getOrigin(router?.href);
+
   return origin ? href.replace(origin, '') || '/' : href;
 };

package/src/utils/getColSpan.ts

@@ -1,5 +1,6 @@
 export const getColSpan = (className: string) => {
   const colSpanPrefix = 'col-span-';
   const colSpanStr = className.split(/\s+/).find((_) => _.startsWith(colSpanPrefix));
+
   return colSpanStr ? parseInt(colSpanStr.substring(colSpanPrefix.length), 10) : 12;
 };

package/src/utils/roundTo.ts

@@ -1,4 +1,5 @@
 export const roundTo = (value: number, precision = 2) => {
   const factor = Math.pow(10, precision);
+
   return Math.round(parseFloat(String(value)) * factor) / factor;
 };

package/src/utils/tableFunc.ts

@@ -4,5 +4,6 @@ export const tableFunc =
   <Input, Output>(table: Array<[Predicate<Input>, Output]>) =>
   (input: Input): Output | undefined => {
     const [, output] = table.find(([predicate]) => predicate(input)) || [];
+
     return output;
   };

package/src/utils/url.ts

@@ -11,6 +11,7 @@ export const getOrigin = (href?: string) => {
   const protoSeparator = '//';
   const endOfProto = url.indexOf(protoSeparator);
   const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
+
   return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
 
@@ -20,5 +21,6 @@ export const getHash = (href?: string) => {
   }
 
   const hashIndex = href.indexOf('#');
+
   return hashIndex !== -1 ? href.substring(hashIndex, href.length) : undefined;
 };

package/dist/model/Insurance.d.ts

@@ -1,6 +0,0 @@
-export interface InsuranceProps {
-    /** @title Ежемесячный лимит */
-    monthLimit?: number;
-    /** @title Страховая сумма */
-    sum?: number;
-}

package/dist/model/Insurance.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Insurance.js","sourceRoot":"","sources":["../../src/model/Insurance.ts"],"names":[],"mappings":""}

package/lib/model/Insurance.d.ts

@@ -1,6 +0,0 @@
-export interface InsuranceProps {
-    /** @title Ежемесячный лимит */
-    monthLimit?: number;
-    /** @title Страховая сумма */
-    sum?: number;
-}

package/lib/model/Insurance.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Insurance.js.map

package/lib/model/Insurance.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Insurance.js","sourceRoot":"","sources":["../../src/model/Insurance.ts"],"names":[],"mappings":""}

package/mobile/dist/model/Insurance.d.ts

@@ -1,6 +0,0 @@
-export interface InsuranceProps {
-    /** @title Ежемесячный лимит */
-    monthLimit?: number;
-    /** @title Страховая сумма */
-    sum?: number;
-}

package/mobile/dist/model/Insurance.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Insurance.js","sourceRoot":"","sources":["../../src/model/Insurance.ts"],"names":[],"mappings":""}

package/mobile/lib/model/Insurance.d.ts

@@ -1,6 +0,0 @@
-export interface InsuranceProps {
-    /** @title Ежемесячный лимит */
-    monthLimit?: number;
-    /** @title Страховая сумма */
-    sum?: number;
-}

package/mobile/lib/model/Insurance.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Insurance.js.map

package/mobile/lib/model/Insurance.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Insurance.js","sourceRoot":"","sources":["../../src/model/Insurance.ts"],"names":[],"mappings":""}

package/mobile/src/model/Insurance.ts

@@ -1,6 +0,0 @@
-export interface InsuranceProps {
-  /** @title Ежемесячный лимит */
-  monthLimit?: number;
-  /** @title Страховая сумма */
-  sum?: number;
-}

package/src/model/Insurance.ts

@@ -1,6 +0,0 @@
-export interface InsuranceProps {
-  /** @title Ежемесячный лимит */
-  monthLimit?: number;
-  /** @title Страховая сумма */
-  sum?: number;
-}