@redneckz/wildless-cms-uni-blocks 0.3.50 → 0.3.53

package/src/components/Gallery/Gallery.fixture.tsx

@@ -4,6 +4,8 @@ import type { ButtonCommonProps } from '../../ui-kit/Button/Button';
 import { Gallery } from './Gallery';
 import type { GalleryProps } from './GalleryProps';
 
+const isDotted = true;
+
 const image: Picture = {
   src: 'money-1.png',
   format: 'webp',
@@ -46,6 +48,7 @@ export const defaultProps: GalleryProps = {
         'Время копить: ставка растет в зависимости от срока нахождения средств на Счете!',
       image,
       button: buttonPrimary,
+      isDotted,
       items: defaultItems,
       version: 'secondary',
     },
@@ -54,6 +57,7 @@ export const defaultProps: GalleryProps = {
       description: 'Порядок и условия предоставления в соответствии с 106 ФЗ',
       image,
       button: buttonPrimaryIcon,
+      isDotted,
       items: defaultItems,
     },
     {
@@ -61,6 +65,7 @@ export const defaultProps: GalleryProps = {
       description: 'Высокий процент даже при небольшой сумме денежных средств',
       image,
       button: buttonPrimary,
+      isDotted,
       items: defaultItems,
     },
     {
@@ -69,6 +74,7 @@ export const defaultProps: GalleryProps = {
         'Время копить: ставка растет в зависимости от срока нахождения средств на Счете!',
       image,
       button: buttonPrimary,
+      isDotted,
       items: defaultItems,
     },
   ],
@@ -117,24 +123,28 @@ const listAndButtonProps: GalleryProps = {
       title: 'Более 5000 товаров',
       image,
       button: buttonPrimary,
+      isDotted,
       items: defaultItems,
     },
     {
       title: 'Более 1000 развлечений',
       image,
       button: buttonPrimary,
+      isDotted,
       items: defaultItems,
     },
     {
       title: 'Фермерские продукты',
       image,
       button: buttonPrimary,
+      isDotted,
       items: defaultItems,
     },
     {
       title: '«Моя выгода»',
       image,
       button: buttonPrimary,
+      isDotted,
       items: defaultItems,
     },
   ],

package/src/components/Gallery/Gallery.mobile.tsx

@@ -4,6 +4,7 @@ import type { ListOrientation } from '../../model/ListOrientation';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
+import { getListStyle } from '../../ui-kit/List/ListItem';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
 import type { GalleryCard } from './GalleryContent';
 import { GalleryItem } from './GalleryContent';
@@ -63,7 +64,7 @@ function renderCard(card: GalleryCard, key: number) {
         ) : null}
         {card.title ? <h3 className={`font-medium text-m-title-xs m-0`}>{card.title}</h3> : null}
         {card.description ? renderDescription(card) : null}
-        {card.items?.length ? renderItems(card.items, card.version) : null}
+        {card.items?.length ? renderItems(card.items, card.version, card.isDotted) : null}
       </div>
       {card?.button?.text ? renderButton(card.button) : null}
     </div>
@@ -92,11 +93,12 @@ function renderDescription(card: GalleryCard) {
   );
 }
 
-function renderItems(items: GalleryItem[], version: BlockVersion = 'primary') {
+function renderItems(items: GalleryItem[], version: BlockVersion = 'primary', isDotted) {
   return (
     <section className="mt-3">
       {items.map((item, i) => (
         <div key={String(i)}>
+          {isDotted && <div className={getListStyle(version)} />}
           <span className="text-m-md font-medium">{item.title}</span>
           <span className={`text-m-sm pl-2 ${version === 'primary' ? 'text-secondary-text' : ''}`}>
             {item.text}

package/src/components/Gallery/GalleryCardInner.tsx

@@ -6,7 +6,7 @@ import { List } from '../../ui-kit/List/List';
 import type { GalleryCard, GalleryItem } from './GalleryContent';
 
 export const GalleryCardInner = JSX<GalleryCard>(
-  ({ title, description, image, items, button, version }) => {
+  ({ title, description, image, items, button, version, isDotted = true }) => {
     const titleStyleClasses = getTitleStyle(version);
     return (
       <div className="h-full flex flex-col justify-between text-center">
@@ -20,7 +20,7 @@ export const GalleryCardInner = JSX<GalleryCard>(
           {description ? (
             <div className={`font-light text-m-md-new ${title ? 'mt-2' : ''}`}>{description}</div>
           ) : null}
-          {items?.length ? renderItems(items, version) : null}
+          {items?.length ? renderItems(items, version, isDotted) : null}
         </div>
         {button?.text ? renderButton(button) : null}
       </div>
@@ -42,7 +42,7 @@ function renderCardTitle(title: string, className: string) {
   return <div className={`text-xl m-0 ${className}`}>{title}</div>;
 }
 
-function renderItems(items: GalleryItem[], version: BlockVersion = 'primary') {
+function renderItems(items: GalleryItem[], version: BlockVersion = 'primary', isDotted: boolean) {
   return (
     <List
       className={`max-w-[308px] mt-2 text-sm ${
@@ -50,6 +50,7 @@ function renderItems(items: GalleryItem[], version: BlockVersion = 'primary') {
       }`}
       itemClassName="mt-1 first:mt-0"
       items={items.filter((item) => item?.text).map((item) => item.text as string)}
+      isDotted={isDotted}
       version={version}
     />
   );

package/src/components/Gallery/GalleryContent.ts

@@ -34,6 +34,11 @@ export interface GalleryCard {
   image?: Picture;
   /** @title Кнопка */
   button?: ButtonWithIconProps;
+  /**
+   * @title Буллиты
+   * @default true
+   */
+  isDotted?: boolean;
   /** @title Список */
   items?: GalleryItem[];
   version?: BlockVersion;

package/src/components/OtherProducts/OtherProductsContent.ts

@@ -4,7 +4,7 @@ import type { BlockDef, ColumnsCount } from '../../ui-kit/BlocksList/BlocksListP
 /**
  * @title Элемент списка
  */
-export interface blockItemCommonProps {
+export interface BlockItemCommonProps {
   /**
    * @title Название
    * @default Список
@@ -29,6 +29,6 @@ export interface OtherProductsContent {
    * @title Список
    * @maxItems 10
    */
-  blockItems?: blockItemCommonProps[];
+  blockItems?: BlockItemCommonProps[];
   colorPalette?: ColorPalette;
 }

package/src/components/OtherProducts/OtherProductsItem.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useActiveHandler } from './useActiveHandler';
 import type { UniBlockProps } from '../../types';
-import type { blockItemCommonProps } from './OtherProductsContent';
 import { Icon } from '../../ui-kit/Icon/Icon';
+import type { BlockItemCommonProps } from './OtherProductsContent';
 import { OtherProductsItemInner } from './OtherProductsItemInner';
+import { useActiveHandler } from './useActiveHandler';
 
-export interface BlockItemProps extends blockItemCommonProps, UniBlockProps {}
+export interface BlockItemProps extends BlockItemCommonProps, UniBlockProps {}
 
 export const OtherProductsItem = JSX<BlockItemProps>(
   ({ label, isExpanded, blocks, columns, context }) => {

package/src/components/ProductBlock/ProductBlockContent.ts

@@ -1,11 +1,11 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { IconVersion } from '../../model/IconVersion';
 import type { LinkProps } from '../../model/LinkProps';
 import type { ButtonContent, ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { DescriptionContent } from '../../ui-kit/Description/DescriptionContent';
 import type { HeadingContent, HeadingTypeContent } from '../../ui-kit/Heading/HeadingContent';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
-import type { IconVersion } from '../../model/IconVersion';
 import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 
 export type BenefitItemProps = {

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -2,9 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { Description } from '../../ui-kit/Description/Description';
+import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
-import { Heading } from '../../ui-kit/Heading/Heading';
 import { BaseTile } from '../BaseTile/BaseTile';
 import type { ProductBlockInnerContent } from './ProductBlockContent';
 import { renderBenefit } from './renderBenefit';

package/src/index.ts

@@ -1,34 +1,8 @@
 export { setup } from '@redneckz/uni-jsx';
 export { DaDataAPI } from './api/DaDataAPI';
 export { LikeAPI } from './api/LikeAPI';
-export type { BlockContent } from './components/BlockContent';
 export { Blocks } from './components/Blocks';
 export { ContentPage } from './components/ContentPage/ContentPage';
-export type { BlockDecorator } from './components/ContentPage/ContentPage';
-export type {
-  AsyncDataHook,
-  ContentPageContext,
-  GeolocationHook,
-  HandlerDecorator,
-  LikeService,
-  Router,
-  Search,
-} from './components/ContentPage/ContentPageContext';
-export { ContentPageHead } from './components/ContentPage/ContentPageHead';
-export { normalizePage } from './components/ContentPage/normalizePage';
-export { Header } from './components/Header/Header';
-export type { Img, ImgSource, Picture } from './model/Picture';
 export { projectSettings } from './ProjectSettings';
-export type { ProjectSettings } from './ProjectSettings';
-export type { SitemapProps as SitemapContent } from './services/sitemap/SitemapProps';
-export type {
-  BlockDef,
-  ContentPageDef,
-  ContentPageMeta,
-  Slot,
-  SlotsMap,
-  UniBlockProps,
-} from './types';
-export { Icon } from './ui-kit/Icon/Icon';
 export { joinList } from './utils/joinList';
 export * as url from './utils/url';

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

@@ -38,7 +38,7 @@ export const ListItem = JSX<ListItemProps>(
   },
 );
 
-const getListStyle = (version: ListItemVersion) => {
+export const getListStyle = (version: ListItemVersion) => {
   const size = {
     primary: 'w-2 h-2 min-w-2 min-h-2',
     secondary: 'w-2 h-2 min-w-2 min-h-2',