@redneckz/wildless-cms-uni-blocks 0.12.11 → 0.12.12

package/src/components/OfficeMap/OfficeMap.tsx

@@ -51,23 +51,23 @@ export const OfficeMap = JSX<UniBlockProps>(({ className = '' }) => {
     currentWeekDayInd > 0 ? workScheduleWeek[currentWeekDayInd - 1] : workScheduleWeek[6];
 
   return (
-    <div className={`flex flex-col font-sans bg-white w-full ${className}`}>
-      <div className="flex flex-col px-12 pt-12">
+    <div className={`flex flex-col font-sans w-full ${className}`}>
+      <div className="flex flex-col gap-m p-6xl pb-3xl">
         <div className="flex justify-between">
           <div className="text-h2">{name}</div>
           {renderCurrentDaySchedule(currentWeekDay)}
         </div>
-        <div className="flex text-l font-light pt-4">
+        <div className="flex text-l font-light">
           <Icon name="GeolocationIcon" width="24" height="24" className="pr-1" />
           {address}
         </div>
-        <div className="flex pt-4">{nearbyOffices.map(renderNearbyOffice)}</div>
+        <div className="flex">{nearbyOffices.map(renderNearbyOffice)}</div>
       </div>
-      <div className="flex justify-between pt-3xl">
+      <div className="flex justify-between">
         <div className="flex-grow h-full w-full overflow-hidden">
           {point ? <YandexMap points={[point]} className="h-full" /> : null}
         </div>
-        <div className="w-[434px] min-w-[434px] pl-9 pr-12 pb-14 flex flex-col">
+        <div className="w-[434px] min-w-[434px] p-6xl pt-0 flex flex-col">
           {workScheduleWeek.map(renderDay)}
         </div>
       </div>

package/src/components/OfficeServicesBlock/OfficeServicesBlock.tsx

@@ -14,19 +14,19 @@ export interface OfficeServicesBlockProps extends OfficeServicesBlockContent, Un
 
 export const OfficeServicesBlock = JSX<OfficeServicesBlockProps>(
   ({ className = '', title, servicesList, ...rest }) => (
-    <BlockWrapper className={style('flex flex-col', className)} {...rest}>
-      {title ? <Heading headingType="h5" className="mb-5" title={title} /> : null}
+    <BlockWrapper className={style('flex flex-col gap-lg', className)} {...rest}>
+      {title ? <Heading headingType="h5" title={title} /> : null}
       {servicesList?.length ? (
-        <ul className="list-none m-0 p-0">{servicesList.map(renderListItems)}</ul>
+        <ul className="list-none space-y-lg">{servicesList.map(renderListItems)}</ul>
       ) : null}
     </BlockWrapper>
   ),
 );
 
 const renderListItems = (itemList: OfficeServicesBlockList, i: number) => (
-  <li key={`list_item_${String(i)}`} className="flex mb-5 last:mb-0 list-none">
+  <li key={`list_item_${String(i)}`} className="flex gap-s list-none ">
     {itemList.icon ? (
-      <Img className="mr-3 min-w-6 min-h-6 w-6 h-6" width="24" height="24" image={itemList.icon} />
+      <Img className="min-w-6 min-h-6 w-6 h-6" width="24" height="24" image={itemList.icon} />
     ) : null}
     {itemList.label ? (
       <Text size="text-l" font="font-light">

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

@@ -0,0 +1,214 @@
+import '../../setup-fixture';
+
+import type { Picture } from '../../model/Picture';
+import type { ComplexBenefitContent } from '../../ui-kit/BenefitItem/BenefitItemContent';
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import { ProductTile } from './ProductTile';
+import type { ProductTileContent } from './ProductTileContent';
+
+const imageSize = {
+  height: 200,
+  width: 200,
+};
+
+const cardWithMoney: Picture = {
+  src: 'card-with-diamond.png',
+  alt: 'Кредиты в РСХБ',
+  format: 'webp',
+  size: imageSize,
+};
+
+const letterWithMoney: Picture = {
+  src: 'letter-with-money.png',
+  alt: 'Пенсионный кредит в РСХБ',
+  format: 'webp',
+  size: imageSize,
+};
+
+const letterWithPhone: Picture = {
+  src: 'letter-with-phone.png',
+  alt: 'Пенсионный кредит в РСХБ',
+  format: 'webp',
+  size: imageSize,
+};
+
+const building: Picture = {
+  src: 'building.png',
+  alt: 'Кредит под залог недвижимости в РСХБ',
+  format: 'webp',
+  size: imageSize,
+};
+
+const benefits: ComplexBenefitContent[] = [
+  {
+    type: 'default',
+    label: 'до 5 млн Р',
+    description: 'Кредитный лимит',
+  },
+  {
+    type: 'default',
+    label: 'от 12,5%',
+    description: 'Процентная ставка',
+  },
+  {
+    type: 'default',
+    label: 'до 5 лет',
+    description: 'Срок кредитования',
+  },
+];
+
+const benefits2: ComplexBenefitContent[] = [
+  {
+    type: 'default',
+    label: '1 год',
+    description: 'срок программы',
+  },
+];
+
+const multilineBenefits: ComplexBenefitContent[] = [
+  {
+    type: 'default',
+    label: 'Широкий',
+    description: 'выбор платёжных систем',
+  },
+  {
+    type: 'default',
+    label: 'Специальные',
+    description: 'условия по снятию наличных условия по снятию наличных',
+  },
+  {
+    type: 'default',
+    label: '0,5 балла',
+    description: '«Урожай» за 100 рублей «Урожай» за 100 рублей',
+  },
+];
+
+const buttons: ButtonProps[] = [
+  {
+    text: 'Подробнее',
+    href: '/credit-cards',
+    version: 'secondary',
+  },
+];
+
+const buttons2: ButtonProps[] = [
+  {
+    href: 'https://rshb.ru',
+    text: 'Подробнее',
+    target: '_blank',
+    version: 'secondary',
+  },
+];
+
+const buttons3: ButtonProps[] = [
+  {
+    href: 'https://rshb.ru',
+    text: 'Оформить',
+    target: '_blank',
+    version: 'primary',
+  },
+  {
+    href: 'https://rshb.ru',
+    text: 'Подробнее',
+    target: '_blank',
+    version: 'secondary',
+  },
+];
+
+export const PRODUCT_TILE: ProductTileContent = {
+  title: 'Акция! “Кредит На все, что хочется!”',
+  headlineVersion: 'S',
+  description: 'Потребительский кредит на любые цели, без залога и поручительства',
+  benefits,
+  buttons: buttons,
+  image: cardWithMoney,
+};
+export const PRODUCT_PENSION_TILE: ProductTileContent = {
+  title: 'Кредит пенсионный',
+  headlineVersion: 'S',
+  description: 'Для людей в возрасте до 75 лет',
+  benefits,
+  buttons: buttons2,
+};
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12">
+      <ProductTile className="col-span-12" {...PRODUCT_TILE} />
+    </div>
+  ),
+  secondary: (
+    <div className="container grid grid-cols-12">
+      <ProductTile className="col-span-12" {...PRODUCT_TILE} version="secondary" />
+    </div>
+  ),
+  pension: (
+    <div className="container grid grid-cols-12">
+      <ProductTile
+        className="col-span-12"
+        title="Акция! “Пенсионный кредит”"
+        description="Потребительский кредит на любые цели, без залога и поручительства"
+        benefits={benefits}
+        buttons={buttons2}
+        image={letterWithMoney}
+      />
+    </div>
+  ),
+  'long-title-benefits-without-image': (
+    <div className="container grid grid-cols-12">
+      <ProductTile
+        className="col-span-12"
+        title="Кредит пенсионный"
+        description="Для людей в возрасте до 75 лет"
+        benefits={multilineBenefits}
+        buttons={buttons2}
+      />
+    </div>
+  ),
+  'credit-card': (
+    <div className="container grid grid-cols-12">
+      <ProductTile
+        className="col-span-12"
+        title="Кредит под залог недвижимости"
+        description="Без переоформления залогой недвижимости на банк"
+        benefits={benefits}
+        buttons={buttons2}
+        image={building}
+      />
+    </div>
+  ),
+  'pension-credit': (
+    <div className="container grid grid-cols-12">
+      <ProductTile
+        className="col-span-12"
+        title="Кредит пенсионный"
+        description="Для людей в возрасте до 75 лет"
+        benefits={benefits}
+        buttons={buttons2}
+      />
+    </div>
+  ),
+  'with-add-desc': (
+    <div className="container grid grid-cols-12">
+      <ProductTile
+        className="col-span-12"
+        title="Ипотечное страхование"
+        description="Финансовая защита заемщиков в случае непредвиденных обстоятельств"
+        additionalDescription="Страховая сумма и страховой взнос зависит от остатка задолженности по ипотеке"
+        benefits={benefits2}
+        buttons={buttons3}
+        image={letterWithPhone}
+      />
+    </div>
+  ),
+  'stretching with long description': (
+    <div className="container grid grid-cols-12">
+      <ProductTile
+        className="col-span-12"
+        {...PRODUCT_TILE}
+        benefits={multilineBenefits}
+        title="Многострочные преимущества"
+      />
+    </div>
+  ),
+};

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

@@ -32,7 +32,7 @@ export default {
   default: (
     <div className="container grid grid-cols-12">
       <RepresentativeOfficeInfo
-        className="col-span-12 sm:col-span-6"
+        className="col-span-12"
         title="Представительство в Республике Беларусь"
         __html={DESCRIPTION}
         address="Республика Беларусь, 220004, г. Минск, ул. Немига, д. 40"

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.fixture.tsx

@@ -32,7 +32,7 @@ export default {
   default: (
     <div className="container grid grid-cols-12">
       <RepresentativeOfficeInfo
-        className="col-span-12 sm:col-span-6"
+        className="col-span-12"
         title="Представительство в Республике Беларусь"
         __html={DESCRIPTION}
         address="Республика Беларусь, 220004, г. Минск, ул. Немига, д. 40"

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.tsx

@@ -29,43 +29,42 @@ export const RepresentativeOfficeInfo = JSX<RepresentativeOfficeInfoProps>(
     version = 'primary',
     ...rest
   }) => (
-    <BlockWrapper className={style('box-border text-left', className)} version={version} {...rest}>
-      <div className="w-full sm:flex sm:justify-between sm:flex-row-reverse">
+    <BlockWrapper
+      className={style('box-border text-left space-y-s', className)}
+      version={version}
+      {...rest}
+    >
+      <div className="w-full flex justify-between flex-row-reverse">
         {renderIconBlock(icon)}
-        {title ? <Heading headingType="h4" as="h3" className="mb-3 sm:mb-6" title={title} /> : null}
+        {title ? <Heading headingType="h4" as="h3" title={title} /> : null}
       </div>
-      <div className="w-full">
+      <div className="w-full space-y-m">
         {__html ? renderDescriptionBlock(__html) : null}
         {renderBlock('Адрес', address, 'GeolocationIcon')}
         {renderBlock('Телефон', telephone, 'PhoneIcon')}
         {renderBlock('E-mail', email, 'MailIcon')}
-        {button?.text
-          ? renderButtonsSection([button], {
-              className: 'mb-6',
-            })
-          : null}
+        {button?.text ? renderButtonsSection([button]) : null}
       </div>
     </BlockWrapper>
   ),
 );
 
 const renderIconBlock = (icon?: Picture) => (
-  <div className={'w-10 h-7 sm:w-24 sm:h-16 mb-3 sm:mb-0 sm:mt-3'}>
-    {icon?.src ? <Img image={icon} /> : null}
-    {icon?.icon ? <Img image={icon} /> : null}
+  <div className={'w-10 h-7 sm:w-24 sm:h-16'}>
+    {icon?.src || icon?.icon ? <Img image={icon} /> : null}
   </div>
 );
 
 const renderDescriptionBlock = (__html?: string) => (
-  <div className="border-b border-main-divider pb-5 my-5">
+  <div className="border-b border-main-divider pb-5">
     <RichText __html={__html} />
   </div>
 );
 
 const renderBlock = (blockName: string, data?: string, iconName?: IconName | undefined) => (
-  <div className="flex mb-4">
-    <Icon className="pr-4" iconVersion="black" name={iconName} width="24" height="24" />
-    <div className="flex flex-col first:pb-1">
+  <div className="flex gap-m">
+    <Icon iconVersion="black" name={iconName} width="24" height="24" />
+    <div className="flex flex-col">
       <Text size="text-m" font="font-light">
         {blockName}
       </Text>

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

@@ -27,29 +27,25 @@ const labelIcon: Picture = { icon: 'BriefcaseIcon' };
 export default {
   default: (
     <div>
-      <div className="list-none m-0 p-0">
-        <RollupItem
-          {...ROLLUP_ITEM.content}
-          version="secondary"
-          block={ROLLUP_ITEM}
-          options={options}
-        />
-        <RollupItem {...ROLLUP_ITEM.content} block={ROLLUP_ITEM} options={options} />
-      </div>
+      <RollupItem
+        {...ROLLUP_ITEM.content}
+        version="secondary"
+        block={ROLLUP_ITEM}
+        options={options}
+      />
+      <RollupItem {...ROLLUP_ITEM.content} block={ROLLUP_ITEM} options={options} />
     </div>
   ),
   labelIcon: (
     <div>
-      <div className="list-none m-0 p-0">
-        <RollupItem
-          label="RollupItem label 1"
-          labelIcon={labelIcon}
-          labelIconBgVersion="primary"
-          isExpanded={true}
-          block={ROLLUP_ITEM}
-          options={options}
-        />
-      </div>
+      <RollupItem
+        label="RollupItem label 1"
+        labelIcon={labelIcon}
+        labelIconBgVersion="primary"
+        isExpanded={true}
+        block={ROLLUP_ITEM}
+        options={options}
+      />
     </div>
   ),
 };

package/src/components/RollupItem/RollupItem.tsx

@@ -45,10 +45,13 @@ export const RollupItem: JSXBlock<RollupItemProps> = JSX<RollupItemProps>(
           unfoldedByDefault={isExpanded}
           renderFoldableSection={({ isUnfolded }) => (
             <FoldableSection
-              className={style('gap-5 [&>*]:p-0', foldableSectionStyles)}
+              className={style('gap-5', foldableSectionStyles)}
               isUnfolded={isUnfolded}
             >
-              {renderChildren(rest)}
+              {renderChildren({
+                ...rest,
+                extraProps: { className: 'w-full', padding: 'p-0' },
+              })}
             </FoldableSection>
           )}
           renderFoldButton={({ isUnfolded, onToggle }) =>

package/src/components/SafeDepositRental/{RenderRadioButtons.tsx → RadioButtons.tsx}

@@ -1,13 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks/core';
 import { Radio } from '../../ui-kit/Radio/Radio';
+import { style } from '../../utils/style';
 
-export const RenderRadioButtons = JSX(() => {
+interface RadioButtonsProps {
+  className: string;
+}
+
+export const RadioButtons = JSX(({ className }: RadioButtonsProps) => {
   const [selectedOption, setSelectedOption] = useState('option2');
   const onChange = useCallback((_: string) => setSelectedOption(_), []);
 
   return (
-    <div>
+    <div className={style('order-4', className)}>
       <Radio
         className="mb-xs"
         name="contractType"

package/src/components/SafeDepositRental/RegionsAndBranches.tsx

@@ -21,8 +21,8 @@ export const RegionsAndBranches = JSX<RegionsAndBranchesProps>(
     selectedBranch,
     onSelectedBranch,
   }) => (
-    <div className="flex justify-between gap-4 mb-6">
-      <div className="max-w-[396px] w-1/2">
+    <div className="flex flex-col sm:flex-row gap-m order-1">
+      <div className="flex-1 min-w-0">
         <WrapperSelect
           data={regions}
           fieldValue="code"
@@ -32,7 +32,7 @@ export const RegionsAndBranches = JSX<RegionsAndBranchesProps>(
           label="Регион"
         />
       </div>
-      <div className="max-w-[396px] w-1/2">
+      <div className="flex-1 min-w-0">
         <WrapperSelect
           data={branches}
           fieldValue="branchCode"

package/src/components/SafeDepositRental/RentalPeriod.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
+import { Text } from '../../ui-kit/Text/Text';
 
 const ITEMS = ['От 1 дня', 'До 365 дней'];
 const MIN = 1;
@@ -11,8 +12,10 @@ interface RentalPeriodProps {
 }
 
 export const RentalPeriod = JSX<RentalPeriodProps>(({ days, setDays }) => (
-  <div className="mb-6">
-    <span className="block text-m font-light mb-1">Срок аренды</span>
+  <div className="order-1">
+    <Text size="text-m" font="font-light">
+      Срок аренды
+    </Text>
     <InputRange min={MIN} max={MAX} value={days} items={ITEMS} onChange={setDays} />
   </div>
 ));

package/src/components/SafeDepositRental/SafeBoxCases.tsx

@@ -21,8 +21,8 @@ export const SafeBoxCases = JSX<SafeBoxCasesProps>(
     onSelectedBoxSize,
   }) => {
     return (
-      <div className="flex justify-between mb-6">
-        <div className="mr-4 w-full">
+      <div className="flex flex-col sm:flex-row gap-4 order-1">
+        <div className="flex-1 min-w-0">
           <WrapperSelect
             data={caseVolumes}
             fieldLabel="volume"
@@ -32,7 +32,7 @@ export const SafeBoxCases = JSX<SafeBoxCasesProps>(
             placeholder="Выберите размер"
           />
         </div>
-        <div className="w-full">
+        <div className="flex-1 min-w-0">
           <WrapperSelect
             data={safeBoxCases}
             fieldLabel="safeBoxCasesSize"

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

@@ -0,0 +1,15 @@
+import '../../setup-fixture';
+
+import { SafeDepositRental } from './SafeDepositRental';
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12 mb-1">
+      <SafeDepositRental
+        className="col-span-12"
+        footnote="Аренда СЯ, в случае проведения процедуры купли-продажи, с использованием наличных денег
+          или процедуры ипотечной сделки"
+      />
+    </div>
+  ),
+};

package/src/components/SafeDepositRental/SafeDepositRentalFields.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
 import { RegionsAndBranches } from './RegionsAndBranches';
-import { RenderRadioButtons } from './RenderRadioButtons';
+import { RadioButtons } from './RadioButtons';
 import { RentalPeriod } from './RentalPeriod';
 import { SafeBoxCases } from './SafeBoxCases';
 import { Text } from '../../ui-kit/Text/Text';
@@ -33,7 +33,7 @@ export const SafeDepositRentalFields = JSX<SafeDepositRentalFieldsProps>(
     onClick,
   }) => {
     return (
-      <div className="flex-1 mr-9">
+      <div className="contents sm:block flex-1 space-y-xl">
         <RegionsAndBranches
           regions={regions}
           selectedRegion={selectedRegion}
@@ -51,12 +51,14 @@ export const SafeDepositRentalFields = JSX<SafeDepositRentalFieldsProps>(
           selectedBoxSize={selectedBoxSize}
           onSelectedBoxSize={(value) => onChange({ selectedBoxSize: value })}
         />
-        <Text size="text-l" font="font-light" color="text-secondary-text">
-          Тип договора
-        </Text>
-        <div className="flex justify-between items-center mt-5">
-          <RenderRadioButtons />
-          <Button text="Офисы на карте" version="primary" onClick={onClick} />
+        <div className="order-4">
+          <Text size="text-l" font="font-light" color="text-secondary-text">
+            Тип договора
+          </Text>
+        </div>
+        <div className="contents sm:flex justify-between items-center">
+          <RadioButtons className="mb-4 sm:mb-0" />
+          <Button text="Офисы на карте" version="primary" onClick={onClick} className="order-6" />
         </div>
       </div>
     );

package/src/components/SafeDepositRental/SafeDepositRentalForm.tsx

@@ -37,7 +37,7 @@ export const SafeDepositRentalForm = JSX<SafeDepositRentalFormProps>((props) =>
   const tariffs = getTariffs(safeBoxCases, data.selectedBoxSize);
 
   return (
-    <div className="flex justify-between align-top mb-6">
+    <div className="flex flex-col sm:flex-row gap-x-9 align-top mb-6">
       <SafeDepositRentalFields
         {...data}
         regions={regions}

package/src/components/SafeDepositRental/SafeDepositRentalTotal.tsx

@@ -9,29 +9,32 @@ export interface SafeDepositRentalTotalProps {
 
 export const SafeDepositRentalTotal = JSX<SafeDepositRentalTotalProps>(({ days, tariffs = [] }) => {
   const price = calculatePrice(days, tariffs);
+  const imageDescription = 'На рисунке изображена пачка листов\nформата А4';
 
   return (
-    <div className="flex flex-col justify-between">
-      <div className="flex">
-        {renderTotal('Аренда за', days, 'mr-11')}
+    <div className="contents sm:flex flex-col justify-between order-2">
+      <div className="flex flex-col sm:flex-row gap-x-11 gap-y-7 order-5 sm:order-none py-7 sm:py-0 border-t border-main-divider sm:border-none">
+        {renderTotal('Аренда за', days)}
         {renderTotal('Цена', price + ' ₽')}
       </div>
-      <div className="bg-primary-main px-10 pt-10 pb-4 text-center">
-        <Img image={{ icon: 'PackA4Icon' }} width="290" height="257" />
-
-        <span className="text-s font-light text-white opacity-80 mt-xs inline-block">
-          На рисунки изображена пачка<br></br> листов формата А4
+      <span className="sm:hidden order-3 mb-2 text-s-light text-secondary-text">
+        {imageDescription}
+      </span>
+      <div className="flex flex-col items-center gap-3 order-3 sm:order-none mb-6 sm:mb-0 bg-primary-main py-3 sm:p-8 text-center">
+        <Img image={{ icon: 'PackA4Icon' }} className="sm:h-[246px]" />
+        <span className="hidden sm:inline text-s font-light text-white opacity-80 whitespace-pre-line">
+          {imageDescription}
         </span>
       </div>
     </div>
   );
 });
 
-const renderTotal = (label: string, total: string | number, className = '') => {
+const renderTotal = (label: string, total: string | number) => {
   return (
-    <div className={className}>
-      <div className="text-m font-light text-secondary-text mb-1">{label}</div>
-      <span className="text-h3 text-primary-text">{total}</span>
+    <div className="flex justify-between items-center gap-y-1 sm:flex-col sm:items-start">
+      <div className="text-l font-light text-secondary-text">{label}</div>
+      <span className="text-l sm:text-h3 text-primary-text">{total}</span>
     </div>
   );
 };

package/src/components/StepsBlock/renderStep.tsx

@@ -48,7 +48,7 @@ const renderDefaultStep =
       <div
         key={String(i)}
         className={style(
-          'relative flex flex-col items-center text-center whitespace-pre-line overflow-hidden space-y-3xl',
+          'relative flex flex-col items-center text-center justify-between whitespace-pre-line overflow-hidden space-y-3xl',
           getContainerWidth(arr.length),
         )}
       >
@@ -70,7 +70,7 @@ const renderDefaultStep =
         </div>
         {button?.text && !isMainButton ? (
           <Button
-            className="box-border py-s h-12 w-full max-w-[240px] mt-auto"
+            className="box-border py-s w-full max-w-60 mt-auto"
             version={version as ButtonVersion}
             {...button}
           >

package/src/components/Tabs/ScrollableTabs.tsx

@@ -19,7 +19,6 @@ export const ScrollableTabs = JSX<ScrollableTabsProps>((props) => {
 
   const [containerRef, scroll] = useSwipeListScroll<HTMLDivElement>({
     itemCount: tabs?.length || 0,
-    isCyclic: false,
   });
 
   return (