@redneckz/wildless-cms-uni-blocks 0.11.2 → 0.12.3

package/src/components/TextBlock/TextBlock.tsx

@@ -12,34 +12,29 @@ import type { TextBlockContent } from './TextBlockContent';
 export interface TextBlockProps extends TextBlockContent, UniBlockProps {}
 
 export const TextBlock = JSX<TextBlockProps>(
-  ({ className = '', title, description, iconVersion, image, __html, items = [], ...rest }) => {
-    return (
-      <BlockWrapper
-        className={style(
-          'px-9 py-4 flex gap-3 bg-white group-data-secondary:bg-primary-main/10',
-          className,
-        )}
-        {...rest}
-      >
-        {iconVersion === 'small' ? <div className="mt-1">{renderIcon()}</div> : null}
-        {iconVersion === 'big' ? renderImage(image) : null}
-        <div className="flex flex-col w-fit gap-3">
-          {title ? (
-            <Text
-              size="text-l"
-              font="font-medium"
-              color="text-primary-text group-data-secondary:text-white"
-            >
-              {title}
-            </Text>
-          ) : null}
-          {description ? renderDescription(description) : null}
-          {items?.length ? renderList(items, true) : null}
-          {__html ? <RichText __html={__html} /> : null}
-        </div>
-      </BlockWrapper>
-    );
-  },
+  ({ className = '', title, description, iconVersion, image, __html, items = [], ...rest }) => (
+    <BlockWrapper
+      className={style('flex gap-3 bg-white group-data-secondary:bg-primary-main/10', className)}
+      {...rest}
+    >
+      {iconVersion === 'small' ? <div className="mt-1">{renderIcon()}</div> : null}
+      {iconVersion === 'big' ? renderImage(image) : null}
+      <div className="flex flex-col w-fit gap-3">
+        {title ? (
+          <Text
+            size="text-l"
+            font="font-medium"
+            color="text-primary-text group-data-secondary:text-white"
+          >
+            {title}
+          </Text>
+        ) : null}
+        {description ? renderDescription(description) : null}
+        {items?.length ? renderList(items, true) : null}
+        {__html ? <RichText __html={__html} /> : null}
+      </div>
+    </BlockWrapper>
+  ),
 );
 
 const renderIcon = () => (

package/src/components/Tile/Tile.fixture.tsx

@@ -30,7 +30,6 @@ const image4: Picture = {
 
 export const TILE: TileContent = {
   title: 'Кредиты',
-  headingType: 'h4',
   isDotted: true,
   listItemSize: 'L',
   items: ['До 3 млн ₽', 'до 5 лет'],
@@ -46,7 +45,6 @@ export const TILE: TileContent = {
 
 export const TILE_PREMIUM: TileContent = {
   title: 'Премиальные продукты',
-  headingType: 'h4',
   __html:
     '<p>Выделенные зоны обслуживания и персональный финансовый консультант. <strong>Полный спектр</strong> премиальных продуктов, <u>подчеркивающих</u> ваш статус</p>',
   buttons: [
@@ -74,7 +72,6 @@ export default {
         version="secondary"
         className="col-span-4"
         title="Ипотека"
-        headingType="h4"
         items={[
           'Качественные фермерские продукты напрямую от производителей',
           'Самая большая база сельских туров по России',
@@ -97,7 +94,6 @@ export default {
       <Tile
         className="col-span-6"
         title="Банковские пластиковые карты"
-        headingType="h4"
         items={['Счета в разных валютах', 'Бесплатное обслуживание', 'Кэшбэк до 15% от покупок']}
         buttons={[
           {
@@ -121,7 +117,6 @@ export default {
       <Tile
         className="col-span-12 pr-28"
         title="Экосистема «СВОЕ», созданная для людей"
-        headingType="h4"
         items={[
           'Качественные фермерские продукты напрямую от производителей',
           'Самая большая база сельских туров по России',
@@ -147,7 +142,7 @@ export default {
   ),
   'direction left': (
     <div className="container grid grid-cols-12">
-      <Tile className="col-span-8" directionRight={false} {...TILE} />
+      <Tile className="col-span-8" imageOptions={{ directionRight: false }} {...TILE} />
     </div>
   ),
 };

package/src/components/Tile/Tile.tsx

@@ -1,75 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../model/JSXBlock';
+import { BaseProductTile } from '../../ui-kit/BaseProductTile/BaseProductTile';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
-import { Heading } from '../../ui-kit/Heading/Heading';
-import { Img } from '../../ui-kit/Img/Img';
-import { List } from '../../ui-kit/List/List';
-import { RichText } from '../../ui-kit/RichText/RichText';
-import { Tags } from '../../ui-kit/Tags/Tags';
-import { style } from '../../utils/style';
-import { BaseTile } from '../BaseTile/BaseTile';
-import { getTileMinHeight } from '../BaseTile/getTileMinHeight';
-import { getTileRightPadding } from '../BaseTile/getTileRightPadding';
 import type { TileContent } from './TileContent';
 
 export interface TileProps extends TileContent, UniBlockProps {}
 
 export const Tile = JSX<TileProps>(
-  ({
-    title,
-    headingType = 'h3',
-    __html,
-    items,
-    buttons,
-    image,
-    isDotted = true,
-    listItemSize = 'M',
-    className = '',
-    tags,
-    children,
-    directionRight = true,
-    ...rest
-  }) => (
-    <BlockWrapper
-      className={style(
-        'flex grow justify-between items-stretch h-full p-9 pr-3 box-border',
-        getTileRightPadding(className),
-        getTileMinHeight(className),
-        className,
-      )}
-      {...rest}
-    >
-      {image?.src ? (
-        <Img className={style('mt-auto ml-7', directionRight ? 'order-2' : '')} image={image} />
-      ) : null}
-      <BaseTile
-        title={
-          title ? (
-            <Heading
-              headingType={headingType}
-              as="h2"
-              title={title}
-              className={`whitespace-pre-wrap max-w-[600px]`}
-            />
-          ) : null
-        }
-        buttons={renderButtonsSection(buttons, {
-          className: 'mt-8',
-          buttonClassName: 'min-w-[158px]',
-        })}
-      >
-        <div>
-          {__html ? (
-            <div className="max-w-[600px] mt-2.5">
-              <RichText __html={__html} />
-            </div>
-          ) : null}
-          {children}
-          <List className="mt-2.5" items={items} isDotted={isDotted} listItemSize={listItemSize} />
-          {tags?.length ? <Tags tags={tags} className="mt-5" /> : null}
-        </div>
-      </BaseTile>
+  ({ className, headlineVersion = 'S', listItemSize = 'M', ...rest }) => (
+    <BlockWrapper className={className} {...rest}>
+      <BaseProductTile
+        className="h-full"
+        headlineVersion={headlineVersion}
+        listItemSize={listItemSize}
+        {...rest}
+        imageOptions={{ imageAlign: 'end', ...rest.imageOptions }}
+      />
     </BlockWrapper>
   ),
 );

package/src/components/Tile/TileContent.ts

@@ -1,25 +1,7 @@
-import type { BulletsProps } from '../../model/Bullets';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
-import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
-import type { ImageContent } from '../../ui-kit/Img/ImgProps';
-import type { ListContent } from '../../ui-kit/List/ListContent';
-import type { ListItemSize } from '../../ui-kit/List/ListProps';
-import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
-import type { TagsContent } from '../../ui-kit/Tags/TagsContent';
+import type { BaseProductTileContent } from '../../ui-kit/BaseProductTile/BaseProductTileContent';
 
 /**
  * @title Плитка
  */
-export type TileContent = UniBlockContent &
-  HeadingCommonProps &
-  RichTextProps &
-  ListContent &
-  ButtonContent &
-  TagsContent &
-  ImageContent &
-  BulletsProps & {
-    listItemSize?: ListItemSize;
-    /** @title Картинка справа/текст слева */
-    directionRight?: boolean;
-  };
+export type TileContent = UniBlockContent & BaseProductTileContent;

package/src/components/VerticalLayout/VerticalLayout.tsx

@@ -35,11 +35,11 @@ export const VerticalLayout: JSXBlock<VerticalLayoutProps> = JSX<VerticalLayoutP
         className={style(
           'relative',
           'flex flex-col [&>*]:max-w-full',
-          isPadding ? 'p-default' : '',
           gapStyles[gap],
           align && alignStyle[align],
           className,
         )}
+        defaultPadding={isPadding ? 'p-default' : ''}
         version={version}
         isTheme={isTheme}
         {...rest}

package/src/components/Video/Video.tsx

@@ -1,11 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useRouter } from '../../hooks/useRouter';
+import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { adjustHref } from '../../utils/adjustHref';
-import { style } from '../../utils/style';
 import { Headline } from '../Headline/Headline';
 import { getPaddings } from './getPaddings';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import type { VideoContent } from './VideoContent';
 
 interface VideoProps extends VideoContent, UniBlockProps {}
@@ -14,7 +13,7 @@ export const Video = JSX<VideoProps>(({ className, title, url, previewImg, ...re
   const router = useRouter();
 
   return (
-    <BlockWrapper className={style(getPaddings(className), className)} {...rest}>
+    <BlockWrapper className={className} defaultPadding={getPaddings(className)} {...rest}>
       <Headline title={title} headlineVersion="M" />
       {url ? (
         <video

package/src/content-page-repository/transformDocumentLink.ts

@@ -23,7 +23,7 @@ export async function transformDocumentLink(
   try {
     await copyFile(input, output);
   } catch (e) {
-    console.error(e);
+    console.info(`No "${input}" attachment found on page: "${pagePath}"`);
 
     return link;
   }

package/src/content-page-repository/transformImg.ts

@@ -57,7 +57,7 @@ export function transformImg(
         await chain.toFile(output);
       }
     } catch (e) {
-      console.error(e);
+      console.info(`No "${input}" attachment found on page: "${pagePath}"`);
     }
 
     return output;