@redneckz/wildless-cms-uni-blocks 0.3.80 → 0.3.82

package/src/components/StepsBlock/StepsBlock.tsx

@@ -3,11 +3,13 @@ import type { UniBlockProps } from '../../types';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
+import { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
 import { joinList } from '../../utils/joinList';
 import type { Step, StepsBlockContent } from './StepsBlockContent';
 import type { StyleType } from './StepsBlockStyleMaps';
 import { getStyleMap } from './StepsBlockStyleMaps';
-import { checkIsIconRenderable } from '../../utils/checkIsIconRenderable';
+
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 
 export interface StepsBlockProps extends StepsBlockContent, UniBlockProps {}
 
@@ -18,14 +20,14 @@ export const StepsBlock = JSX<StepsBlockProps>(
     showLines = true,
     steps = [],
     button,
-    anchor = null,
     version = 'primary',
+    ...rest
   }) => {
     const styleMap = getStyleMap(version);
     const shortGaps = steps.length > 3;
 
     return (
-      <section
+      <BlockWrapper
         className={[
           'box-border font-sans text-primary-text bg-white',
           shortGaps ? 'px-20' : 'px-[70px]',
@@ -34,7 +36,7 @@ export const StepsBlock = JSX<StepsBlockProps>(
           styleMap.title,
           className,
         ].join(' ')}
-        id={anchor}
+        {...rest}
       >
         <Heading headingType="h2" className="max-w-[47rem] text-center" title={title} />
         {steps?.length ? (
@@ -54,7 +56,7 @@ export const StepsBlock = JSX<StepsBlockProps>(
         {button?.text ? (
           <Button className="mt-8 w-full max-w-[240px]" version="primary" {...button} />
         ) : null}
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/TariffsTable/TariffsTable.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useTableArrowScrollControl } from '../../hooks/useTableArrowScrollControl';
 import type { VNode } from '../../model/VNode';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -18,16 +19,7 @@ import { TariffsTableRow } from './TariffsTableRow';
 export interface TariffsTableProps extends TariffsTableContent, UniBlockProps {}
 
 export const TariffsTable = JSX<TariffsTableProps>(
-  ({
-    className,
-    context,
-    title,
-    description,
-    rowHeaders,
-    columns,
-    anchor = null,
-    hiddenRowsNum = 0,
-  }) => {
+  ({ className, context, title, description, rowHeaders, columns, hiddenRowsNum = 0, ...rest }) => {
     const [activeCardIndex, setActiveCardIndex] = context.useState(0);
 
     const colData = getColData(columns);
@@ -50,11 +42,12 @@ export const TariffsTable = JSX<TariffsTableProps>(
     ));
 
     return (
-      <section
+      <BlockWrapper
+        context={context}
         className={`bg-white font-sans py-[50px] pl-[50px] overflow-hidden text-primary-text relative ${
           className || ''
         }`}
-        id={anchor}
+        {...rest}
       >
         {title ? (
           <Heading
@@ -77,7 +70,7 @@ export const TariffsTable = JSX<TariffsTableProps>(
             foldButtonLabel="Развернуть"
           />
         ) : null}
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/TextBlock/TextBlock.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { Picture } from '../../model/Picture';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Img } from '../../ui-kit/Img/Img';
 import type { TextBlockContent, TextBlockVersion } from './TextBlockContent';
@@ -31,21 +32,13 @@ const textBlockStyleMaps: Record<
 };
 
 export const TextBlock = JSX<TextBlockProps>(
-  ({
-    title,
-    description,
-    blockVersion = 'primary',
-    iconVersion,
-    image,
-    className,
-    anchor = null,
-  }) => {
+  ({ title, description, blockVersion = 'primary', iconVersion, image, className, ...rest }) => {
     const textBlockStyleMap = textBlockStyleMaps[blockVersion];
 
     return (
-      <section
+      <BlockWrapper
         className={`font-sans px-9 py-4 flex ${textBlockStyleMap.background} ${className || ''}`}
-        id={anchor}
+        {...rest}
       >
         {iconVersion === 'small' ? renderIcon(textBlockStyleMap.icon) : null}
         {iconVersion === 'big' ? renderImage(image) : null}
@@ -57,7 +50,7 @@ export const TextBlock = JSX<TextBlockProps>(
             <div className={`text-sm ${textBlockStyleMap.description}`}>{description}</div>
           ) : null}
         </div>
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/Tile/Tile.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { ButtonSection } from '../../ui-kit/Button/ButtonSection';
 import { Description } from '../../ui-kit/Description/Description';
@@ -33,17 +34,16 @@ export const Tile = JSX<TileProps>((props) => {
     isDotted = true,
     className = '',
     version = 'primary',
-    role,
-    anchor = null,
+    ...rest
   } = props;
 
   return (
-    <section
+    <BlockWrapper
+      context={context}
       className={`overflow-hidden font-sans p-9 pr-3 box-border ${className} ${
         tileStyleMap[version]
       } ${getTileRightPadding(className)} ${getTileMinHeight(className)} `}
-      role={role}
-      id={anchor}
+      {...rest}
     >
       <BaseTile
         context={context}
@@ -78,7 +78,7 @@ export const Tile = JSX<TileProps>((props) => {
         {children}
         {renderList(items, version, isDotted)}
       </BaseTile>
-    </section>
+    </BlockWrapper>
   );
 });
 

package/src/react/IntersectionObserverTag.tsx

@@ -1,8 +1,16 @@
 import { useCallback, useRef } from 'react';
-import { IntersectionObserverComponent } from '../components/ContentPage/ContentPageContext';
+import type { IntersectionObserverComponent } from '../components/ContentPage/ContentPageContext';
 
 export const IntersectionObserverTag: IntersectionObserverComponent = (props) => {
-  const { Tag, observerCallback, observerOptions, children, ...rest } = props;
+  const {
+    Tag,
+    observerCallback,
+    observerOptions,
+    className = '',
+    anchor = null,
+    children,
+    ...rest
+  } = props;
 
   const intersectionObserver = useRef<IntersectionObserver>();
   const ref = useCallback(
@@ -16,7 +24,7 @@ export const IntersectionObserverTag: IntersectionObserverComponent = (props) =>
   );
 
   return (
-    <Tag ref={ref} {...rest}>
+    <Tag ref={ref} className={className} id={anchor} {...rest}>
       {children}
     </Tag>
   );

package/src/react/setup-fixture.ts

@@ -1,5 +1,4 @@
 import { setup } from '@redneckz/uni-jsx';
-
 import { useEffect, useState } from 'react';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { DaDataAPI } from '../api/DaDataAPI';

package/src/ui-kit/BlockWrapper.tsx

@@ -0,0 +1,33 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { ContentPageContext } from '../components/ContentPage/ContentPageContext';
+import { changeHashOnObserve } from '../utils/changeHashOnObserve';
+
+interface BlockWrapperProps {
+  context: ContentPageContext;
+  className?: string;
+  anchor?: string;
+  Tag?: string;
+}
+
+export const BlockWrapper = JSX<BlockWrapperProps>(
+  ({ anchor, className, context, children, Tag = 'section', ...rest }) => {
+    const { IntersectionObserverTag } = context;
+
+    return anchor ? (
+      <IntersectionObserverTag
+        Tag={Tag}
+        className={className}
+        observerCallback={changeHashOnObserve}
+        observerOptions={{ threshold: 1 }} // Lower threshold when hash change needed
+        anchor={anchor}
+        {...rest}
+      >
+        {children}
+      </IntersectionObserverTag>
+    ) : (
+      <Tag className={className} {...rest}>
+        {children}
+      </Tag>
+    );
+  },
+);

package/src/ui-kit/BlocksList/renderBlocksList.tsx

@@ -21,15 +21,18 @@ const renderBlock =
     if (!type || !(type in EmbeddableBlocks)) {
       return null;
     }
-    const classNameBlock = style2className(block?.style);
+
+    const { style, ...rest } = block;
+
+    const classNameBlock = style2className(style);
     const EmbeddedBlock: JSXBlock = EmbeddableBlocks[type];
 
     return (
       <EmbeddedBlock
         key={`block_${i}`}
-        context={context}
-        {...block}
         className={`${className} ${classNameBlock}`}
+        context={context}
+        {...rest}
       />
     );
   };

package/src/ui-kit/Button/ButtonProps.ts

@@ -26,7 +26,7 @@ export interface ButtonProps extends ButtonAdditionalProps, LinkProps {
 }
 
 export interface ButtonWithIconProps extends ButtonProps {
-  /** @title Иконка */
+  /** @title Иконка слева */
   icon?: Picture;
   /** @title Иконка справа */
   iconRight?: Picture;
@@ -49,3 +49,16 @@ export interface ButtonContent {
    */
   buttons?: ButtonWithIconProps[];
 }
+
+export interface BackwardButtonProps extends ButtonProps {
+  /** @title Иконка */
+  icon?: Picture;
+  /** @title Верхний текст */
+  aboveText?: string;
+  /** @hidden */
+  appendLeft?: any;
+  /** @title Закругленные углы */
+  rounded?: boolean;
+  /** @hidden */
+  asSVG?: boolean;
+}

package/src/utils/changeHashOnObserve.ts

@@ -0,0 +1,10 @@
+export const changeHashOnObserve = (entries: IntersectionObserverEntry[]) => {
+  if (!entries.length) {
+    return;
+  }
+  const [entry] = entries;
+
+  if (entry.isIntersecting) {
+    // Here must be logic for block intersection event
+  }
+};

package/dist/utils/changeHashOnScroll.d.ts

@@ -1,2 +0,0 @@
-import { Router } from '../components/ContentPage/ContentPageContext';
-export declare const changeHashOnScroll: (router: Router, blocks: NodeListOf<Element> | null) => void;

package/dist/utils/changeHashOnScroll.js

@@ -1,17 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeHashOnScroll = void 0;
-const changeHashOnScroll = (router, blocks) => {
-    blocks?.forEach((block) => {
-        const currentHash = globalThis.location?.hash; // TODO: remove globalThis, use href from router
-        const anchorHash = `#${block?.id}`;
-        if (currentHash === anchorHash) {
-            return;
-        }
-        const position = block?.getBoundingClientRect();
-        if (position && position.top > 0 && position.top < 150) {
-            router.replace(`#${block?.id}`);
-        }
-    });
-};
-exports.changeHashOnScroll = changeHashOnScroll;
-//# sourceMappingURL=changeHashOnScroll.js.map

package/dist/utils/changeHashOnScroll.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"changeHashOnScroll.js","sourceRoot":"","sources":["../../src/utils/changeHashOnScroll.ts"],"names":[],"mappings":";;AAEO,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,MAAkC,EAAE,EAAE;IACvF,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACxB,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,gDAAgD;QAC/F,MAAM,UAAU,GAAG,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,WAAW,KAAK,UAAU,EAAE;YAC9B,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,KAAK,EAAE,qBAAqB,EAAE,CAAC;QAChD,IAAI,QAAQ,IAAI,QAAQ,CAAC,GAAG,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE;YACtD,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,kBAAkB,sBAc7B"}

package/lib/utils/changeHashOnScroll.d.ts

@@ -1,2 +0,0 @@
-import { Router } from '../components/ContentPage/ContentPageContext';
-export declare const changeHashOnScroll: (router: Router, blocks: NodeListOf<Element> | null) => void;

package/lib/utils/changeHashOnScroll.js

@@ -1,14 +0,0 @@
-export const changeHashOnScroll = (router, blocks) => {
-    blocks?.forEach((block) => {
-        const currentHash = globalThis.location?.hash; // TODO: remove globalThis, use href from router
-        const anchorHash = `#${block?.id}`;
-        if (currentHash === anchorHash) {
-            return;
-        }
-        const position = block?.getBoundingClientRect();
-        if (position && position.top > 0 && position.top < 150) {
-            router.replace(`#${block?.id}`);
-        }
-    });
-};
-//# sourceMappingURL=changeHashOnScroll.js.map

package/lib/utils/changeHashOnScroll.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"changeHashOnScroll.js","sourceRoot":"","sources":["../../src/utils/changeHashOnScroll.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,MAAkC,EAAE,EAAE;IACvF,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACxB,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,gDAAgD;QAC/F,MAAM,UAAU,GAAG,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,WAAW,KAAK,UAAU,EAAE;YAC9B,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,KAAK,EAAE,qBAAqB,EAAE,CAAC;QAChD,IAAI,QAAQ,IAAI,QAAQ,CAAC,GAAG,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE;YACtD,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/mobile/dist/utils/changeHashOnScroll.d.ts

@@ -1,2 +0,0 @@
-import { Router } from '../components/ContentPage/ContentPageContext';
-export declare const changeHashOnScroll: (router: Router, blocks: NodeListOf<Element> | null) => void;

package/mobile/dist/utils/changeHashOnScroll.js

@@ -1,17 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeHashOnScroll = void 0;
-const changeHashOnScroll = (router, blocks) => {
-    blocks?.forEach((block) => {
-        const currentHash = globalThis.location?.hash; // TODO: remove globalThis, use href from router
-        const anchorHash = `#${block?.id}`;
-        if (currentHash === anchorHash) {
-            return;
-        }
-        const position = block?.getBoundingClientRect();
-        if (position && position.top > 0 && position.top < 150) {
-            router.replace(`#${block?.id}`);
-        }
-    });
-};
-exports.changeHashOnScroll = changeHashOnScroll;
-//# sourceMappingURL=changeHashOnScroll.js.map

package/mobile/dist/utils/changeHashOnScroll.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"changeHashOnScroll.js","sourceRoot":"","sources":["../../src/utils/changeHashOnScroll.ts"],"names":[],"mappings":";;AAEO,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,MAAkC,EAAE,EAAE;IACvF,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACxB,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,gDAAgD;QAC/F,MAAM,UAAU,GAAG,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,WAAW,KAAK,UAAU,EAAE;YAC9B,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,KAAK,EAAE,qBAAqB,EAAE,CAAC;QAChD,IAAI,QAAQ,IAAI,QAAQ,CAAC,GAAG,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE;YACtD,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,kBAAkB,sBAc7B"}

package/mobile/lib/utils/changeHashOnScroll.d.ts

@@ -1,2 +0,0 @@
-import { Router } from '../components/ContentPage/ContentPageContext';
-export declare const changeHashOnScroll: (router: Router, blocks: NodeListOf<Element> | null) => void;

package/mobile/lib/utils/changeHashOnScroll.js

@@ -1,14 +0,0 @@
-export const changeHashOnScroll = (router, blocks) => {
-    blocks?.forEach((block) => {
-        const currentHash = globalThis.location?.hash; // TODO: remove globalThis, use href from router
-        const anchorHash = `#${block?.id}`;
-        if (currentHash === anchorHash) {
-            return;
-        }
-        const position = block?.getBoundingClientRect();
-        if (position && position.top > 0 && position.top < 150) {
-            router.replace(`#${block?.id}`);
-        }
-    });
-};
-//# sourceMappingURL=changeHashOnScroll.js.map

package/mobile/lib/utils/changeHashOnScroll.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"changeHashOnScroll.js","sourceRoot":"","sources":["../../src/utils/changeHashOnScroll.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,MAAkC,EAAE,EAAE;IACvF,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACxB,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,gDAAgD;QAC/F,MAAM,UAAU,GAAG,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,WAAW,KAAK,UAAU,EAAE;YAC9B,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,KAAK,EAAE,qBAAqB,EAAE,CAAC;QAChD,IAAI,QAAQ,IAAI,QAAQ,CAAC,GAAG,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE;YACtD,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/mobile/src/utils/changeHashOnScroll.ts

@@ -1,17 +0,0 @@
-import { Router } from '../components/ContentPage/ContentPageContext';
-
-export const changeHashOnScroll = (router: Router, blocks: NodeListOf<Element> | null) => {
-  blocks?.forEach((block) => {
-    const currentHash = globalThis.location?.hash; // TODO: remove globalThis, use href from router
-    const anchorHash = `#${block?.id}`;
-
-    if (currentHash === anchorHash) {
-      return;
-    }
-
-    const position = block?.getBoundingClientRect();
-    if (position && position.top > 0 && position.top < 150) {
-      router.replace(`#${block?.id}`);
-    }
-  });
-};

package/src/utils/changeHashOnScroll.ts

@@ -1,17 +0,0 @@
-import { Router } from '../components/ContentPage/ContentPageContext';
-
-export const changeHashOnScroll = (router: Router, blocks: NodeListOf<Element> | null) => {
-  blocks?.forEach((block) => {
-    const currentHash = globalThis.location?.hash; // TODO: remove globalThis, use href from router
-    const anchorHash = `#${block?.id}`;
-
-    if (currentHash === anchorHash) {
-      return;
-    }
-
-    const position = block?.getBoundingClientRect();
-    if (position && position.top > 0 && position.top < 150) {
-      router.replace(`#${block?.id}`);
-    }
-  });
-};