@redneckz/wildless-cms-uni-blocks 0.3.5 → 0.3.6

package/mobile/src/components/Tile/Tile.tsx

@@ -49,9 +49,8 @@ export const Tile = JSX<TileProps>((props) => {
             <Heading
               headingType={getTileHeadingType(className)}
               title={title}
-              className={`whitespace-pre-wrap max-w-[600px] ${
-                version === 'primary' ? 'text-primary-text' : ''
-              }`}
+              className={`whitespace-pre-wrap max-w-[600px] ${title ? 'mb-3' : ''}
+              ${version === 'primary' ? 'text-primary-text' : ''}`}
             />
           )
         }
@@ -64,8 +63,12 @@ export const Tile = JSX<TileProps>((props) => {
       >
         {description && <Description className="mt-4 max-w-[600px]" description={description} />}
         {children}
-        {items?.length ? <List items={items} /> : null}
+        {renderList(items, version)}
       </BaseTile>
     </section>
   );
 });
+
+function renderList(items, version) {
+  return items?.length ? <List items={items} version={version} /> : null;
+}

package/mobile/src/types.ts

@@ -28,10 +28,17 @@ export interface SlotsMap {
 export interface ContentPageMeta {
   title: string;
   slug: string;
+  main: ContentPageMetaMain;
+  og?: Record<string, string>;
+  twitter?: Record<string, string>;
+  jsonLd?: string;
+}
+
+export interface ContentPageMetaMain {
   description?: string;
   keywords?: string[];
+  canonical?: string;
   robots?: string[];
-  og?: Record<string, string>;
 }
 
 export interface ContentPageDef extends ContentPageMeta {

package/mobile/src/ui-kit/BlockItem/BlockItem.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockItemProps, BlockItemVersion } from './BlockItemProps';
 
-const LIST_STYLE_CLASSES = 'rounded-full inline-block mr-3';
+const LIST_STYLE_CLASSES = 'rounded-full inline-block mr-3 mt-2';
 
 const TEXT_STYLE_MAP: Record<BlockItemVersion, string> = {
-  primary: 'text-primary-text',
+  primary: 'text-secondary-text',
   secondary: 'text-white',
   gray: 'text-secondary-text',
 };
@@ -18,8 +18,8 @@ const LIST_STYLE_MAP: Record<BlockItemVersion, string> = {
 export const BlockItem = JSX<BlockItemProps>(
   ({ className = '', isDotted = true, text, children, version = 'primary' }) => {
     return (
-      <div className={`font-sans flex items-center ${className}`} role="listitem">
-        {isDotted && <div className={getListStyle(version)} />}
+      <div className={`font-sans flex items-start ${className}`} role="listitem">
+        {isDotted && <div className={getListStyle(version)} />}!!!!!
         <span className={TEXT_STYLE_MAP[version]}>{text || children}</span>
       </div>
     );

package/mobile/src/ui-kit/Description/Description.tsx

@@ -8,5 +8,5 @@ export interface DescriptionProps extends DescriptionContent {
 export const Description = JSX<DescriptionProps>((props) => {
   const { className, description } = props;
 
-  return <div className={`font-normal text-base ${className || ''}`}>{description}</div>;
+  return <div className={`font-normal text-m-md ${className || ''}`}>{description}</div>;
 });

package/mobile/src/ui-kit/Heading/Heading.tsx

@@ -22,7 +22,7 @@ export const Heading = JSX<HeadingProps>((props) => {
   const Tag = headingType;
 
   return (
-    <Tag className={`font-sans font-medium ${HeadingClass[headingType]} ${className || ''}`}>
+    <Tag className={`font-sans font-medium m-0 ${HeadingClass[headingType]} ${className || ''}`}>
       {title}
     </Tag>
   );

package/mobile/src/ui-kit/List/ListItem.tsx

@@ -11,7 +11,7 @@ export interface ListItemProps {
   isDotted?: boolean;
 }
 
-const LIST_STYLE_CLASSES = 'rounded-full inline-block mr-3';
+const LIST_STYLE_CLASSES = 'rounded-full inline-block mr-3 mt-2';
 
 const TEXT_STYLE_MAP: Record<ListItemVersion, string> = {
   primary: 'text-primary-text',
@@ -28,9 +28,9 @@ const LIST_STYLE_MAP: Record<ListItemVersion, string> = {
 export const ListItem = JSX<ListItemProps>(
   ({ className = '', isDotted = true, children, version = 'primary' }) => {
     return (
-      <div className={`font-sans flex items-center ${className}`} role="listitem">
+      <div className={`font-sans flex items-start ${className}`} role="listitem">
         {isDotted && <div className={getListStyle(version)} />}
-        <span className={TEXT_STYLE_MAP[version]}>{children}</span>
+        <span className={`text-m-md ${TEXT_STYLE_MAP[version]}`}>{children}</span>
       </div>
     );
   },

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlDots.tsx

@@ -15,7 +15,7 @@ export interface SwipeListControlDotsProps {
 export const SwipeListControlDots = JSX<SwipeListControlDotsProps>(
   ({ children, activeIndex, indexFraction, showDots }) => {
     return showDots && children?.length ? (
-      <div className="flex gap-2 mx-auto mt-[22px] w-fit">
+      <div className="flex gap-2 mx-auto mt-5 w-fit">
         {children?.map((_, idx) => (
           <div
             key={String(idx)}

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlItem.tsx

@@ -12,7 +12,11 @@ export interface SwipeListControlItemProps {
 export const SwipeListControlItem = JSX<SwipeListControlItemProps>(
   ({ className = '', children, ...rest }) => {
     return (
-      <div className={`snap-center snap-always min-w-full ${className}`} role="listitem" {...rest}>
+      <div
+        className={`snap-center snap-always min-w-full box-border ${className}`}
+        role="listitem"
+        {...rest}
+      >
         {children}
       </div>
     );

package/package.json

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

package/src/components/BaseTile/BaseTile.tsx

@@ -9,8 +9,8 @@ export const BaseTile = JSX<BaseTileProps>(
     return (
       <div className={`font-sans flex flex-col grow h-full items-start ${className}`}>
         {title}
-        <div className={`flex grow w-full justify-between`}>
-          <div className={`flex flex-col justify-between`}>
+        <div className="flex grow w-full justify-between">
+          <div className="flex flex-col justify-between w-full">
             <div>{children}</div>
             <div>{buttons}</div>
           </div>

package/src/components/Blocks.mobile.ts

@@ -1,11 +1,11 @@
 import { Accordion } from './Accordion/Accordion';
 import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
 import { Footer } from './Footer/Footer';
+import { Gallery } from './Gallery/Gallery';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
 import { LinkDocs } from './LinkDocs/LinkDocs';
 import { MobileAppTile } from './MobileAppTile/MobileAppTile';
-import { Placeholder } from './Placeholder/Placeholder';
 import { ProductBlock } from './ProductBlock/ProductBlock';
 import { ProductGallery } from './ProductGallery/ProductGallery';
 import { StepsBlock } from './StepsBlock/StepsBlock';
@@ -15,11 +15,11 @@ export const Blocks = {
   Accordion,
   ExchangeRateTile,
   Footer,
+  Gallery,
   Header,
   Headline,
   LinkDocs,
   MobileAppTile,
-  Placeholder,
   ProductBlock,
   ProductGallery,
   StepsBlock,

package/src/components/Blocks.ts

@@ -12,7 +12,6 @@ import { MiniGallery } from './MiniGallery/MiniGallery';
 import { MobileAppTile } from './MobileAppTile/MobileAppTile';
 import { Navigation } from './Navigation/Navigation';
 import { PictureText } from './PictureText/PictureText';
-import { Placeholder } from './Placeholder/Placeholder';
 import { ProductBlock } from './ProductBlock/ProductBlock';
 import { ProductGallery } from './ProductGallery/ProductGallery';
 import { ProductTile } from './ProductTile/ProductTile';
@@ -36,7 +35,6 @@ export const Blocks = {
   MiniGallery,
   MobileAppTile,
   PictureText,
-  Placeholder,
   ProductBlock,
   ProductGallery,
   ProductTile,

package/src/components/ComparisonTable/ComparisonTable.fixture.tsx

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

package/src/components/ContentPage/ContentPage.page.json

@@ -1,13 +1,20 @@
 {
   "title": "Кредиты",
   "slug": "credits",
-  "description": "Акционерное общество «Российский Сельскохозяйственный банк»* — один из крупнейших банков в России. Созданный в 2000 году в целях развития национальной кредитно-финансовой системы.",
-  "keywords": ["кредит", "акция"],
-  "robots": ["index", "follow"],
+  "main": {
+    "description": "Акционерное общество «Российский Сельскохозяйственный банк»* — один из крупнейших банков в России. Созданный в 2000 году в целях развития национальной кредитно-финансовой системы.",
+    "keywords": ["кредит", "акция"],
+    "canonical": "canonical url",
+    "robots": ["index", "follow"]
+  },
   "og": {
     "type": "article",
     "url": "https://foo.com/bar/baz"
   },
+  "twitter": {
+    "card": "summary_large_image"
+  },
+  "jsonLd": "json",
   "date": "2022-04-08",
   "style": ["bg-secondary-light"],
   "likeControl": true,
@@ -121,7 +128,13 @@
                 "size": {
                   "width": 280,
                   "height": 280
-                }
+                },
+                "sources": [
+                  {
+                    "src": "money-2.png 1x, money-2-2x.png 2x",
+                    "format": "png"
+                  }
+                ]
               }
             }
           },

package/src/components/ContentPage/ContentPageHead.tsx

@@ -7,7 +7,13 @@ export interface ContentPageHeadProps {
 }
 
 export const ContentPageHead = JSX<ContentPageHeadProps>(({ HeadComponent, data, children }) => {
-  const { title, description, keywords, robots, og } = data;
+  const {
+    title,
+    main: { description, keywords, canonical, robots },
+    og,
+    twitter,
+    jsonLd,
+  } = data;
   return (
     <HeadComponent>
       <title>{title}</title>
@@ -20,6 +26,13 @@ export const ContentPageHead = JSX<ContentPageHeadProps>(({ HeadComponent, data,
             <meta key={key} name={`og:${key}`} content={value} />
           ))
         : null}
+      {twitter
+        ? Object.entries(twitter).map(([key, value]) => (
+            <meta key={key} name={`twitter:${key}`} content={value} />
+          ))
+        : null}
+      {canonical && <link rel="canonical" href={canonical} />}
+      {jsonLd && <script type="application/ld+json">{jsonLd}</script>}
       {children}
     </HeadComponent>
   );

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -44,7 +44,7 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
               <Heading
                 headingType={getTileHeadingType(className)}
                 title={title}
-                className={`whitespace-pre-wrap max-w-[600px]`}
+                className={`whitespace-pre-wrap max-w-[600px] ${title ? 'mb-3' : ''}`}
               />
             )
           }

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

@@ -48,7 +48,7 @@ const cards = [
   {
     image,
     title: 'Вклады в любой валюте',
-    itemsMobile: defaultItems,
+    items: defaultItems,
   },
   {
     title: 'Вклады в любой валюте',

package/src/components/Gallery/GalleryCardInner.tsx

@@ -3,10 +3,11 @@ import type { BlockVersion } from '../../model/BlockVersion';
 import { BlockItem } from '../../ui-kit/BlockItem/BlockItem';
 import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img/Img';
-import type { GalleryCard, GalleryItem } from './GalleryContent';
+import type { GalleryCard } from './GalleryContent';
 
 export const GalleryCardInner = JSX<GalleryCard>(
   ({ title, description, image, items, button, version }) => {
+    const titleStyleClasses = getTitleStyle(version, description, items);
     return (
       <div>
         <div>
@@ -15,15 +16,11 @@ export const GalleryCardInner = JSX<GalleryCard>(
               <Img className="mb-6" image={image} />
             </div>
           ) : null}
-          {title && renderCardTitle(title, description, items)}
-          {description ? <div className={`font-normal text-sm mt-2`}>{description}</div> : null}
-          {items?.length ? (
-            <section className={`max-w-[308px] mt-2`} role="list">
-              {items
-                .filter((item) => item?.text)
-                .map((item, i) => renderItem(item.text as string, i, version))}
-            </section>
+          {title ? renderCardTitle(title, titleStyleClasses) : null}
+          {description ? (
+            <div className={`font-normal text-sm ${title ? 'mt-2' : ''}`}>{description}</div>
           ) : null}
+          {items?.length ? renderItems(items, version) : null}
         </div>
         {button?.text && <Button className="mt-6" {...button} />}
       </div>
@@ -31,13 +28,17 @@ export const GalleryCardInner = JSX<GalleryCard>(
   },
 );
 
-function renderCardTitle(title: string, description?: string, items?: GalleryItem[]) {
+function renderCardTitle(title: string, className: string) {
+  return <div className={`font-medium text-xl m-0 ${className}`}>{title}</div>;
+}
+
+function renderItems(items, version) {
   return (
-    <div
-      className={`font-medium text-xl m-0 ${!description && !items?.length ? 'text-center' : ''}`}
-    >
-      {title}
-    </div>
+    <section className={`max-w-[308px] mt-2`} role="list">
+      {items
+        .filter((item) => item?.text)
+        .map((item, i) => renderItem(item.text as string, i, version))}
+    </section>
   );
 }
 
@@ -48,3 +49,10 @@ function renderItem(item: string, i: number, version?: BlockVersion) {
     </BlockItem>
   );
 }
+
+function getTitleStyle(version, description, items) {
+  return `font-medium text-xl m-0
+        ${version !== 'secondary' ? 'text-primary-text' : ''}
+        ${!description && !items?.length ? 'text-center' : ''}
+      `;
+}

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

@@ -32,7 +32,7 @@ export const Header = JSX<HeaderProps>(
 
     return (
       <header className={`${bgColor} ${className}`}>
-        <div className="container px-4 py-0">
+        <div className="container px-4 py-0 box-border">
           <HeaderTop onClick={toggleBurgerMenu} bgColor={bgColor} />
           <nav className="flex items-center m-0 p-0 overflow-y-hidden w-full h-[50px]">
             <div className="flex">

package/src/components/Header/HeaderBurger.tsx

@@ -18,8 +18,8 @@ export const HeaderBurger = JSX<HeaderBurgerProps>(
     const [city, getCity] = context.useGeolocation(defaultLocation);
 
     return (
-      <div className="absolute top-0 left-0 w-full h-full bg-white p-4">
-        <button className="absolute top-4 right-4" onClick={onClick}>
+      <div className="absolute top-0 left-0 w-full h-full bg-white p-4 box-border z-20">
+        <button className="absolute top-4 right-4 border-none bg-transparent" onClick={onClick}>
           <Icon name="CloseIcon" width="24" height="24" asSVG />
         </button>
         <Button onClick={getCity} className="flex items-center text-sm text-secondary-text mb-4">

package/src/components/Header/HeaderTop.tsx

@@ -11,7 +11,7 @@ export interface HeaderTopProps {
 export const HeaderTop = JSX<HeaderTopProps>(({ onClick, bgColor }) => (
   <div className="flex items-center justify-between border-0 border-b border-main-divider h-[50px]">
     <div className="flex items-center">
-      <button className="pr-4" onClick={onClick} aria-label="Открыть меню">
+      <button className="pr-4 border-0 bg-transparent" onClick={onClick} aria-label="Открыть меню">
         <Icon
           name={bgColor === 'bg-white' ? 'BurgerIcon' : 'BurgerIconWhite'}
           width="24"
@@ -21,7 +21,11 @@ export const HeaderTop = JSX<HeaderTopProps>(({ onClick, bgColor }) => (
       </button>
       <Logo bgColor={bgColor} />
     </div>
-    <button className={`${bgColor === 'bg-white' ? 'text-primary-main' : 'text-white'} text-sm`}>
+    <button
+      className={`${
+        bgColor === 'bg-white' ? 'text-primary-main' : 'text-white'
+      } text-sm  border-0 bg-transparent`}
+    >
       Войти
     </button>
   </div>

package/src/components/LinkDocs/LinkDocsListItem.mobile.tsx

@@ -4,7 +4,7 @@ import type { LinkDocsListItemProps } from './LinkDocsListItemBase';
 
 export const LinkDocsListItem = JSX<LinkDocsListItemProps>(({ className = '', doc, icon }) => (
   <LinkDocsListItemBase
-    className={`flex h-full ${className}`}
+    className={`flex h-full box-border ${className}`}
     iconClassName="mr-3 min-w-6 min-h-6"
     doc={doc}
     icon={icon}

package/src/components/LinkDocs/LinkDocsListItem.tsx

@@ -4,7 +4,7 @@ import type { LinkDocsListItemProps } from './LinkDocsListItemBase';
 
 export const LinkDocsListItem = JSX<LinkDocsListItemProps>(({ className = '', doc, icon }) => (
   <LinkDocsListItemBase
-    className={className}
+    className={`flex h-full box-border ${className}`}
     iconClassName="mr-2.5 min-w-6 min-h-6 text-primary-text"
     textClassName="self-center"
     suffixClassName="text-secondary-text group-hover:text-primary-main"

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

@@ -7,8 +7,8 @@ const image: Picture = {
   format: 'webp',
   alt: 'Потребительский кредит наличными',
   size: {
-    width: 280,
-    height: 280,
+    width: 234,
+    height: 234,
   },
   sources: [
     {

package/src/components/ProductBlock/ProductBlockInner.mobile.tsx

@@ -25,7 +25,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
     version = 'primary',
   }) => {
     return (
-      <div className={`${className}`}>
+      <div className={`w-full text-primary-text ${className}`}>
         <div>
           <BaseTile
             context={context}
@@ -34,31 +34,37 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
                 <Heading
                   headingType={headingType}
                   title={title}
-                  className={`whitespace-pre-wrap max-w-[600px]`}
+                  className={`whitespace-pre-wrap max-w-[600px] ${title ? 'mb-3' : ''}`}
                 />
               )
             }
             buttons={
               buttons?.length ? (
-                <ButtonSection context={context} buttons={buttons} className="flex mt-9 gap-3" />
+                <ButtonSection
+                  context={context}
+                  buttons={buttons}
+                  className="flex flex-col mt-5 gap-2.5"
+                />
               ) : null
             }
           >
             {description && <Description description={description} />}
             {benefits?.length ? (
-              <div className="mt-[19px]">
-                {benefits.map((_, i) => renderBenefit(_, i, version))}
-              </div>
+              <div className="mt-5">{benefits.map((_, i) => renderBenefit(_, i, version))}</div>
             ) : null}
             {items?.length ? <List items={items} /> : null}
           </BaseTile>
         </div>
-        {image?.src && (
-          <div className="mt-5">
-            <Img image={{ className: 'block', ...image }} />
-          </div>
-        )}
+        {renderImage(image)}
       </div>
     );
   },
 );
+
+function renderImage(image) {
+  return image?.src ? (
+    <div className="mt-5">
+      <Img image={{ className: 'block', ...image }} />
+    </div>
+  ) : null;
+}

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -25,7 +25,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
     version = 'primary',
   }) => {
     return (
-      <div className={`flex grow justify-between items-stretch ${className}`}>
+      <div className={`flex grow justify-between items-stretch text-primary-text ${className}`}>
         <div className={'flex flex-col'}>
           <BaseTile
             context={context}
@@ -52,7 +52,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
                 {benefits.map((_, i) => renderBenefit(_, i, version))}
               </div>
             ) : null}
-            {items?.length ? <List items={items} /> : null}
+            {items?.length ? <List className="mt-5" items={items} /> : null}
           </BaseTile>
         </div>
         {image?.src && <Img className="mt-auto" image={image} />}

package/src/components/ProductBlock/renderBenefit.mobile.tsx

@@ -16,14 +16,14 @@ export function renderBenefit(benefit: Benefit, i: number, version: string) {
     <div key={String(i)} className="flex gap-3 items-center mb-2.5 last:mb-0">
       {benefit.icon && (
         <Icon
-          className="w-[25px] h-[25px] rounded-full box-border"
+          className="w-6 h-6 rounded-full box-border"
           name={benefit.icon}
           width="24"
           height="24"
           asSVG
         />
       )}
-      <div className={`font-medium text-m-base m-0 ${benefitTitleStyleMap[version]}`}>
+      <div className={`font-medium text-m-title-xs m-0 ${benefitTitleStyleMap[version]}`}>
         {benefit.label}
       </div>
       {benefit.description && (

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

@@ -26,6 +26,12 @@ const worker: Picture = {
     width: 280,
     height: 280,
   },
+  sources: [
+    {
+      src: 'money-2.png 1x, money-2-2x.png 2x',
+      format: 'png',
+    },
+  ],
 };
 
 const creditCard: Picture = {
@@ -39,6 +45,98 @@ const creditCard: Picture = {
 };
 
 export default {
+  default: (
+    <div className="p-2">
+      <div className="container grid grid-cols-12">
+        <ProductGallery
+          className="col-span-12"
+          context={context}
+          slides={[
+            {
+              productBlock: {
+                title: 'Акция «Кредит на все, что хочется!»',
+                items: [
+                  'Потребительский кредит по специальной процентной ставке',
+                  'Получите деньги без залога и поручительства',
+                  'Кредитный лимит до 5 млн рублей',
+                ],
+                buttons: [
+                  {
+                    href: 'https://rshb.ru',
+                    text: 'Подробнее',
+                    target: '_blank',
+                    version: 'primary',
+                  },
+                ],
+                image: moneyImage,
+              },
+            },
+            {
+              productBlock: {
+                title: 'Ставка от 12,5% годовых на срок до 3 лет!',
+                items: [
+                  'Потребительский кредит по специальной процентной ставке',
+                  'Получите деньги без залога и поручительства',
+                  'Кредитный лимит до 5 млн рублей',
+                ],
+                buttons: [
+                  {
+                    href: 'https://rshb.ru',
+                    text: 'Подробнее',
+                    target: '_blank',
+                    version: 'primary',
+                  },
+                ],
+                image: worker,
+              },
+            },
+            {
+              nav: {
+                title: 'Выгодно покупать',
+                desc: 'Дополнительные бонусные баллы за покупки',
+              },
+              productBlock: {
+                title: 'Дополнительные бонусные баллы за покупки!',
+                items: [
+                  'Потребительский кредит по специальной процентной ставке',
+                  'Получите деньги без залога и поручительства',
+                  'Кредитный лимит до 5 млн рублей',
+                ],
+                buttons: [
+                  {
+                    href: 'https://rshb.ru',
+                    text: 'Подробнее',
+                    target: '_blank',
+                    version: 'primary',
+                  },
+                ],
+                image: creditCard,
+              },
+            },
+            {
+              productBlock: {
+                title: 'Карты Unionpay',
+                items: [
+                  'Потребительский кредит по специальной процентной ставке',
+                  'Получите деньги без залога и поручительства',
+                  'Кредитный лимит до 5 млн рублей',
+                ],
+                buttons: [
+                  {
+                    href: 'https://rshb.ru',
+                    text: 'Подробнее',
+                    target: '_blank',
+                    version: 'primary',
+                  },
+                ],
+                image: creditCard,
+              },
+            },
+          ]}
+        />
+      </div>
+    </div>
+  ),
   primary: (
     <div className="p-2">
       <div className="container grid grid-cols-12">