@redneckz/wildless-cms-uni-blocks 0.3.26 → 0.3.29

package/src/components/MobileAppTile/MobileAppTile.tsx

@@ -11,12 +11,20 @@ import type { MobileAppTileContent } from './MobileAppTileContent';
 export interface MobileAppTileProps extends MobileAppTileContent, UniBlockProps {}
 
 export const MobileAppTile = JSX<MobileAppTileProps>(
-  ({ className = '', context, title = 'Мобильное приложение', qr, buttons = [] }) => {
+  ({
+    className = '',
+    context,
+    title = 'Мобильное приложение',
+    qr,
+    buttons = [],
+    anchor = null,
+  }) => {
     return (
       <section
         className={`bg-white text-primary-text font-sans p-9 box-border ${className}  ${getTileRightPadding(
           className,
         )} ${getTileMinHeight(className)} `}
+        id={anchor}
       >
         <BaseTile
           context={context}

package/src/components/Navigation/Navigation.tsx

@@ -7,33 +7,36 @@ import { NavigationItem } from './NavigationItem';
 
 export interface NavigationProps extends NavigationContent, UniBlockProps {}
 
-export const Navigation = JSX<NavigationProps>(({ className, context, title, buttons }) => {
-  const router = context.useRouter();
-  const { handlerDecorator } = context;
+export const Navigation = JSX<NavigationProps>(
+  ({ className, context, title, buttons, anchor = null }) => {
+    const router = context.useRouter();
+    const { handlerDecorator } = context;
 
-  const activeButton = findActiveSubItem(router)(buttons);
+    const activeButton = findActiveSubItem(router)(buttons);
 
-  return (
-    <section
-      className={`font-sans text-primary-text rounded-[40px] flex items-center justify-between ${
-        className || ''
-      }`}
-    >
-      <h2 className="font-medium text-xl m-0">{title}</h2>
-      {buttons?.length ? (
-        <div className="flex rounded-md overflow-hidden bg-white">
-          {buttons
-            .filter(({ text }) => text)
-            .map((button, i) => (
-              <NavigationItem
-                key={String(i)}
-                className="first:rounded-tl-md first:rounded-bl-md last:rounded-tr-md last:rounded-br-md"
-                isActive={button === activeButton}
-                {...useLink({ router, handlerDecorator }, button)}
-              />
-            ))}
-        </div>
-      ) : null}
-    </section>
-  );
-});
+    return (
+      <section
+        className={`font-sans text-primary-text rounded-[40px] flex items-center justify-between ${
+          className || ''
+        }`}
+        id={anchor}
+      >
+        <h2 className="font-medium text-xl m-0">{title}</h2>
+        {buttons?.length ? (
+          <div className="flex rounded-md overflow-hidden bg-white">
+            {buttons
+              .filter(({ text }) => text)
+              .map((button, i) => (
+                <NavigationItem
+                  key={String(i)}
+                  className="first:rounded-tl-md first:rounded-bl-md last:rounded-tr-md last:rounded-br-md"
+                  isActive={button === activeButton}
+                  {...useLink({ router, handlerDecorator }, button)}
+                />
+              ))}
+          </div>
+        ) : null}
+      </section>
+    );
+  },
+);

package/src/components/NavigatorTabs/NavigatorTabItem.tsx

@@ -0,0 +1,29 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { NavigatorTab } from './NavigatorTabsContent';
+
+export interface NavigatorTabItemProps extends NavigatorTab {
+  active?: boolean;
+  className?: string;
+  onClick?: (ev: MouseEvent) => void;
+}
+
+const TEXT_CLASSES = 'font-sans font-normal text-sm';
+const LINK_CLASSES = 'flex-1 flex items-center justify-center';
+
+export const NavigatorTabItem = JSX<NavigatorTabItemProps>(
+  ({ className = '', label, active, children, onClick, anchor }) => (
+    <a className={getLinkClasses(className, active)} href={`#${anchor}`} onClick={onClick}>
+      <span className={getTextClasses(active)}>{label || children}</span>
+    </a>
+  ),
+);
+
+const getLinkClasses = (className: string, active?: boolean) => {
+  const classes = active ? 'bg-primary-main' : 'bg-white';
+  return `${classes} ${LINK_CLASSES} ${className}`;
+};
+
+const getTextClasses = (active?: boolean) => {
+  const classes = active ? 'text-white' : 'text-secondary-text hover:text-primary-main';
+  return `${classes} ${TEXT_CLASSES}`;
+};

package/src/components/NavigatorTabs/NavigatorTabs.example.json

@@ -0,0 +1,7 @@
+{
+  "navigatorTabs": [
+    { "label": "Tab1", "anchor": "tab1" },
+    { "label": "Tab2", "anchor": "tab2" },
+    { "label": "Tab3", "anchor": "tab3" }
+  ]
+}

package/src/components/NavigatorTabs/NavigatorTabs.fixture.tsx

@@ -0,0 +1,11 @@
+import { context } from '../../setup-fixture';
+import { NavigatorTabs } from './NavigatorTabs';
+import tabsExample from './NavigatorTabs.example.json';
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12">
+      <NavigatorTabs context={context} className="col-span-12" {...tabsExample} />
+    </div>
+  ),
+};

package/src/components/NavigatorTabs/NavigatorTabs.tsx

@@ -0,0 +1,36 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { UniBlockProps } from '../../types';
+import { getHash } from '../../utils/url';
+import type { Router } from '../ContentPage/ContentPageContext';
+import { NavigatorTabItem } from './NavigatorTabItem';
+import type { NavigatorTab, NavigatorTabsContent } from './NavigatorTabsContent';
+
+export interface TabsBlockProps extends NavigatorTabsContent, UniBlockProps {}
+
+export const NavigatorTabs = JSX<TabsBlockProps>(
+  ({ className = '', navigatorTabs, context, anchor = null }) => {
+    const router = context.useRouter();
+    const hash = getHash(router.href);
+    return (
+      <section
+        className={`sticky top-0 z-20 box-border flex gap-x-1 h-12 ${className}`}
+        id={anchor}
+      >
+        {navigatorTabs ? navigatorTabs.map(renderTab(hash, router)) : null}
+      </section>
+    );
+  },
+);
+
+const renderTab = (hash?: string, router?: Router) => (tab: NavigatorTab, i: number) => {
+  const anchorHash = `#${tab.anchor}`;
+  const active = hash ? anchorHash === hash : i === 0;
+  return (
+    <NavigatorTabItem
+      key={tab.anchor}
+      active={active}
+      onClick={() => router?.replace(anchorHash)}
+      {...tab}
+    />
+  );
+};

package/src/components/NavigatorTabs/NavigatorTabsContent.ts

@@ -0,0 +1,20 @@
+/**
+ * @title Таб
+ */
+export interface NavigatorTab {
+  /** @title Название */
+  label?: string;
+  /** @title Якорь */
+  anchor?: string;
+}
+
+/**
+ * @title Блок табов
+ */
+export interface NavigatorTabsContent {
+  /**
+   * @title Список табов
+   * @minItems 3
+   */
+  navigatorTabs?: NavigatorTab[];
+}

package/src/components/PictureText/PictureText.tsx

@@ -9,19 +9,24 @@ import { Benefit } from '../BenefitsBlock/BenefitsBlockContent';
 
 export interface PictureTextProps extends PictureTextContent, UniBlockProps {}
 
-export const PictureText = JSX<PictureTextProps>(({ className = '', title, image, benefits }) => {
-  return (
-    <section className={`relative font-sans text-primary-text bg-white p-14 ${className}`}>
-      <Heading headingType="h2" className="text-center" title={title} />
-      <div className={'flex justify-center mt-9'}>
-        {image?.src && <Img className="mr-6" image={image} />}
-        {benefits?.length ? (
-          <div className="flex flex-col">{benefits.map(renderBenefit)}</div>
-        ) : null}
-      </div>
-    </section>
-  );
-});
+export const PictureText = JSX<PictureTextProps>(
+  ({ className = '', title, image, benefits, anchor = null }) => {
+    return (
+      <section
+        className={`relative font-sans text-primary-text bg-white p-14 ${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} />}
+          {benefits?.length ? (
+            <div className="flex flex-col">{benefits.map(renderBenefit)}</div>
+          ) : null}
+        </div>
+      </section>
+    );
+  },
+);
 
 function renderBenefit(benefit: Benefit, i: number) {
   return (

package/src/components/Placeholder/Placeholder.tsx

@@ -15,12 +15,13 @@ export interface PlaceholderProps extends PlaceholderContent, UniBlockProps {
 const GOLDEN_RATIO = 1.618;
 
 export const Placeholder = JSX<PlaceholderProps>(
-  ({ className, context, title, description = 'Блок в разработке...' }) => {
+  ({ className, context, title, description = 'Блок в разработке...', anchor = null }) => {
     return (
       <section
         className={`bg-white text-primary-text font-sans p-9 box-border ${className} ${getTileRightPadding(
           className,
         )} ${getTileMinHeight(className)} `}
+        id={anchor}
       >
         <BaseTile
           context={context}

package/src/components/ProductBlock/ProductBlock.tsx

@@ -20,14 +20,23 @@ const breadcrumbsStyleMap: Record<BlockVersion, string> = {
 };
 
 export const ProductBlock = JSX<ProductBlockProps>((props) => {
-  const { context, className, breadcrumbs, version = 'primary' } = props;
+  const {
+    context,
+    className,
+    breadcrumbs,
+    version = 'primary',
+    anchor = null,
+    ...otherProps
+  } = props;
   const router = context.useRouter();
   const { handlerDecorator } = context;
+
   return (
     <section
       className={`font-sans pt-10 pl-[50px] pb-[50px] pr-[7.5rem] box-border min-h-[420px] ${
         className || ''
       } ${productBlockStyleMap[version]}`}
+      id={anchor}
     >
       {breadcrumbs?.length ? (
         <div className="text-xs mb-6">
@@ -44,7 +53,7 @@ export const ProductBlock = JSX<ProductBlockProps>((props) => {
           )}
         </div>
       ) : null}
-      <ProductBlockInner {...props} />
+      <ProductBlockInner context={context} version={version} {...otherProps} />
     </section>
   );
 });

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

@@ -86,7 +86,9 @@ const labelStyleMap: Record<BlockVersion, string> = {
 };
 
 const renderLabel = (label: string, version: BlockVersion) => (
-  <div className={`m-xs px-2.5 py-1.5 mb-5 rounded-md border-2 w-fit ${labelStyleMap[version]}`}>
+  <div
+    className={`m-xs px-2.5 py-1.5 mb-5 rounded-md border-2 border-solid w-fit ${labelStyleMap[version]}`}
+  >
     {label}
   </div>
 );

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -45,7 +45,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
             ) : null}
             {items?.length ? (
               <List
-                className="mt-5"
+                className="mt-5 text-m-base"
                 items={items}
                 itemClassName="mb-[10px]"
                 version={version}

package/src/components/ProductGallery/ProductGallery.tsx

@@ -7,13 +7,16 @@ import type { ProductGalleryContent } from './ProductGalleryContent';
 export interface ProductGalleryProps extends ProductGalleryContent, UniBlockProps {}
 
 export const ProductGallery = JSX<ProductGalleryProps>(
-  ({ className, context, duration = 0, slides = [] }) => {
+  ({ className, context, duration = 0, slides = [], 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={`font-sans bg-white overflow-hidden w-100 ${className || ''}`}>
+      <section
+        className={`font-sans bg-white overflow-hidden w-100 ${className || ''}`}
+        id={anchor}
+      >
         <div
           className={`flex duration-1000`}
           style={{ transform: `translateX(-${activeSlideIndex}00%)` }}

package/src/components/ProductGalleryGreen/ProductGalleryGreen.tsx

@@ -8,7 +8,7 @@ import type { ProductGalleryGreenContent } from './ProductGalleryGreenContent';
 export interface ProductGalleryProps extends ProductGalleryGreenContent, UniBlockProps {}
 
 export const ProductGalleryGreen = JSX<ProductGalleryProps>(
-  ({ className = '', context, slides = [] }) => {
+  ({ className = '', context, slides = [], anchor = null }) => {
     const galleryNav = slides.map((s) => s.nav);
     const galleryBlocks = slides.map((s) => s.productBlock);
     const [activeSlideIndex, setActiveSlideIndex] = context.useState(0);
@@ -16,6 +16,7 @@ export const ProductGalleryGreen = JSX<ProductGalleryProps>(
     return (
       <section
         className={`box-border pt-[70px] relative font-sans overflow-hidden bg-primary-main w-100 ${className}`}
+        id={anchor}
       >
         <div
           className="flex duration-1000 pb-14"
@@ -75,9 +76,13 @@ function renderNavButton({ slide, i, activeSlideIndex, onClick }) {
   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:py-[26px] hover:py-[26px] ease-in duration-300';
-  const btnTitleClassName = isActiveBtn ? 'text-primary-text' : 'text-white';
-  const btnDescClassName = isActiveBtn ? 'text-secondary-text' : 'text-white';
+    : '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';
 
   return (
     <button
@@ -90,8 +95,8 @@ function renderNavButton({ slide, i, activeSlideIndex, onClick }) {
       `}
     >
       <div className="border-0 px-6">
-        <div className={`text-sm font-medium pb-[3px] ${btnTitleClassName}`}>{slide?.title}</div>
-        <div className={`text-xs text-secondary-text ${btnDescClassName}`}>{slide.description}</div>
+        <div className={`font-medium ${btnTitleClassName}`}>{slide?.title}</div>
+        <div className={`text-secondary-text ${btnDescClassName}`}>{slide.description}</div>
       </div>
     </button>
   );

package/src/components/ProductTile/ProductTile.tsx

@@ -29,12 +29,14 @@ export const ProductTile = JSX<ProductTileProps>(
     buttons,
     image,
     version = 'primary',
+    anchor = null,
   }) => {
     return (
       <section
         className={`bg-white text-primary-text font-sans p-9 box-border ${className} ${
           productTileStyleMap[version]
         } ${getTileRightPadding(className)} ${getTileMinHeight(className)} `}
+        id={anchor}
       >
         <BaseTile
           context={context}

package/src/components/PromoTile/PromoTile.tsx

@@ -25,12 +25,14 @@ export const PromoTile = JSX<PromoTileProps>(
     description,
     buttons = [],
     version = 'primary',
+    anchor = null,
   }) => {
     return (
       <section
         className={`bg-white text-primary-text font-sans p-9 box-border ${className} ${
           promoTileStyleMap[version]
         } ${getTileRightPadding(className)} ${getTileMinHeight(className)} `}
+        id={anchor}
       >
         <BaseTile
           context={context}

package/src/components/Recommendation/Recommendation.tsx

@@ -12,7 +12,7 @@ const CARD_SHIFT = 525;
 export interface RecommendationProps extends RecommendationContent, UniBlockProps {}
 
 export const Recommendation = JSX<RecommendationProps>(
-  ({ context, recommendations = [], className = '', title, version }) => {
+  ({ context, recommendations = [], className = '', title, version, anchor = null }) => {
     const [activeCardIndex, setActiveCardIndex] = context.useState(0);
 
     const blockClassName =
@@ -22,6 +22,7 @@ export const Recommendation = JSX<RecommendationProps>(
     return (
       <section
         className={`relative font-sans p-[50px] overflow-hidden ${blockClassName} ${className}`}
+        id={anchor}
       >
         {title ? <Heading headingType="h3" className="mb-8" title={title} /> : null}
         <div

package/src/components/StepsBlock/StepsBlock.tsx

@@ -7,29 +7,32 @@ import type { Step, StepsBlockContent } from './StepsBlockContent';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
-export const StepsBlock = JSX<StepsBlockProps>(({ className, title, showLines = true, steps }) => {
-  return (
-    <section
-      className={`box-border font-sans text-primary-text bg-white px-20 py-[50px] flex flex-col items-center ${
-        className || ''
-      }`}
-    >
-      <Heading headingType="h2" className="max-w-[47rem] text-center" title={title} />
-      {steps?.length ? (
-        <div className={`box-border py-0.5 mb-0.5 ${title ? 'mt-9' : ''}`}>
-          <div className="flex items-center px-[88px]">
-            {joinList(
-              <div
-                className={`h-0.5 w-full bg-secondary-light ${!showLines ? 'opacity-0' : ''}`}
-              />,
-            )(steps.map((step, i) => renderStepIcon(step, i)))}
+export const StepsBlock = JSX<StepsBlockProps>(
+  ({ className, title, showLines = true, steps, anchor = null }) => {
+    return (
+      <section
+        className={`box-border font-sans text-primary-text bg-white px-20 py-[50px] flex flex-col items-center ${
+          className || ''
+        }`}
+        id={anchor}
+      >
+        <Heading headingType="h2" className="max-w-[47rem] text-center" title={title} />
+        {steps?.length ? (
+          <div className={`box-border py-0.5 mb-0.5 ${title ? 'mt-9' : ''}`}>
+            <div className="flex items-center px-[88px]">
+              {joinList(
+                <div
+                  className={`h-0.5 w-full bg-secondary-light ${!showLines ? 'opacity-0' : ''}`}
+                />,
+              )(steps.map((step, i) => renderStepIcon(step, i)))}
+            </div>
+            <div className="flex justify-between gap-x-[101px]">{steps.map(renderStepTitle)}</div>
           </div>
-          <div className="flex justify-between gap-x-[101px]">{steps.map(renderStepTitle)}</div>
-        </div>
-      ) : null}
-    </section>
-  );
-});
+        ) : null}
+      </section>
+    );
+  },
+);
 
 const renderStepIcon = (step: Step, i: number) => {
   return (

package/src/components/TariffsTable/TariffsTable.tsx

@@ -15,7 +15,7 @@ import { TariffsTableRow } from './TariffsTableRow';
 export interface TariffsTableProps extends TariffsTableContent, UniBlockProps {}
 
 export const TariffsTable = JSX<TariffsTableProps>(
-  ({ className, context, title, description, rowHeaders, columns }) => {
+  ({ className, context, title, description, rowHeaders, columns, anchor = null }) => {
     const [activeCardIndex, setActiveCardIndex] = context.useState(0);
 
     const colData = getColData(columns);
@@ -34,6 +34,7 @@ export const TariffsTable = JSX<TariffsTableProps>(
         className={`bg-white font-sans py-[50px] pl-[50px] overflow-hidden text-primary-text relative ${
           className || ''
         }`}
+        id={anchor}
       >
         {title ? (
           <Heading

package/src/components/TextBlock/TextBlock.tsx

@@ -31,11 +31,20 @@ const textBlockStyleMaps: Record<
 };
 
 export const TextBlock = JSX<TextBlockProps>(
-  ({ title, description, blockVersion = 'primary', iconVersion, image, className }) => {
+  ({
+    title,
+    description,
+    blockVersion = 'primary',
+    iconVersion,
+    image,
+    className,
+    anchor = null,
+  }) => {
     const textBlockStyleMap = textBlockStyleMaps[blockVersion];
     return (
       <section
         className={`font-sans px-9 py-4 flex ${textBlockStyleMap.background} ${className || ''}`}
+        id={anchor}
       >
         {iconVersion === 'small' ? renderIcon(textBlockStyleMap.icon) : null}
         {iconVersion === 'big' ? renderImage(image) : null}

package/src/components/Tile/Tile.tsx

@@ -33,6 +33,7 @@ export const Tile = JSX<TileProps>((props) => {
     className = '',
     version = 'primary',
     role,
+    anchor = null,
   } = props;
 
   return (
@@ -41,6 +42,7 @@ export const Tile = JSX<TileProps>((props) => {
         tileStyleMap[version]
       } ${getTileRightPadding(className)} ${getTileMinHeight(className)} `}
       role={role}
+      id={anchor}
     >
       <BaseTile
         context={context}

package/src/services/sitemap/isTopItemActive.spec.ts

@@ -5,6 +5,7 @@ const router: Router = {
   href: 'https://foo.ru/natural/credits',
   pathname: '/natural',
   push: () => undefined,
+  replace: () => undefined,
   query: {},
 };
 

package/src/setup-fixture.ts

@@ -11,16 +11,28 @@ const TEST_ORIGIN = 'http://localhost:5001';
 
 const DaData = DaDataAPI('https://10.80.4.9');
 
-export const context: ContentPageContext = {
-  useState,
-  useRouter: () => ({
-    href: `${TEST_ORIGIN}/credits`,
+const Router = () => {
+  const [href, setHref] = useState<string>(globalThis.location.href);
+
+  return {
+    href: href,
     pathname: '/credits',
     query: {},
-    push: (url: string) => {
-      console.log(url);
+    push: (url?: string) => {
+      if (!url) return;
+      globalThis.history.pushState(null, '', url);
+      setHref(globalThis.location.href);
     },
-  }),
+    replace: (url?: string) => {
+      if (!url) return;
+      globalThis.history.replaceState(null, '', url);
+      setHref(globalThis.location.href);
+    },
+  };
+};
+export const context: ContentPageContext = {
+  useState,
+  useRouter: Router,
   useAsyncData: (key, fetcher) => {
     const [data, setData] = useState();
     useEffect(() => {
@@ -76,7 +88,10 @@ export const mobileContext: ContentPageContext = {
     href: `${TEST_ORIGIN}/mobile/credits`,
     pathname: '/mobile/credits',
     query: {},
-    push: (url: string) => {
+    push: (url?: string) => {
+      console.log(url);
+    },
+    replace: (url?: string) => {
       console.log(url);
     },
   }),

package/src/types.ts

@@ -10,6 +10,7 @@ export interface BaseBlockDef {
   content?: BlockContent;
   version?: BlockVersion;
   hidden?: boolean;
+  anchor?: string;
 }
 
 export interface BlockDef extends BaseBlockDef {
@@ -50,6 +51,7 @@ export interface ContentPageDef extends ContentPageMeta {
 export interface UniBlockProps {
   className?: string;
   context: ContentPageContext;
+  anchor?: string;
 }
 
 export interface DaDataResult {

package/src/utils/url.ts

@@ -13,3 +13,12 @@ export const getOrigin = (href?: string) => {
   const endOfOrigin = url.indexOf('/', endOfProto + protoSeparator.length);
   return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
+
+export const getHash = (href?: string) => {
+  if (!href || !isURL(href)) {
+    return undefined;
+  }
+
+  const hashIndex = href.indexOf('#');
+  return hashIndex !== -1 ? href.substring(hashIndex, href.length) : undefined;
+};