@redneckz/wildless-cms-uni-blocks 0.6.32 → 0.6.34

package/src/components/ContactsBlock/ContactsBlock.tsx

@@ -4,7 +4,7 @@ import { VersionStyleMap } from '../../model/BlockVersion';
 import { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
-import { Description } from '../../ui-kit/Description/Description';
+import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { Headline } from '../Headline/Headline';
 import type { ContactBlockProps, ContactsBlockContent } from './ContactsBlockContent';
 
@@ -17,14 +17,12 @@ interface RenderContactsColumnProps {
 }
 
 export const ContactsBlock = JSX<ContactsBlockProps>(
-  ({ className = '', contacts, info, version = 'secondary', ...rest }) => {
-    return (
-      <BlockWrapper className={`${VersionStyleMap[version]} flex p-[50px] ${className}`} {...rest}>
-        {info?.length ? renderBlocks(info, version) : null}
-        {contacts?.length ? renderBlocks(contacts, version) : null}
-      </BlockWrapper>
-    );
-  },
+  ({ className = '', contacts, info, version = 'secondary', ...rest }) => (
+    <BlockWrapper className={`${VersionStyleMap[version]} flex p-[50px] ${className}`} {...rest}>
+      {info?.length ? renderBlocks(info, version) : null}
+      {contacts?.length ? renderBlocks(contacts, version) : null}
+    </BlockWrapper>
+  ),
 );
 
 const renderBlocks = (info: ContactBlockProps[][], version?: BlockVersion) => (
@@ -47,10 +45,9 @@ const renderBlocksColumn = ({ column, index, version }: RenderContactsColumnProp
             bgColorHeadline={version}
           />
           {additionalDescription ? (
-            <Description
-              className="text-m-light mt-1.5 opacity-80"
-              description={additionalDescription}
-            />
+            <div className="mt-1.5 opacity-80">
+              <Paragraph size="text-m-light">{additionalDescription}</Paragraph>
+            </div>
           ) : null}
           {button ? <Button className="mt-6" {...button} /> : null}
         </div>

package/src/components/ContentPage/ContentPage.fixture.mobile.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 
 import type { ContentPageDef } from '../../model/ContentPageDef';
 import { Blocks } from '../Blocks';

package/src/components/ContentPage/ContentPage.fixture.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 
 import type { BlockDecorator } from '../../model/BlockDecorator';
 import type { ContentPageDef } from '../../model/ContentPageDef';

package/src/components/ContentPage/ContentPage.tsx

@@ -1,13 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
+import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
+import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
 import type { BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { ContentPageDef } from '../../model/ContentPageDef';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
 import { style2className } from '../../utils/style2className';
 import { LikeControl } from '../LikeControl/LikeControl';
-import { RenderBlockOptions } from './renderBlock';
-import { renderBlocksList } from './renderBlockList';
-import { renderSlots } from './renderSlots';
 
 interface ContentPageProps extends UniBlockProps {
   blocksRegistry: BlocksRegistry;
@@ -15,39 +14,41 @@ interface ContentPageProps extends UniBlockProps {
   blockDecorator?: BlockDecorator;
 }
 
-const defaultBlockDecorator: BlockDecorator = ({ blockClassName, block, render }) =>
-  render({ blockClassName, block });
-
 export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((props) => {
   const { className = '', blocksRegistry, blockDecorator, data = {} } = props;
 
   const { style: pageStyle, blocks, slots, likeControl, colorPalette = 'pc' } = data;
 
-  const options: RenderBlockOptions = {
+  const options: BlockRendererOptions = {
     key: '',
-    blocksRegistry,
     page: data,
-    blockDecorator: blockDecorator || defaultBlockDecorator,
+    blocksRegistry,
+    blockDecorator,
+    parent: data,
   };
 
-  const pageSlots = renderSlots({ slots, parent: data, options });
-
   return (
     <section
       className={`relative ${style2className(pageStyle)} ${className}`}
       data-theme={colorPalette}
     >
-      {pageSlots?.header ? (
-        <div className="mb-5 shadow-[0_8px_32px_0px_#00000014]">{pageSlots.header}</div>
-      ) : null}
-
-      {blocks?.length ? (
-        <div className="container grid grid-cols-12 gap-1">
-          {renderBlocksList({ blocks, parent: data, options })}
-          {pageSlots?.footer ? pageSlots.footer : null}
+      {slots?.header ? (
+        <div className="mb-5 shadow-[0_8px_32px_0px_#00000014]">
+          {renderBlocksList(slots?.header, {
+            ...options,
+            slotName: 'header',
+          })}
         </div>
       ) : null}
-
+      <div className="container grid grid-cols-12 gap-1">
+        {renderBlocksList(blocks, options)}
+        {slots?.footer
+          ? renderBlocksList(slots?.footer, {
+              ...options,
+              slotName: 'footer',
+            })
+          : null}
+      </div>
       {likeControl ? renderLikeControl() : null}
     </section>
   );

package/src/components/ErrorBlock/ErrorBlock.fixture.tsx

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { ErrorBlock } from './ErrorBlock';
 

package/src/components/ExchangeRateTile/CurrencyTable.tsx

@@ -15,20 +15,18 @@ interface CurrencyTableProps {
   exchangeCurrencyItems: ExchangeCurrencyItem[];
 }
 
-export const CurrencyTable = JSX<CurrencyTableProps>(({ className, exchangeCurrencyItems }) => {
-  return (
-    <table className={`h-fit w-fit ${className}`}>
-      <thead>
-        <tr>
-          <th className={TABLE_HEAD_STYLE}>Валюта</th>
-          <th className={`${TABLE_HEAD_STYLE} pl-11`}>Купить</th>
-          <th className={`${TABLE_HEAD_STYLE} pl-11`}>Продать</th>
-        </tr>
-      </thead>
-      <tbody>{exchangeCurrencyItems.map((item) => renderCurrencyRow(item))}</tbody>
-    </table>
-  );
-});
+export const CurrencyTable = JSX<CurrencyTableProps>(({ className, exchangeCurrencyItems }) => (
+  <table className={`h-fit w-fit ${className}`}>
+    <thead>
+      <tr>
+        <th className={TABLE_HEAD_STYLE}>Валюта</th>
+        <th className={`${TABLE_HEAD_STYLE} pl-11`}>Купить</th>
+        <th className={`${TABLE_HEAD_STYLE} pl-11`}>Продать</th>
+      </tr>
+    </thead>
+    <tbody>{exchangeCurrencyItems.map(renderCurrencyRow)}</tbody>
+  </table>
+));
 
 const renderCurrencyRow = (exchangeCurrencyItem: ExchangeCurrencyItem) => {
   const currency = exchangeCurrencyItem?.currency?.currency;

package/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { Button } from '../../ui-kit/Button/Button';
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { calculateResult, formatValue } from './calculateResult';
@@ -38,9 +38,10 @@ export const ExchangeCurrencyCalculator = JSX<ExchangeCurrencyCalculatorProps>(
       selectBuy: currencyRatesSell?.[0]?.currency?.currency || Currency.USD,
     });
 
-    const handleSetCalcState = (newState: Partial<CalcState>) => {
-      setCalcState((oldState) => ({ ...oldState, ...newState }));
-    };
+    const handleSetCalcState = useCallback(
+      (newState: Partial<CalcState>) => setCalcState((oldState) => ({ ...oldState, ...newState })),
+      [],
+    );
 
     return (
       <div className={`grid gap-[18px] pt-2 ${className}`}>

package/src/components/ExchangeRateTile/ExchangeRateTile.fixture.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 
 import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { ExchangeRateTile } from './ExchangeRateTile';

package/src/components/Footer/Footer.fixture.mobile.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import { Footer } from './Footer';
 
 export default {

package/src/components/Footer/Footer.fixture.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import { Footer } from './Footer';
 
 export default {

package/src/components/Footer/Footer.mobile.tsx

@@ -21,7 +21,7 @@ import { TextInformation } from './TextInformation';
 export interface FooterProps extends FooterContent, UniBlockProps {}
 
 export const Footer = JSX<FooterProps>(({ className = '', ...rest }) => {
-  const fallback = rest.page?.fallback;
+  const fallback = rest.options?.page?.fallback;
 
   const sitemap = useSWRResource<SitemapDataProps>(projectSettings.SITEMAP || 'sitemap', fallback);
   const { documents, relatedEnterprises, contacts, socialMedia, horizontalNavigationTitle } =
@@ -32,8 +32,8 @@ export const Footer = JSX<FooterProps>(({ className = '', ...rest }) => {
       <Contacts className="overflow-hidden" items={contacts} hasButton />
       <AccordionItemsList>
         {sitemap.topItems?.map((item, i) => (
-          <AccordionItem key={String(i)} label={item.text} {...rest}>
-            <LinkList documents={item.items} {...rest} />
+          <AccordionItem key={String(i)} label={item.text}>
+            <LinkList documents={item.items} />
           </AccordionItem>
         ))}
       </AccordionItemsList>

package/src/components/Footer/Footer.tsx

@@ -18,7 +18,7 @@ const LEFT_COL_WIDTH_FULL_HD = 'w-[204px]';
 export interface FooterProps extends FooterContent, UniBlockProps {}
 
 export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
-  const fallback = rest.page?.fallback;
+  const fallback = rest.options?.page?.fallback;
 
   const { documents, relatedEnterprises, contacts, socialMedia, mobileApps, topItems } =
     useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);

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

@@ -1,6 +1,6 @@
 import type { ListOrientation } from '../../model/ListOrientation';
 import type { Picture } from '../../model/Picture';
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Gallery } from './Gallery';
 import type { GalleryCardProps } from './GalleryContent';

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

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Gallery } from './Gallery';
 import type { GalleryProps } from './GalleryProps';

package/src/components/Gallery/GalleryCardInner.tsx

@@ -5,9 +5,9 @@ import type { Picture } from '../../model/Picture';
 import { renderButton } from '../../ui-kit/Button/ButtonSection';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
+import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { HEADLINE_SMALL_VERSION } from '../Headline/constants';
 import type { GalleryCardProps, GalleryItemProps } from './GalleryContent';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
 
 export const GalleryCardInner = JSX<GalleryCardProps>(
   ({
@@ -21,20 +21,18 @@ export const GalleryCardInner = JSX<GalleryCardProps>(
     version,
     isDotted = true,
     align = 'center',
-  }) => {
-    return (
-      <div className={`h-full flex flex-col justify-between ${AlignText[align]}`}>
-        <div className="flex flex-col h-full">
-          {renderImage(icon, version)}
-          {renderCardTitle(headlineSmallVersion, title)}
-          {renderDescription(description, title)}
-          {items?.length ? renderItems(items, isDotted, version) : null}
-          {renderAdditionalDescription(additionalDescription)}
-        </div>
-        {button?.text ? renderButton({ button, buttonClassName: 'mt-6' }) : null}
+  }) => (
+    <div className={`h-full flex flex-col justify-between ${AlignText[align]}`}>
+      <div className="flex flex-col h-full">
+        {renderImage(icon, version)}
+        {renderCardTitle(headlineSmallVersion, title)}
+        {renderDescription(description, title)}
+        {items?.length ? renderItems(items, isDotted, version) : null}
+        {renderAdditionalDescription(additionalDescription)}
       </div>
-    );
-  },
+      {button?.text ? renderButton({ button, buttonClassName: 'mt-6' }) : null}
+    </div>
+  ),
 );
 
 const renderImage = (image?: Picture, version?: BlockVersion) => (

package/src/components/Gallery/GalleryContainer.tsx

@@ -8,7 +8,7 @@ import type { GalleryCardProps } from './GalleryContent';
 import type { GalleryInnerProps } from './GalleryInner';
 
 export interface GalleryContainerProps extends GalleryInnerProps {
-  activeCardIndex: number;
+  activeIndex: number;
 }
 
 export interface GalleryCardData {
@@ -17,22 +17,20 @@ export interface GalleryCardData {
 }
 
 export const GalleryContainer = JSX<GalleryContainerProps>(
-  ({ headlineVersion = 'M', cards = [], version = 'normal', activeCardIndex, ...rest }) => {
-    return (
-      <div>
-        <Headline {...rest} className="!p-0" headlineVersion={headlineVersion} align="center" />
-        <div
-          className={`flex mt-8 ${
-            cards?.length <= galleryLengthForScrollMap[version] ? 'justify-center' : ''
-          } duration-1000`}
-          style={{ transform: `translateX(-${activeCardIndex * cardWidthMap[version]}px)` }}
-          role="list"
-        >
-          {cards?.map((card, i) => renderCard({ card, version }, i))}
-        </div>
+  ({ headlineVersion = 'M', cards = [], version = 'normal', activeIndex, ...rest }) => (
+    <div>
+      <Headline {...rest} className="!p-0" headlineVersion={headlineVersion} align="center" />
+      <div
+        className={`flex mt-8 ${
+          cards?.length <= galleryLengthForScrollMap[version] ? 'justify-center' : ''
+        } duration-1000`}
+        style={{ transform: `translateX(-${activeIndex * cardWidthMap[version]}px)` }}
+        role="list"
+      >
+        {cards?.map((card, i) => renderCard({ card, version }, i))}
       </div>
-    );
-  },
+    </div>
+  ),
 );
 
 function renderCard({ card, version }: GalleryCardData, i: number) {

package/src/components/Gallery/GalleryInner.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCarouselControls } from '../../hooks/useCarouselControls';
 import type { GalleryVersion } from '../../model/GalleryVersion';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -15,37 +15,24 @@ export interface GalleryInnerProps extends GalleryContent, UniBlockProps {
 
 export const GalleryInner = JSX<GalleryInnerProps>(
   ({ cards = [], className = '', version = 'normal', button, ...rest }) => {
-    const [activeCardIndex, setActiveCardIndex] = useState(0);
-
-    const handleNextClick = () => setActiveCardIndex(activeCardIndex + 1);
-    const handlePrevClick = () => setActiveCardIndex(activeCardIndex - 1);
-
-    const isGalleryScrollAvailable = cards?.length > galleryLengthForScrollMap[version];
-
-    const showNextButton =
-      isGalleryScrollAvailable &&
-      cards?.length - activeCardIndex > galleryLengthForScrollMap[version];
-
-    const showPrevButton = isGalleryScrollAvailable && activeCardIndex > 0;
+    const [activeIndex, controls] = useCarouselControls({
+      itemCount: cards?.length,
+      visibleItemCount: galleryLengthForScrollMap[version],
+    });
+    const { isScrollAvailable } = controls;
 
     return (
       <BlockWrapper
         className={`relative font-sans text-primary-text bg-white p-[42px] overflow-hidden flex flex-col ${className}`}
         {...rest}
       >
-        <GalleryContainer
-          cards={cards}
-          version={version}
-          activeCardIndex={activeCardIndex}
-          {...rest}
-        />
+        <GalleryContainer cards={cards} version={version} activeIndex={activeIndex} {...rest} />
         {renderArrows({
-          handler: [handlePrevClick, handleNextClick],
-          isShown: [showPrevButton, showNextButton],
+          ...controls,
           btnClass: ['left-8', 'right-8'],
           className: 'top-1/2',
         })}
-        {isGalleryScrollAvailable ? (
+        {isScrollAvailable ? (
           <div>
             <div className="absolute top-0 left-0 bottom-0 w-[82px] bg-opacity-from-white" />
             <div className="absolute top-0 right-0 bottom-0 w-[82px] bg-opacity-to-white" />

package/src/components/GracePeriod/GracePeriod.fixture.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
 import { GracePeriod } from './GracePeriod';

package/src/components/Header/Header.fixture.mobile.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import { Header } from './Header.mobile';
 
 export default {

package/src/components/Header/Header.fixture.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import { Header } from './Header';
 
 export default {

package/src/components/Header/Header.mobile.tsx

@@ -21,8 +21,7 @@ export interface HeaderProps extends HeaderContent, UniBlockProps {}
 export const Header = JSX<HeaderProps>(({ className = '', bgColor = 'bg-white', ...rest }) => {
   const router = useRouter();
 
-  const { page } = rest;
-  const fallback: Fallback | undefined = page?.fallback;
+  const fallback: Fallback | undefined = rest.options?.page?.fallback;
   const { topItems, dispositions, defaultLocation } = useSWRResource<SitemapDataProps>(
     projectSettings.SITEMAP || 'sitemap',
     fallback,
@@ -62,8 +61,8 @@ export const Header = JSX<HeaderProps>(({ className = '', bgColor = 'bg-white',
         >
           <AccordionItemsList>
             {topItems?.map((item, i) => (
-              <AccordionItem key={String(i)} label={item.text} {...rest}>
-                <LinkList documents={item.items} {...rest} />
+              <AccordionItem key={String(i)} label={item.text}>
+                <LinkList documents={item.items} />
               </AccordionItem>
             ))}
           </AccordionItemsList>

package/src/components/Header/Header.tsx

@@ -27,7 +27,7 @@ export const Header = JSX<HeaderProps>(
 
     const { topItems, logo, defaultLocation } = useSWRResource<SitemapDataProps>(
       projectSettings.SITEMAP || 'sitemap',
-      rest.page?.fallback,
+      rest.options?.page?.fallback,
     );
 
     const activeTopItem = showSubMenu ? getActiveItem(topItems, router) : null;

package/src/components/Headline/Headline.fixture.mobile.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
 import { Headline } from './Headline';

package/src/components/Headline/Headline.fixture.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 
 import { Headline } from './Headline';
 import type { HeadlineContent } from './HeadlineContent';

package/src/components/Headline/Headline.tsx

@@ -2,7 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { AlignText } from '../../model/AlignText';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { Description } from '../../ui-kit/Description/Description';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { HEADLINE_BLOCK_STYLE_MAPS, HEADLINE_VERSION } from './constants';
 import type { HeadlineContent } from './HeadlineContent';
@@ -37,10 +36,9 @@ export const Headline = JSX<HeadlineProps>(
           />
         ) : null}
         {description ? (
-          <Description
-            className={`${SIZE_MAPS.descriptionFont} ${STYLE_MAPS.text} ${AlignText[align]}`}
-            description={description}
-          />
+          <p className={`${SIZE_MAPS.descriptionFont} ${STYLE_MAPS.text} ${AlignText[align]}`}>
+            {description}
+          </p>
         ) : null}
       </BlockWrapper>
     );

package/src/components/InsuranceAmountBlock/InsuranceAmountBlock.fixture.tsx

@@ -1,4 +1,4 @@
-import '../../react/setup-fixture';
+import '../../setup-fixture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { InsuranceAmountBlock } from './InsuranceAmountBlock';