@redneckz/wildless-cms-uni-blocks 0.3.31 → 0.3.32

package/mobile/src/components/PictureText/PictureText.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
 import type { PictureTextContent } from './PictureTextContent';
 
+import { BlockVersion } from '../../model/BlockVersion';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { Img } from '../../ui-kit/Img/Img';
@@ -9,18 +10,33 @@ import { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 
 export interface PictureTextProps extends PictureTextContent, UniBlockProps {}
 
+const pictureTextStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
+
 export const PictureText = JSX<PictureTextProps>(
-  ({ className = '', title, image, benefits, anchor = null }) => {
+  ({
+    className = '',
+    title,
+    image,
+    benefits,
+    version = 'primary',
+    directionRight = false,
+    anchor = null,
+  }) => {
     return (
       <section
-        className={`relative font-sans text-primary-text bg-white p-14 ${className}`}
+        className={`relative font-sans p-14 ${pictureTextStyleMap[version]} ${className}`}
         id={anchor}
       >
         <Heading headingType="h2" className="text-center" title={title} />
         <div className={'flex justify-center mt-9'}>
-          {image?.src && <Img className="mr-6" image={image} />}
+          {image?.src && <Img className={directionRight ? 'order-2 ml-6' : 'mr-6'} image={image} />}
           {benefits?.length ? (
-            <div className="flex flex-col">{benefits.map(renderBenefit)}</div>
+            <div className="flex flex-col">
+              {benefits.map((_, i) => renderBenefit(_, i, version))}
+            </div>
           ) : null}
         </div>
       </section>
@@ -28,7 +44,7 @@ export const PictureText = JSX<PictureTextProps>(
   },
 );
 
-function renderBenefit(benefit: Benefit, i: number) {
+function renderBenefit(benefit: Benefit, i: number, version: string) {
   return (
     <div key={String(i)} className="flex flex-row mb-8">
       {benefit.icon && (
@@ -42,10 +58,20 @@ function renderBenefit(benefit: Benefit, i: number) {
       )}
       <div className="flex gap-1 flex-col h-full ml-5 max-w-[490px]">
         {benefit.label && (
-          <div className="font-medium text-primary-text text-xl m-0">{benefit.label}</div>
+          <div
+            className={`font-medium text-xl m-0 ${
+              version === 'primary' ? 'text-primary-text' : ''
+            }`}
+          >
+            {benefit.label}
+          </div>
         )}
         {benefit.description && (
-          <div className="font-normal text-sm text-secondary-text">{benefit.description}</div>
+          <div
+            className={`font-normal text-sm ${version === 'primary' ? 'text-secondary-text' : ''}`}
+          >
+            {benefit.description}
+          </div>
         )}
       </div>
     </div>

package/mobile/src/components/PictureText/PictureTextContent.ts

@@ -1,3 +1,4 @@
+import { BlockVersion } from '../../model/BlockVersion';
 import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
@@ -8,6 +9,12 @@ export type TitleWithImageContent = HeadingContent & ImageContent;
  * @title Картинка с текстом
  */
 export interface PictureTextContent extends TitleWithImageContent {
+  version?: BlockVersion;
   /** @title Список преимуществ */
   benefits?: Benefit[];
+  /**
+   * @title Картинка справа/текст слева
+   * @default false
+   */
+  directionRight?: boolean;
 }

package/mobile/src/components/ProductGalleryGreen/ProductGalleryGreen.example.json

@@ -10,7 +10,8 @@
         "image": {
           "format": "webp",
           "size": {
-            "width": 280
+            "width": 608,
+            "height": 299
           }
         },
         "version": "primary",

package/mobile/src/components/ProductGalleryGreen/ProductGalleryGreen.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
+import type { BlockVersion } from '../../model/BlockVersion';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
 import { ProductBlockInner } from '../ProductBlock/ProductBlockInner';
@@ -7,23 +8,39 @@ import type { ProductGalleryGreenContent } from './ProductGalleryGreenContent';
 
 export interface ProductGalleryProps extends ProductGalleryGreenContent, UniBlockProps {}
 
+const productGalleryGreenStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
+
+const productBlockStyleMap: Record<BlockVersion, string> = {
+  primary: 'text-secondary-text',
+  secondary: 'text-white/80',
+};
+
+const productSlideStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
+
 export const ProductGalleryGreen = JSX<ProductGalleryProps>(
-  ({ className = '', context, slides = [], anchor = null }) => {
+  ({ className = '', context, slides = [], version = 'primary', duration = 0, anchor = null }) => {
     const galleryNav = slides.map((s) => s.nav);
     const galleryBlocks = slides.map((s) => s.productBlock);
     const [activeSlideIndex, setActiveSlideIndex] = context.useState(0);
 
     return (
       <section
-        className={`box-border pt-[70px] relative font-sans overflow-hidden bg-primary-main w-100 ${className}`}
         id={anchor}
+        className={`box-border pt-[70px] overflow-hidden relative font-sans w-100 ${className}
+        ${productGalleryGreenStyleMap[version]}`}
       >
         <div
           className="flex duration-1000 pb-14"
           style={{ transform: `translateX(-${activeSlideIndex}00%)` }}
           role="list"
         >
-          {galleryBlocks.map((_, i) => renderProductBlock(_, i, context))}
+          {galleryBlocks.map((_, i) => renderProductBlock({ ..._, version }, i, context))}
         </div>
 
         <div className="flex items-center absolute bottom-6 left-0 right-0 px-9 box-border">
@@ -33,6 +50,8 @@ export const ProductGalleryGreen = JSX<ProductGalleryProps>(
               i,
               activeSlideIndex,
               onClick: () => setActiveSlideIndex(i),
+              version,
+              duration,
             }),
           )}
         </div>
@@ -42,6 +61,9 @@ export const ProductGalleryGreen = JSX<ProductGalleryProps>(
 );
 
 function renderProductBlock(block: ProductBlockInnerContent, i: number, context) {
+  const { version } = block;
+  const additionalClass = version ? productBlockStyleMap[version] : '';
+
   return (
     <section
       key={String(i)}
@@ -55,10 +77,9 @@ function renderProductBlock(block: ProductBlockInnerContent, i: number, context)
           </div>
         ) : null}
         <ProductBlockInner
-          className="pl-2.5 pt-2.5 pb-1.5 pr-[6.25rem] z-[1]"
+          className={`pl-2.5 pt-2.5 pb-1.5 pr-[6.25rem] z-[1] ${additionalClass}`}
           context={context}
           textBlockClassName="mb-[154px]"
-          version="secondary"
           {...block}
         />
         <Icon
@@ -72,32 +93,34 @@ function renderProductBlock(block: ProductBlockInnerContent, i: number, context)
   );
 }
 
-function renderNavButton({ slide, i, activeSlideIndex, onClick }) {
+function renderNavButton({ slide, i, activeSlideIndex, onClick, version, duration }) {
   const isActiveBtn = i === activeSlideIndex;
   const btnClassName = isActiveBtn
-    ? 'bg-white shadow-dark-blue/42 h-[102px] w-[354px] min-w-[354px] max-w-[354px] p-0'
-    : 'bg-white/10 min-w-[277px] px-0 pt-4 pb-[23px] hover:pt-[21px] hover:pb-7 ease-in duration-300';
-  const btnTitleClassName = isActiveBtn
-    ? 'text-[18px] text-primary-text pb-[10px]'
-    : 'text-m-base text-white pb-[3px]';
-  const btnDescClassName = isActiveBtn
-    ? 'text-[18px] text-secondary-text'
-    : 'text-m-base text-white';
-
+    ? 'bg-white shadow-dark-blue/42 h-[102px] w-[354px] min-w-[354px] max-w-[354px] p-0 border-none'
+    : `min-w-[277px] px-0 pt-4 pb-[23px] hover:py-[26px] hover:py-[26px] ease-in duration-300 
+      ${productSlideStyleMap[version]}`;
+  const btnTitleClassName = isActiveBtn ? 'text-primary-text' : productBlockStyleMap[version];
+  const btnDescClassName = isActiveBtn ? 'text-secondary-text' : productBlockStyleMap[version];
+  const additionalBorder = version === 'secondary' ? 'border-white/50' : '';
+  const progressBarClassName = isActiveBtn ? 'animate-slide' : '';
   return (
     <button
       type="button"
       key={String(i)}
       onClick={onClick}
       aria-label={slide?.title}
-      className={`box-border font-sans group relative overflow-hidden border-white/50 border-[1px] cursor-pointer text-left mb-6a mx-1 grow basis-0 backdrop-blur-sm
-        ${btnClassName}
+      className={`box-border font-sans group relative overflow-hidden border-[1px] cursor-pointer text-left mx-1 grow basis-0 backdrop-blur-sm
+      ${btnClassName} ${additionalBorder}
       `}
     >
       <div className="border-0 px-6">
         <div className={`font-medium ${btnTitleClassName}`}>{slide?.title}</div>
         <div className={`text-secondary-text ${btnDescClassName}`}>{slide.description}</div>
       </div>
+      <div
+        className={`absolute bottom-0 left-0 w-full h-[3px] bg-primary-main -translate-x-full ${progressBarClassName}`}
+        style={{ animationDuration: `${duration}s`, animationFillMode: 'forwards' }}
+      ></div>
     </button>
   );
 }

package/mobile/src/components/ProductGalleryGreen/ProductGalleryGreenContent.ts

@@ -1,4 +1,5 @@
 import type { ProductBlockInnerContent } from '../ProductBlock/ProductBlockContent';
+import type { BlockVersion } from '../../model/BlockVersion';
 
 /** @title Кнопка под слайдом */
 interface ProductGalleryNav {
@@ -29,4 +30,5 @@ export interface ProductGalleryGreenContent {
   duration?: number;
   /** @title Слайды */
   slides?: ProductSlide[];
+  version?: BlockVersion;
 }

package/mobile/src/components/Recommendation/Recommendation.tsx

@@ -24,7 +24,7 @@ export const Recommendation = JSX<RecommendationProps>(
         className={`relative font-sans p-[50px] overflow-hidden ${blockClassName} ${className}`}
         id={anchor}
       >
-        {title ? <Heading headingType="h3" className="mb-8" title={title} /> : null}
+        {title ? <Heading headingType="h2" className="mb-8" title={title} /> : null}
         <div
           className="flex duration-1000 gap-4"
           style={{ transform: `translateX(-${activeCardIndex * CARD_SHIFT}px)` }}

package/mobile/src/components/Recommendation/RecommendationCard.tsx

@@ -25,7 +25,7 @@ export const RecommendationCard = JSX<RecommendationCardProps>(
           image={image?.src && <Img className="mt-auto ml-7" image={image} />}
         >
           {description ? <Description description={description} /> : null}
-          {items?.length ? <List items={items} version={version} /> : null}
+          {items?.length ? <List className="text-m-base" items={items} version={version} /> : null}
         </BaseTile>
       </section>
     );

package/mobile/src/components/StepsBlock/StepsBlock.tsx

@@ -16,6 +16,16 @@ type StyleType = {
   iconConnector: string;
 };
 
+const STEPS_SIZE_MAP: Record<SizeVersion, string> = {
+  normal: 'h-[70px] w-[70px] min-w-[70px] min-h-[70px]',
+  small: 'h-[50px] w-[50px] min-w-[50px] min-h-[50px]',
+};
+
+const STEPS_TILE_DESCRIPTION_HEIGHT_MAP: Record<SizeVersion, string> = {
+  normal: 'min-h-[70px]',
+  small: 'min-h-[50px]',
+};
+
 const STEPS_BLOCK_STYLE_MAPS: Record<BlockVersion, StyleType> = {
   primary: {
     background: 'bg-white',
@@ -88,7 +98,9 @@ const renderStepTitle = (params: RenderStepTitleParams) => {
             <div className={`min-h-8 h-full w-[2px] ${style.iconConnector} ${margin}`} />
           )}
         </div>
-        <div className="flex flex-col justify-start relative">
+        <div
+          className={`flex flex-col justify-center h-fit ${STEPS_TILE_DESCRIPTION_HEIGHT_MAP[size]}`}
+        >
           {step.label && (
             <div className="font-medium text-m-title-xs m-0 text-left">{step.label}</div>
           )}
@@ -110,10 +122,7 @@ const renderStepTitle = (params: RenderStepTitleParams) => {
 const renderIconArea = (params: RenderStepTitleParams) => {
   const { step, size, i, version } = params;
   const style = styleMaps(version);
-  const iconAreaSize =
-    size === 'normal'
-      ? 'h-[70px] w-[70px] min-w-[70px] min-h-[70px]'
-      : 'h-[50px] w-[50px] min-w-[50px] min-h-[50px]';
+  const iconAreaSize = STEPS_SIZE_MAP[size];
 
   const iconSize = size === 'normal' ? '38' : '27';
   const iconTextSize = size === 'normal' ? 'text-m-title' : 'text-m-title-xs';

package/mobile/src/components/StepsBlock/StepsBlockContent.ts

@@ -1,4 +1,4 @@
-import type { IconName } from '../../ui-kit/Icon/IconProps';
+import type { IconName } from '../../icons/IconName';
 import type { SizeVersion } from '../../model/SizeVersion';
 import type { BlockVersion } from '../../model/BlockVersion';
 
@@ -26,9 +26,10 @@ export interface StepsBlockContent {
   /**
    * @title Шаги
    * @minItems 2
-   * @maxItems 3
+   * @maxItems 4
    */
   steps?: Step[];
+  /** @title Размер шагов (моб.) */
   size?: SizeVersion; // TODO: mobile content
   version?: BlockVersion; // TODO: mobile content
 }

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

@@ -13,8 +13,8 @@ export const ButtonInner = JSX<ButtonInnerProps>((props) => {
       {appendLeft ? appendLeft : null}
       {isWithText(props) ? (
         <div>
-          <div className="text-m-2xs text-left">{aboveText}</div>
-          <div className="text-m-button font-medium text-left">{text}</div>
+          <div className="text-m-2xs font-light text-left">{aboveText}</div>
+          <div className="text-m-button text-left">{text}</div>
         </div>
       ) : null}
     </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.3.31",
+  "version": "0.3.32",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -109,14 +109,13 @@
     "clean:actual": "rimraf ./cypress/snapshots/actual || exit 0"
   },
   "peerDependencies": {
-    "cypress": "^10.4.0",
+    "cypress": "^10.6.0",
     "cypress-visual-regression": "^1.7.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
     "@redneckz/uni-jsx": "^0.1.6",
-    "cypress-visual-regression": "^1.7.0",
     "glob": "^8.0.3",
     "remark-html": "^15.0.1",
     "remark-parse": "^10.0.1",

package/src/components/MobileAppTile/MobileAppTile.tsx

@@ -33,13 +33,13 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
               <Heading
                 headingType={getTileHeadingType(className)}
                 title={title}
-                className={`whitespace-pre-wrap max-w-[600px]`}
+                className={`whitespace-pre-wrap max-w-[600px] mb-7`}
               />
             )
           }
           buttons={
             buttons?.length ? (
-              <ButtonSection context={context} buttons={buttons} className="flex mt-9 gap-3" />
+              <ButtonSection context={context} buttons={buttons} className="flex mt-7 gap-4" />
             ) : null
           }
         >
@@ -56,7 +56,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
                 />
               </a>
             )}
-            <span className="font-normal text-sm text-secondary-text ml-4">
+            <span className="font-light text-secondary-text ml-4">
               Наведите камеру телефона на QR-код и скачайте приложение
             </span>
           </div>

package/src/components/PictureText/PictureText.example.json

@@ -7,6 +7,8 @@
       "width": 300
     }
   },
+  "version": "primary",
+  "directionRight": false,
   "benefits": [
     {
       "label": "Преимущество №1",

package/src/components/PictureText/PictureText.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
 import type { PictureTextContent } from './PictureTextContent';
 
+import { BlockVersion } from '../../model/BlockVersion';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Icon } from '../../ui-kit/Icon/Icon';
 import { Img } from '../../ui-kit/Img/Img';
@@ -9,18 +10,33 @@ import { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 
 export interface PictureTextProps extends PictureTextContent, UniBlockProps {}
 
+const pictureTextStyleMap: Record<BlockVersion, string> = {
+  primary: 'bg-white text-primary-text',
+  secondary: 'bg-primary-main text-white',
+};
+
 export const PictureText = JSX<PictureTextProps>(
-  ({ className = '', title, image, benefits, anchor = null }) => {
+  ({
+    className = '',
+    title,
+    image,
+    benefits,
+    version = 'primary',
+    directionRight = false,
+    anchor = null,
+  }) => {
     return (
       <section
-        className={`relative font-sans text-primary-text bg-white p-14 ${className}`}
+        className={`relative font-sans p-14 ${pictureTextStyleMap[version]} ${className}`}
         id={anchor}
       >
         <Heading headingType="h2" className="text-center" title={title} />
         <div className={'flex justify-center mt-9'}>
-          {image?.src && <Img className="mr-6" image={image} />}
+          {image?.src && <Img className={directionRight ? 'order-2 ml-6' : 'mr-6'} image={image} />}
           {benefits?.length ? (
-            <div className="flex flex-col">{benefits.map(renderBenefit)}</div>
+            <div className="flex flex-col">
+              {benefits.map((_, i) => renderBenefit(_, i, version))}
+            </div>
           ) : null}
         </div>
       </section>
@@ -28,7 +44,7 @@ export const PictureText = JSX<PictureTextProps>(
   },
 );
 
-function renderBenefit(benefit: Benefit, i: number) {
+function renderBenefit(benefit: Benefit, i: number, version: string) {
   return (
     <div key={String(i)} className="flex flex-row mb-8">
       {benefit.icon && (
@@ -42,10 +58,20 @@ function renderBenefit(benefit: Benefit, i: number) {
       )}
       <div className="flex gap-1 flex-col h-full ml-5 max-w-[490px]">
         {benefit.label && (
-          <div className="font-medium text-primary-text text-xl m-0">{benefit.label}</div>
+          <div
+            className={`font-medium text-xl m-0 ${
+              version === 'primary' ? 'text-primary-text' : ''
+            }`}
+          >
+            {benefit.label}
+          </div>
         )}
         {benefit.description && (
-          <div className="font-normal text-sm text-secondary-text">{benefit.description}</div>
+          <div
+            className={`font-normal text-sm ${version === 'primary' ? 'text-secondary-text' : ''}`}
+          >
+            {benefit.description}
+          </div>
         )}
       </div>
     </div>

package/src/components/PictureText/PictureTextContent.ts

@@ -1,3 +1,4 @@
+import { BlockVersion } from '../../model/BlockVersion';
 import type { HeadingContent } from '../../ui-kit/Heading/HeadingContent';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
@@ -8,6 +9,12 @@ export type TitleWithImageContent = HeadingContent & ImageContent;
  * @title Картинка с текстом
  */
 export interface PictureTextContent extends TitleWithImageContent {
+  version?: BlockVersion;
   /** @title Список преимуществ */
   benefits?: Benefit[];
+  /**
+   * @title Картинка справа/текст слева
+   * @default false
+   */
+  directionRight?: boolean;
 }

package/src/components/ProductGalleryGreen/ProductGalleryGreen.example.json

@@ -10,7 +10,8 @@
         "image": {
           "format": "webp",
           "size": {
-            "width": 280
+            "width": 608,
+            "height": 299
           }
         },
         "version": "primary",

package/src/components/ProductGalleryGreen/ProductGalleryGreen.fixture.tsx

@@ -38,6 +38,15 @@ const items = [
   'Кредитный лимит до 5 млн рублей',
 ];
 const buttons: ButtonWithIconProps[] = [
+  {
+    href: 'https://rshb.ru',
+    text: 'Подробнее',
+    target: '_blank',
+    version: 'primary',
+  },
+];
+
+const buttonsSecondary: ButtonWithIconProps[] = [
   {
     href: 'https://rshb.ru',
     text: 'Подробнее',
@@ -60,7 +69,6 @@ export default {
             },
             productBlock: {
               title: 'Кредит по одному документу',
-              // description: 'Кредит наличными без залога и поручительства, только по паспорту',
               headingType: 'h2',
               items,
               buttons,
@@ -111,4 +119,69 @@ export default {
       />
     </div>
   ),
+  primary: (
+    <div className="container grid grid-cols-12">
+      <ProductGalleryGreen
+        className="col-span-12"
+        context={context}
+        version={'secondary'}
+        slides={[
+          {
+            nav: {
+              title: 'Кредит по одному документу',
+              description: 'Ставка от 5,5% годовых',
+            },
+            productBlock: {
+              title: 'Кредит по одному документу',
+              // description: 'Кредит наличными без залога и поручительства, только по паспорту',
+              headingType: 'h2',
+              items,
+              buttons: buttonsSecondary,
+              image: percentImage,
+              backgroundText: '3,6',
+            },
+          },
+          {
+            nav: {
+              title: 'Для людей в возрасте',
+              description: 'Ставка до 7% годовых',
+            },
+            productBlock: {
+              title: 'Ставка от 12,5% годовых на срок до 3 лет!',
+              headingType: 'h2',
+              items,
+              buttons: buttonsSecondary,
+              image: worker,
+            },
+          },
+          {
+            nav: {
+              title: 'Выгодно покупать',
+              description: 'Ставка от 5% годовых',
+            },
+            productBlock: {
+              title: 'Дополнительные бонусные баллы за покупки!',
+              headingType: 'h2',
+              items,
+              buttons: buttonsSecondary,
+              image: creditCard,
+            },
+          },
+          {
+            nav: {
+              title: 'Карты Unionpay',
+              description: '120 дней льготный период',
+            },
+            productBlock: {
+              title: 'Карты Unionpay',
+              headingType: 'h2',
+              items,
+              buttons: buttonsSecondary,
+              image: creditCard,
+            },
+          },
+        ]}
+      />
+    </div>
+  ),
 };