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

package/mobile/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/mobile/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/mobile/src/ui-kit/SearchBar/SearchBar.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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/package.json

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

package/src/api/DaDataAPI.ts

@@ -21,9 +21,11 @@ export function DaDataAPI(baseURL = '') {
       });
 
       const data = (await response.json()) as DaDataResult;
+
       return data?.suggestions?.[0]?.data?.city;
     } catch (e) {
       console.error(e);
+
       return null;
     }
   }

package/src/api/LikeAPI.ts

@@ -37,6 +37,7 @@ export function LikeAPI(projectId: string, baseURL = '') {
       return likes || [];
     } catch (e) {
       console.error(e);
+
       return [];
     }
   }
@@ -67,6 +68,7 @@ export function LikeAPI(projectId: string, baseURL = '') {
       return likes || 0;
     } catch (e) {
       console.error(e);
+
       return 0;
     }
   }
@@ -100,6 +102,7 @@ export function LikeAPI(projectId: string, baseURL = '') {
       return likes || 0;
     } catch (e) {
       console.error(e);
+
       return 0;
     }
   }
@@ -133,6 +136,7 @@ export function LikeAPI(projectId: string, baseURL = '') {
       return { token, name } as UserData;
     } catch (e) {
       console.error(e);
+
       return {} as UserData;
     }
   }

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

@@ -1,16 +1,14 @@
 import { context } from '../../react/setup-fixture';
-import { HEADLINE } from '../Headline/Headline.fixture';
-import { linkDocsContentExample } from '../LinkDocs/linkDocsContentExample';
-import { PICTURE_TEXT } from '../PictureText/PictureText.fixture';
-import { TEXT_BLOCK } from '../TextBlock/TextBlock.fixture';
-import type { AccordionProps } from './Accordion';
-import { Accordion } from './Accordion';
 import type {
   HeadlineBlockListDef,
   LinkDocsBlockListDef,
-  PictureTextBlockListDef,
   TextBlockBlockListDef,
 } from '../../ui-kit/BlocksList/BlocksListProps';
+import { HEADLINE } from '../Headline/Headline.fixture';
+import { linkDocsContentExample } from '../LinkDocs/linkDocsContentExample';
+import { TEXT_BLOCK } from '../TextBlock/TextBlock.fixture';
+import type { AccordionProps } from './Accordion';
+import { Accordion } from './Accordion';
 
 const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockBlockListDef = {
   blockListType: 'TextBlock',
@@ -22,11 +20,6 @@ const HEADLINE_ACCORDION_BLOCK: HeadlineBlockListDef = {
   ...HEADLINE,
 };
 
-const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextBlockListDef = {
-  blockListType: 'PictureText',
-  ...PICTURE_TEXT,
-};
-
 const LINK_DOCS_ACCORDION_BLOCK: LinkDocsBlockListDef = {
   blockListType: 'LinkDocs',
   ...linkDocsContentExample,
@@ -41,21 +34,17 @@ const propsTextBlock: AccordionProps = {
   accordionItems: [
     {
       label: 'Accordion label 1',
-      blocks: [TEXT_BLOCK_ACCORDION_BLOCK, TEXT_BLOCK_ACCORDION_BLOCK],
-    },
-    {
-      label: 'Accordion label 2',
       labelIcon: {
         icon: 'CardIcon',
       },
-      blocks: [PICTURE_TEXT_ACCORDION_BLOCK],
+      blocks: [TEXT_BLOCK_ACCORDION_BLOCK, TEXT_BLOCK_ACCORDION_BLOCK],
     },
     {
-      label: 'Accordion label 3',
+      label: 'Accordion label 2',
       blocks: [HEADLINE_ACCORDION_BLOCK],
     },
     {
-      label: 'Accordion label 4',
+      label: 'Accordion label 3',
       blocks: [LINK_DOCS_ACCORDION_BLOCK],
     },
   ],

package/src/components/Accordion/Accordion.fixture.tsx

@@ -22,42 +22,50 @@ import { Accordion } from './Accordion';
 
 const TEXT_BLOCK_ACCORDION_BLOCK: TextBlockBlockListDef = {
   blockListType: 'TextBlock',
+  style: ['col-span-12'],
   ...TEXT_BLOCK,
 };
 
 const HEADLINE_ACCORDION_BLOCK: HeadlineBlockListDef = {
   blockListType: 'Headline',
+  style: ['col-span-12'],
   ...HEADLINE,
 };
 
 const PICTURE_TEXT_ACCORDION_BLOCK: PictureTextBlockListDef = {
   blockListType: 'PictureText',
+  style: ['col-span-12'],
   ...PICTURE_TEXT,
 };
 
 const LINK_DOCS_ACCORDION_BLOCK: LinkDocsBlockListDef = {
   blockListType: 'LinkDocs',
+  style: ['col-span-12'],
   ...linkDocsContentExample,
   title: '',
 };
 
 const TILES_ACCORDION_BLOCK: TileBlockListDef = {
   blockListType: 'Tile',
+  style: ['col-span-6'],
   ...TILE,
 };
 
 const PRODUCT_TILES_ACCORDION_BLOCK: ProductTileBlockListDef = {
   blockListType: 'ProductTile',
+  style: ['col-span-6'],
   ...PRODUCT_TILE,
 };
 
 const GALLERY_ACCORDION_BLOCK: GalleryBlockListDef = {
   blockListType: 'Gallery',
+  style: ['col-span-12'],
   ...GALLERY,
 };
 
 const MINI_GALLERY_ACCORDION_BLOCK: MiniGalleryBlockListDef = {
   blockListType: 'MiniGallery',
+  style: ['col-span-12'],
   ...MINI_GALLERY,
 };
 
@@ -84,11 +92,11 @@ const propsDefaultBlock: AccordionProps = {
     },
     {
       label: 'Accordion label 5',
-      blocks: [TILES_ACCORDION_BLOCK],
+      blocks: [TILES_ACCORDION_BLOCK, TILES_ACCORDION_BLOCK],
     },
     {
       label: 'Accordion label 6',
-      blocks: [PRODUCT_TILES_ACCORDION_BLOCK],
+      blocks: [PRODUCT_TILES_ACCORDION_BLOCK, PRODUCT_TILES_ACCORDION_BLOCK],
     },
     {
       label: 'Accordion label 7',

package/src/components/Accordion/Accordion.mobile.tsx

@@ -16,7 +16,7 @@ export const Accordion = JSX<AccordionProps>(
           <ul className="list-none m-0 p-0">
             {accordionItems.map((item, i) => (
               <AccordionItem
-                key={`AccordionItem${i}`}
+                key={`AccordionItem_${i}`}
                 {...item}
                 context={context}
                 bordered={bordered}

package/src/components/Accordion/AccordionItem.mobile.tsx

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
+import { Img } from '../../ui-kit/Img/Img';
 import type { AccordionItemCommonProps } from './AccordionContent';
 import { AccordionItemInner } from './AccordionItemInner';
-import { Img } from '../../ui-kit/Img/Img';
 import { useActiveHandler } from './useActiveHandler';
 
 export interface AccordionItemProps extends AccordionItemCommonProps, UniBlockProps {}
@@ -40,6 +40,6 @@ export const AccordionItem = JSX<AccordionItemProps>(
   },
 );
 
-function borderedLiClass(bordered) {
+function borderedLiClass(bordered?: boolean) {
   return bordered ? 'border p-4 rounded mb-4' : 'border-0 border-b last:border-b-0';
 }

package/src/components/Accordion/AccordionItemInner.mobile.tsx

@@ -1,12 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { AccordionItemProps } from './AccordionItem';
 import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
+import type { AccordionItemProps } from './AccordionItem';
 
 export const AccordionItemInner = JSX<AccordionItemProps>(({ blocks, context }) => {
-  const className = 'mb-5 last:mb-0 first:mt-2';
   return (
-    <div className="transition-all duration-300 max-h-0 overflow-hidden group-last:last:pb-0">
-      {renderBlocksList({ context, className, blocks })}
+    <div className="flex flex-wrap transition-all duration-300 max-h-0 overflow-hidden group-last:last:pb-0">
+      {renderBlocksList({ context, blocks, className: '!px-0' })}
     </div>
   );
 });

package/src/components/Accordion/AccordionItemInner.tsx

@@ -1,12 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { AccordionItemProps } from './AccordionItem';
 import { renderBlocksList } from '../../ui-kit/BlocksList/renderBlocksList';
+import type { AccordionItemProps } from './AccordionItem';
 
 export const AccordionItemInner = JSX<AccordionItemProps>(({ blocks, context }) => {
-  const className = 'mb-5 last:mb-0 pb-5';
   return (
-    <div className="transition-all duration-300 max-h-0 overflow-hidden">
-      {renderBlocksList({ context, className, blocks })}
+    <div className="grid grid-cols-12 transition-all duration-300 max-h-0 overflow-hidden">
+      {renderBlocksList({ context, blocks, className: '!p-0 mb-5' })}
     </div>
   );
 });

package/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -38,6 +38,7 @@ const renderBenefits = (benefits: BenefitItem[]) => {
 
 const renderStep = (benefit: BenefitItem, i: number) => {
   const description = benefit?.description || undefined;
+
   return (
     <div key={String(i)} className="flex items-center basis-1/2 max-w-[500px] mb-[46px]">
       {benefit?.icon ? (
@@ -61,6 +62,7 @@ const renderDescription = (description?: DescriptionType) => {
   if (!benefitType) {
     return null;
   }
+
   return description ? (
     <div className="font-light text-base text-secondary-text mt-2">
       {benefitType === 'list'
@@ -74,6 +76,7 @@ const renderTextBenefit = (description?: TextBenefitDef) => (description ? descr
 
 const renderListBenefit = (description?: ListBenefitDef) => {
   const listStyleType = description?.bullets ? 'list-disc pl-6' : '';
+
   return description?.items && description.items.length > 0 ? (
     <ul className={listStyleType}>
       {description.items.map((_, i) => (

package/src/components/Blocks.ts

@@ -1,12 +1,15 @@
 import { Accordion } from './Accordion/Accordion';
 import { BenefitsBlock } from './BenefitsBlock/BenefitsBlock';
 import { Bonus } from './Bonus/Bonus';
-import { ComparisonTable } from './ComparisonTable/ComparisonTable';
+import { BonusBenefitsBlock } from './BonusBenefitsBlock/BonusBenefitsBlock';
 import { Calculator } from './Calculator/Calculator';
+import { Catalog } from './Catalog/Catalog';
+import { ComparisonTable } from './ComparisonTable/ComparisonTable';
 import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
 import { Footer } from './Footer/Footer';
 import { Gallery } from './Gallery/Gallery';
 import { GracePeriod } from './GracePeriod/GracePeriod';
+import { GroupBlock } from './GroupBlock/GroupBlock';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
 import { Insurance } from './Insurance/Insurance';
@@ -28,8 +31,6 @@ import { StepsBlock } from './StepsBlock/StepsBlock';
 import { TariffsTable } from './TariffsTable/TariffsTable';
 import { TextBlock } from './TextBlock/TextBlock';
 import { Tile } from './Tile/Tile';
-import { GroupBlock } from './GroupBlock/GroupBlock';
-import { BonusBenefitsBlock } from './BonusBenefitsBlock/BonusBenefitsBlock';
 
 export const Blocks = {
   Accordion,
@@ -37,6 +38,7 @@ export const Blocks = {
   Bonus,
   ComparisonTable,
   Calculator,
+  Catalog,
   ExchangeRateTile,
   Footer,
   Gallery,

package/src/components/Calculator/getMonthlyPayment.ts

@@ -27,6 +27,7 @@ export const getMonthlyPayment = (params: GetMonthlyPaymentParams) => {
 
   if (paymentType === 'annuity') {
     const annuityCoef = Number(rate) / (MONTHS_IN_YEAR * 100);
+
     return finalSum * (annuityCoef + annuityCoef / (Math.pow(1 + annuityCoef, months) - 1));
   } else {
     return finalSum / months + finalSum * (Number(rate) / 12);

package/src/components/Calculator/renderCalculatorBlock.tsx

@@ -10,6 +10,7 @@ export const renderCalculatorBlock =
       return null;
     }
     const EmbeddedBlock: JSXBlock<EmbeddableCalcProps> = EmbeddableCalcBlocks[type];
+
     return (
       <section
         key={String(i)}

package/src/components/Calculator/renderMonthsInput.tsx

@@ -16,6 +16,7 @@ export function renderMonthsInput(props: RenderMonthsInputProps) {
   const { title, minMonths, maxMonths, monthsValue, defaultMonths, setMonthsValue } = props;
   const monthText = (month) => {
     const text = Number(month) % 10 === 1 ? 'месяца' : 'месяцев';
+
     return `${month} ${text}`;
   };
 

package/src/components/Calculator/renderRate.tsx

@@ -7,6 +7,7 @@ type rateType = {
 
 export function renderRate({ rate, title, sup, className = '' }: rateType) {
   const rateFormat = String(rate).replace('.', ',');
+
   return (
     <div>
       <div className="text-sm font-light ml-3">{title}</div>

package/src/components/Catalog/Catalog.example.json

@@ -0,0 +1,57 @@
+{
+  "title": "Каталог",
+  "description": "Описание",
+  "cards": [
+    {
+      "title": "Заголовок карточки 1",
+      "description": "Описание карточки",
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 230,
+          "height": 230
+        }
+      },
+      "button": {
+        "href": "",
+        "text": "Подробнее",
+        "target": "_blank",
+        "version": "primary"
+      }
+    },
+    {
+      "title": "Заголовок карточки 2",
+      "description": "Описание карточки",
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 230,
+          "height": 230
+        }
+      },
+      "button": {
+        "href": "",
+        "text": "Подробнее",
+        "target": "_blank",
+        "version": "primary"
+      }
+    },
+    {
+      "title": "Заголовок карточки 3",
+      "description": "Описание карточки",
+      "image": {
+        "format": "webp",
+        "size": {
+          "width": 230,
+          "height": 230
+        }
+      },
+      "button": {
+        "href": "",
+        "text": "Подробнее",
+        "target": "_blank",
+        "version": "primary"
+      }
+    }
+  ]
+}

package/src/components/Catalog/Catalog.fixture.tsx

@@ -0,0 +1,48 @@
+import type { Picture } from '../../model/Picture';
+import { context } from '../../react/setup-fixture';
+import type { ButtonCommonProps } from '../../ui-kit/Button/Button';
+import { Catalog, CatalogProps } from './Catalog';
+import type { CatalogProductColor } from './CatalogContent';
+
+const payRing: Picture = {
+  src: 'pay-ring.png',
+  format: 'webp',
+  size: {
+    width: 230,
+    height: 230,
+  },
+  title: 'pay-ring',
+};
+
+const colors: CatalogProductColor[] = ['black', 'white'];
+
+const buttonPrimary: ButtonCommonProps = {
+  href: '/credit-cards',
+  text: 'Подробнее',
+  target: '_blank',
+  version: 'primary',
+};
+
+const catalogCard = {
+  title: 'SATURN S-VI',
+  description: 'Керамическое кольцо с глянцевой поверхностью и огранкой по внешним контурам',
+  image: payRing,
+  price: 5600,
+  colors: colors,
+  button: buttonPrimary,
+};
+
+export const defaultProps: CatalogProps = {
+  context,
+  title: 'Каталог',
+  description: 'Описание',
+  cards: new Array(5).fill(catalogCard).flat(),
+};
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12">
+      <Catalog {...defaultProps} className="col-span-12" />
+    </div>
+  ),
+};

package/src/components/Catalog/Catalog.tsx

@@ -0,0 +1,73 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../types';
+import { renderArrows } from '../../ui-kit/Button/renderArrows';
+import { Description } from '../../ui-kit/Description/Description';
+import { Heading } from '../../ui-kit/Heading/Heading';
+import type { ContentPageContext } from '../ContentPage/ContentPageContext';
+import { CatalogCard } from './CatalogCard';
+import type { CatalogCardType, CatalogContent } from './CatalogContent';
+
+export interface CatalogProps extends CatalogContent, UniBlockProps {}
+
+const BLUR_BLOCK_CLASSES = 'absolute top-0 bottom-0 w-[84px]';
+const CARD_FULL_VIEW_COUNT = 3;
+const CARD_SHIFT = 430;
+
+export const Catalog = JSX<CatalogProps>(
+  ({ context, cards = [], className = '', title, description }) => {
+    const [activeCardIndex, setActiveCardIndex] = context.useState(0);
+
+    return (
+      <section
+        className={`bg-white relative font-sans p-9 overflow-hidden text-center ${className}`}
+      >
+        {title ? <Heading headingType="h2" className="mb-6" title={title} /> : null}
+        {description ? <Description className="mb-6" description={description} /> : null}
+        <div
+          className="flex duration-1000 gap-3.5"
+          style={{ transform: `translateX(-${activeCardIndex * CARD_SHIFT}px)` }}
+          role="list"
+        >
+          {cards?.length ? cards.map(renderCatalogCard(context)) : null}
+        </div>
+        {renderNavButtons({
+          cardsCount: cards.length,
+          activeCardIndex,
+          setActiveCardIndex,
+        })}
+        <div className={`${BLUR_BLOCK_CLASSES} left-0 ${'bg-opacity-from-white'}`} />
+        <div className={`${BLUR_BLOCK_CLASSES} right-0 ${'bg-opacity-to-white'}`} />
+      </section>
+    );
+  },
+);
+
+const renderCatalogCard = (context: ContentPageContext) => (card: CatalogCardType, i: number) => {
+  return <CatalogCard key={String(i)} context={context} {...card} />;
+};
+
+interface RenderNavButtonsProps {
+  cardsCount: number;
+  activeCardIndex: number;
+  setActiveCardIndex: (number) => void;
+}
+
+const renderNavButtons = ({
+  cardsCount,
+  activeCardIndex,
+  setActiveCardIndex,
+}: RenderNavButtonsProps) => {
+  const handleNextClick = () => setActiveCardIndex(activeCardIndex + 1);
+  const handlePrevClick = () => setActiveCardIndex(activeCardIndex - 1);
+
+  const isUseSlider = cardsCount > CARD_FULL_VIEW_COUNT;
+  const showNextButton = isUseSlider && cardsCount - activeCardIndex > CARD_FULL_VIEW_COUNT;
+  const showPrevButton = isUseSlider && activeCardIndex > 0;
+
+  return renderArrows({
+    handler: [handlePrevClick, handleNextClick],
+    isShown: [showPrevButton, showNextButton],
+    btnClass: ['left-8', 'right-8'],
+    className: 'top-1/2 z-10 mt-6',
+  });
+};