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

package/src/components/Footer/buttonStylesWithText.ts

@@ -1,10 +1,6 @@
 import { style } from '../../utils/style';
 import { ButtonSize } from './MediaButton';
-
-const buttonSizeStyles = {
-  default: 'w-14 h-14',
-  small: 'w-12 h-12',
-};
+import { buttonSizeStyles } from './buttonSizeStyles';
 
 export const buttonStylesWithText = (text: string, buttonSize: ButtonSize) =>
   text

package/src/components/GracePeriod/GracePeriod.tsx

@@ -14,7 +14,13 @@ export interface GracePeriodProps extends GracePeriodContent, UniBlockProps {}
 export const GracePeriod = JSX<GracePeriodProps>(
   ({ className = '', title, description, calendar, ...rest }) => (
     <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
-      <Headline className="!p-0 mb-4" title={title} description={description} headlineVersion="M" />
+      <Headline
+        className="mb-4"
+        title={title}
+        description={description}
+        headlineVersion="M"
+        isPadding={false}
+      />
       {calendar ? renderCalendar(calendar) : null}
     </BlockWrapper>
   ),
@@ -42,15 +48,15 @@ const renderCalendar = (calendar: CalendarItem[]) => {
       <div className="flex w-full mb-3 text-h6 text-center">
         {mappedCalendar.map((_) => renderMonthNames(_, colSize))}
       </div>
-      <div className="flex w-full">
+      <div className="flex gap-s w-full">
         {mappedCalendar.map((_, ind) => (
           <div
             key={`monthItem-${ind}`}
-            className="pr-[11px] mr-3 border-r border-main-divider last:border-r-0 last:pr-0 last:mr-0"
+            className="pr-s border-r border-main-divider last:border-r-0 last:pr-0"
             style={{ flexBasis: _.flexBasis }}
           >
             <div className="flex">{renderMonthImages(_)}</div>
-            <div className="text-s font-light text-primary-text mt-3">
+            <div className="text-s font-light text-primary-text mt-s">
               <span>{_.text}</span>&thinsp;
               <span className="text-primary-main">{_.greenText}</span>
             </div>

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

@@ -1,7 +1,10 @@
 import '../../setup-fixture';
+
+import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { Header } from './Header.mobile';
+import sitemap from './sitemap.wcms-resource.json';
 
 export default {
-  default: <Header />,
-  transparent: <Header bgColor="transparent" />,
+  default: <Header sitemap={sitemap as SitemapData} />,
+  transparent: <Header bgColor="transparent" sitemap={sitemap as SitemapData} />,
 };

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

@@ -1,9 +1,10 @@
 import '../../setup-fixture';
 
+import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { Header } from './Header';
+import sitemap from './sitemap.wcms-resource.json';
 
 export default {
-  default: <Header />,
-  transparent: <Header bgColor="transparent" />,
-  'no submenu': <Header showSubMenu={false} />,
+  default: <Header sitemap={sitemap as SitemapData} />,
+  transparent: <Header bgColor="transparent" sitemap={sitemap as SitemapData} />,
 };

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

@@ -1,29 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useSWRResource } from '../../hooks/useSWRResource';
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { Fallback } from '../../model/Fallback';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import { projectSettings } from '../../ProjectSettings';
-import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import type { HeaderContent } from './HeaderContent';
+import type { HeaderProps } from './HeaderProps';
 import { HeaderTop } from './HeaderTop';
 
-export interface HeaderMobileProps extends HeaderContent, UniBlockProps {}
-
 const BG_COLOR_TO_BLOCK_VERSION: Record<BgColorVersion, BlockVersion> = {
   'bg-white': 'primary',
   transparent: 'transparent',
 };
 
-export const Header = JSX<HeaderMobileProps>(
-  ({ bgColor = 'bg-white', version = BG_COLOR_TO_BLOCK_VERSION[bgColor], ...rest }) => {
-    const fallback: Fallback | undefined = rest.options?.page?.fallback;
-    const { logo, internetBankUrl } = useSWRResource<SitemapData>(
-      projectSettings.SITEMAP || 'sitemap',
-      fallback,
-    );
+export const Header = JSX<HeaderProps>(
+  ({ bgColor = 'bg-white', version = BG_COLOR_TO_BLOCK_VERSION[bgColor], sitemap, ...rest }) => {
+    const { logo, internetBankUrl } = sitemap || {};
 
     return (
       <BlockWrapper tag="header" defaultPadding="" version={version} {...rest}>

package/src/components/Header/Header.tsx

@@ -1,25 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocation } from '../../hooks/useLocation';
 import { useRouter } from '../../hooks/useRouter';
-import { useSWRResource } from '../../hooks/useSWRResource';
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { BlockVersion } from '../../model/BlockVersion';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import { projectSettings } from '../../ProjectSettings';
 import { isTopItemActive } from '../../services/sitemap/isTopItemActive';
-import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
 import { Logo } from '../../ui-kit/Logo/Logo';
-import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { style } from '../../utils/style';
-import type { HeaderContent } from './HeaderContent';
+import type { HeaderProps } from './HeaderProps';
 import { HeaderSecondaryMenu } from './HeaderSecondaryMenu';
 import { HeaderSubMenu } from './HeaderSubMenu';
 
-export interface HeaderProps extends HeaderContent, UniBlockProps {}
-
 const BG_COLOR_TO_BLOCK_VERSION: Record<BgColorVersion, BlockVersion> = {
   'bg-white': 'primary',
   transparent: 'transparent',
@@ -27,30 +18,24 @@ const BG_COLOR_TO_BLOCK_VERSION: Record<BgColorVersion, BlockVersion> = {
 
 export const Header = JSX<HeaderProps>(
   ({
-    bgColor = 'bg-white',
     className,
-    showSubMenu = true,
+    bgColor = 'bg-white',
     version = BG_COLOR_TO_BLOCK_VERSION[bgColor],
+    sitemap,
+    location,
     ...rest
   }) => {
     const router = useRouter();
 
-    const { topItems, logo, defaultLocation, foreignOffices, officesLink, internetBankUrl } =
-      useSWRResource<SitemapData>(
-        projectSettings.SITEMAP || 'sitemap',
-        rest.options?.page?.fallback,
-      );
-
+    const { topItems, logo, officesLink, internetBankUrl } = sitemap || {};
     const activeTopItem = topItems?.find(isTopItemActive(router));
 
-    const [location, onChangeLocation] = useLocation(defaultLocation);
-
     return (
       <BlockWrapper
         tag="header"
         className={style(
           'pt-3xl px-20',
-          showSubMenu && activeTopItem?.items?.length ? 'pb-m' : 'pb-lg',
+          activeTopItem?.items?.length ? 'pb-m' : 'pb-lg',
           className,
         )}
         defaultPadding=""
@@ -66,7 +51,7 @@ export const Header = JSX<HeaderProps>(
             <HeaderSecondaryMenu
               version={version}
               className="ml-auto"
-              locationName={location.name}
+              locationName={location?.name}
               officesLink={officesLink}
             />
           </div>
@@ -76,7 +61,7 @@ export const Header = JSX<HeaderProps>(
               version === 'transparent' ? 'opacity-30' : '',
             )}
           />
-          {showSubMenu && activeTopItem?.items?.length ? (
+          {activeTopItem?.items?.length ? (
             <HeaderSubMenu
               subItems={activeTopItem.items}
               version={version}
@@ -84,12 +69,6 @@ export const Header = JSX<HeaderProps>(
             />
           ) : null}
         </div>
-        <SearchDialog topItems={topItems} />
-        <LocationDialog
-          currentLocation={location}
-          foreignOffices={foreignOffices}
-          onChangeLocation={onChangeLocation}
-        />
       </BlockWrapper>
     );
   },

package/src/components/Header/HeaderContent.ts

@@ -29,8 +29,6 @@ export type Logo = ImageContent & {
  * @title Шапка (для мобильных горизонтальная прокрутка shift+mouseScroll)
  */
 export interface HeaderContent {
-  /** @hidden */
-  showSubMenu?: boolean;
   /** @hidden */
   bgColor?: BgColorVersion;
 }

package/src/components/Header/HeaderProps.ts

@@ -0,0 +1,9 @@
+import { RegionData } from '../../hooks/useLocation';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { SitemapData } from '../../services/sitemap/SitemapData';
+import type { HeaderContent } from './HeaderContent';
+
+export interface HeaderProps extends HeaderContent, UniBlockProps {
+  sitemap?: SitemapData;
+  location?: RegionData;
+}

package/src/components/Header/HeaderTop.tsx

@@ -50,7 +50,7 @@ export const HeaderTop = JSX<HeaderTopProps>(({ bgColor, logo, internetBankUrl,
           ariaLabel="Войти"
           target="_blank"
           className={style(
-            'p-3 my-1 text-s whitespace-nowrap text-primary-main hover:text-primary-hover',
+            'p-s my-2xs text-s whitespace-nowrap text-primary-main hover:text-primary-hover',
             BUTTON_STYLE[version === 'transparent' ? 'transparent' : 'default'],
           )}
         >

package/src/components/Header/sitemap.wcms-resource.json

@@ -0,0 +1,144 @@
+{
+  "_schemaPath": "content/schemas/Карта Сайта.schema.json",
+  "officesLink": "https://www.rshb.ru/offices/moscow/",
+  "topItems": [
+    {
+      "items": [
+        {
+          "href": "/cards-credit",
+          "text": "Кредитные карты"
+        },
+        {
+          "href": "/cards-debit",
+          "text": "Дебетовые карты"
+        },
+        {
+          "href": "/credits",
+          "text": "Кредиты"
+        },
+        {
+          "href": "/deposits",
+          "text": "Вклады"
+        },
+        {
+          "href": "/investment",
+          "text": "Инвестиции"
+        },
+        {
+          "href": "/mortgage",
+          "text": "Ипотека"
+        },
+        {
+          "href": "/insurance",
+          "text": "Страхование"
+        },
+        {
+          "href": "/transfers",
+          "text": "Переводы"
+        },
+        {
+          "href": "/premium",
+          "text": "Премиум"
+        }
+      ],
+      "href": "/natural",
+      "text": "Частным клиентам",
+      "icon": { "icon": "ClientIcon", "iconVersion": "normal" }
+    },
+    {
+      "items": [
+        {
+          "text": "РКО",
+          "href": "/rco"
+        },
+        {
+          "text": "Кредиты",
+          "href": "/credits"
+        },
+        {
+          "text": "Депозиты",
+          "href": "/deposits"
+        },
+        {
+          "text": "Эквайринг",
+          "href": "/acquiring"
+        },
+        {
+          "text": "Банковские карты",
+          "href": "/cards"
+        },
+        {
+          "text": "ВЭД",
+          "href": "/ved"
+        },
+        {
+          "text": "Инвестиции",
+          "href": "/investment"
+        },
+        {
+          "text": "Обмен валюты",
+          "href": "/exchange"
+        }
+      ],
+      "text": "Бизнес клиентам",
+      "href": "/business",
+      "icon": { "icon": "BagIcon", "iconVersion": "normal" }
+    },
+    {
+      "items": [
+        {
+          "text": "Свое Родное",
+          "href": "https://svoe-rodnoe.ru/"
+        },
+        {
+          "text": "Свое Фермерство",
+          "href": "/ferm"
+        },
+        {
+          "text": "Свое Жилье",
+          "href": "/home"
+        },
+        {
+          "text": "Свое Село",
+          "href": "/selo"
+        },
+        {
+          "text": "Свое за Городом",
+          "href": "/gorod"
+        },
+        {
+          "text": "Свое Объявления",
+          "href": "/reklam"
+        }
+      ],
+      "text": "Экосистема Своё",
+      "href": "/svoe",
+      "icon": {
+        "icon": "GridIcon",
+        "iconVersion": "normal"
+      }
+    }
+  ],
+  "dispositions": [
+    {
+      "text": "Офисы",
+      "href": "#",
+      "icon": { "icon": "BankIcon" }
+    },
+    {
+      "text": "Банкоматы",
+      "href": "#",
+      "icon": { "icon": "AtmIcon" }
+    }
+  ],
+  "id": "6XGlupwIMfAfAca1Zm1X0",
+  "title": "Сайт РСХБ",
+  "slug": "sitemap",
+  "defaultLocation": "Москва",
+  "internetBankUrl": "https://google.com",
+  "logo": {
+    "image": {
+      "icon": "LogoIcon"
+    }
+  }
+}

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

@@ -0,0 +1,72 @@
+import '../../setup-fixture';
+
+import { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
+import type { Picture } from '../../model/Picture';
+import { Blocks } from '../Blocks';
+import type { TextBlockContent } from '../TextBlock/TextBlockContent';
+import { HorizontalLayout } from './HorizontalLayout';
+
+const options = {
+  blocksRegistry: Blocks,
+} as BlockRendererOptions;
+
+const image: Picture = {
+  src: 'bank-card.png',
+  format: 'webp',
+  size: {
+    width: 48,
+    height: 48,
+  },
+};
+
+export const TEXT_BLOCK: TextBlockContent = {
+  title: 'Все карты Россельхозбанка работают',
+  description:
+    /* eslint-disable max-len */
+    "Если не планируете поездку за границу, продолжайте пользоваться картой Своя. Для поездок за границу можно заказать карту 'Кредитная карта Своя Union Pay' на сайте и в приложении Россельхозбанка",
+};
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12">
+      <HorizontalLayout
+        className="col-span-12"
+        gap="M"
+        version="primary"
+        isPadding={true}
+        isTheme={false}
+        block={{
+          type: 'VerticalLayout',
+          blocks: [
+            {
+              type: 'Headline',
+              content: { title: 'Преимущества вкладов от Россельхозбанка', headlineVersion: 'XS' },
+            },
+            {
+              type: 'TextBlock',
+              content: { ...TEXT_BLOCK, iconVersion: 'small' },
+            },
+            {
+              type: 'TextBlock',
+              content: { ...TEXT_BLOCK, iconVersion: 'big', image },
+            },
+            {
+              type: 'TextBlock',
+              content: { ...TEXT_BLOCK, iconVersion: 'big', image },
+            },
+            {
+              type: 'TextBlock',
+              content: { ...TEXT_BLOCK, iconVersion: 'big', image },
+            },
+
+            {
+              type: 'TextBlock',
+              content: { ...TEXT_BLOCK, iconVersion: 'none' },
+            },
+          ],
+        }}
+        options={options}
+      />
+    </div>
+  ),
+};

package/src/components/HorizontalLayout/HorizontalLayout.mobile.tsx

@@ -0,0 +1,12 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
+import { VerticalLayout } from '../VerticalLayout/VerticalLayout';
+import type { HorizontalLayoutContent } from './HorizontalLayoutContent';
+
+export interface HorizontalLayoutProps extends HorizontalLayoutContent, UniBlockProps {}
+
+export const HorizontalLayout: JSXBlock<HorizontalLayoutProps> = JSX<HorizontalLayoutProps>(
+  (props) => <VerticalLayout {...props} />,
+);
+
+HorizontalLayout.childrenTypes = [];

package/src/components/InsuranceAmountBlock/InsuranceAmountBlockInner.tsx

@@ -99,7 +99,7 @@ function renderNavButton({ slide, i, isActive, onClick }: NavButtonProps) {
       type="button"
       key={String(i)}
       onClick={onClick}
-      className={`p-[30px] min-w-[460px] flex items-center bg-white border-solid border relative ${btnClassName}`}
+      className={`p-3xl min-w-[460px] flex items-center bg-white border-solid border relative ${btnClassName}`}
     >
       {slide?.icon ? (
         <Img

package/src/components/InvestmentInfo/InvestmentInfo.tsx

@@ -20,11 +20,11 @@ const investmentCellColorMap: Record<InvestmentCellColor, string> = {
 };
 
 const investmentCellSizeMap: Record<InvestmentCellSize, string> = {
-  XS: 'h-[40px]',
-  S: 'h-[68px]',
-  M: 'h-[102px]',
-  L: 'h-[136px]',
-  XL: 'h-[204px]',
+  XS: 'h-10',
+  S: 'h-16',
+  M: 'h-24',
+  L: 'h-32',
+  XL: 'h-52',
 };
 
 export interface InvestmentInfoProps extends InvestmentInfoContent, UniBlockProps {}

package/src/components/LinkDocs/LinkDocs.tsx

@@ -35,12 +35,12 @@ export const LinkDocs = JSX<LinkDocsProps>(
     return (
       <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
         <Headline
-          className="!p-0"
           title={title}
           description={description}
           align={align}
           headlineVersion="M"
           as="h2"
+          isPadding={false}
         />
         {documents?.length ? (
           <div
@@ -78,7 +78,8 @@ const renderLinkDocItem =
         role="listitem"
       >
         <LinkDocItem
-          {...docBlockDef}
+          text={docBlockDef?.text}
+          target={docBlockDef?.target}
           href={href}
           fileSize={fileSize}
           icon={icon ? <Img className={linkIconStyle} image={icon} width="24" height="24" /> : null}

package/src/components/MobileAppTile/MobileAppTile.tsx

@@ -28,7 +28,7 @@ export const MobileAppTile = JSX<MobileAppTileProps>(
     version = 'primary',
     ...rest
   }) => {
-    const containerStyle = version === 'secondary' ? 'p-m min-w-[120px]' : 'min-w-[92px]';
+    const containerStyle = version === 'secondary' ? 'p-m min-w-32' : 'min-w-24';
 
     return (
       <BlockWrapper

package/src/components/MobileAppTile/renderDescription.tsx

@@ -2,7 +2,7 @@ import { Text } from '../../ui-kit/Text/Text';
 
 export const renderDescription = (description?: string) =>
   description ? (
-    <div className="mb-5 pt-3xs sm:mb-0 sm:pt-0">
+    <div className="mb-lg pt-3xs">
       <Text size="text-xl" font-weight="light">
         {description}
       </Text>

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">