@redneckz/wildless-cms-uni-blocks 0.3.79 → 0.3.81

package/mobile/src/components/Recommendation/Recommendation.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
+import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { RecommendationCard } from './RecommendationCard';
 import type { RecommendationCardTypes, RecommendationContent } from './RecommendationContent';
-import { renderArrows } from '../../ui-kit/Button/renderArrows';
 
 const BLUR_BLOCK_CLASSES = 'absolute top-0 bottom-0 w-[84px]';
 const CARD_FULL_VIEW_COUNT = 2;
@@ -12,7 +13,7 @@ const CARD_SHIFT = 525;
 export interface RecommendationProps extends RecommendationContent, UniBlockProps {}
 
 export const Recommendation = JSX<RecommendationProps>(
-  ({ context, recommendations = [], className = '', title, version, anchor = null }) => {
+  ({ context, recommendations = [], className = '', title, version, ...rest }) => {
     const [activeCardIndex, setActiveCardIndex] = context.useState(0);
 
     const blockClassName =
@@ -20,9 +21,10 @@ export const Recommendation = JSX<RecommendationProps>(
     const cardClassName = version === 'secondary' ? 'border-white/50' : 'border-main-stroke';
 
     return (
-      <section
+      <BlockWrapper
+        context={context}
         className={`relative font-sans p-9 overflow-hidden text-center ${blockClassName} ${className}`}
-        id={anchor}
+        {...rest}
       >
         {title ? <Heading headingType="h2" className="mb-6" title={title} /> : null}
         <div
@@ -51,7 +53,7 @@ export const Recommendation = JSX<RecommendationProps>(
             version === 'secondary' ? 'bg-opacity-to-main' : 'bg-opacity-to-white'
           }`}
         />
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/mobile/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/package.json

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

package/src/components/Accordion/Accordion.tsx

@@ -1,9 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { AlignType } from '../../model/AlignType';
 import type { UniBlockProps } from '../../types';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { AccordionContent } from './AccordionContent';
 import { AccordionItem } from './AccordionItem';
-import { AlignType } from '../../model/AlignType';
 
 const ALIGN_TITLE: Record<AlignType, string> = {
   left: 'text-left',
@@ -20,11 +21,15 @@ export const Accordion = JSX<AccordionProps>(
     accordionItems,
     context,
     className = '',
-    anchor = null,
     accordionAlignTitle = 'center',
+    ...rest
   }) => {
     return (
-      <section className={`p-[50px] font-sans bg-white text-primary-text ${className}`} id={anchor}>
+      <BlockWrapper
+        context={context}
+        className={`p-[50px] font-sans bg-white text-primary-text ${className}`}
+        {...rest}
+      >
         {title ? (
           <Heading
             headingType="h4"
@@ -40,7 +45,7 @@ export const Accordion = JSX<AccordionProps>(
             ))}
           </ul>
         ) : null}
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/Accordion/AccordionItem.tsx

@@ -22,7 +22,7 @@ export const AccordionItem = JSX<AccordionItemProps>(({ label, isExpanded, block
           `}
         onClick={handleToggle}
       >
-        <span className={`text-xl pr-2.5 font-medium`}>{label}</span>
+        <span className={`text-xl-light pr-2.5 font-medium`}>{label}</span>
         {hasContent ? (
           <Img image={icon} className="text-primary-main" width="24" height="24" asSVG />
         ) : null}

package/src/components/BaseTile/BaseTile.tsx

@@ -5,9 +5,9 @@ import type { BaseTileCommonProps } from './BaseTileProps';
 export interface BaseTileProps extends BaseTileCommonProps, UniBlockProps {}
 
 export const BaseTile = JSX<BaseTileProps>(
-  ({ className = '', title, children, buttons, image, anchor = null }) => {
+  ({ className = '', title, children, buttons, image }) => {
     return (
-      <div className={`font-sans flex flex-col grow h-full items-start ${className}`} id={anchor}>
+      <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 w-full">

package/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
@@ -8,11 +9,11 @@ import { DescriptionType, ListBenefitDef, TextBenefitDef } from './BenefitsBlock
 export interface BenefitsBlockProps extends BenefitsBlockContent, UniBlockProps {}
 
 export const BenefitsBlock = JSX<BenefitsBlockProps>(
-  ({ className = '', headingType = 'h2', title, benefitList, anchor = null }) => {
+  ({ className = '', headingType = 'h2', title, benefitList, ...rest }) => {
     return (
-      <section
+      <BlockWrapper
         className={`font-sans text-primary-text bg-white p-12 flex flex-col items-center ${className}`}
-        id={anchor}
+        {...rest}
       >
         {title ? (
           <Heading
@@ -23,7 +24,7 @@ export const BenefitsBlock = JSX<BenefitsBlockProps>(
           />
         ) : null}
         {benefitList?.length ? renderBenefits(benefitList) : null}
-      </section>
+      </BlockWrapper>
     );
   },
 );
@@ -50,7 +51,7 @@ const renderStep = (benefit: BenefitItem, i: number) => {
         />
       ) : null}
       <div>
-        {benefit?.label ? <h3 className="font-medium text-xl m-0">{benefit.label}</h3> : null}
+        {benefit?.label ? <h3 className="font-medium text-xl-light m-0">{benefit.label}</h3> : null}
         {renderDescription(description)}
       </div>
     </div>

package/src/components/Bonus/Bonus.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import type { BonusContent } from './BonusContent';
@@ -6,10 +7,10 @@ import type { BonusContent } from './BonusContent';
 export interface BonusProps extends BonusContent, UniBlockProps {}
 
 export const Bonus = JSX<BonusProps>((props) => {
-  const { className = '', title, description, bonusItems, anchor = null } = props;
+  const { className = '', title, description, bonusItems, ...rest } = props;
 
   return (
-    <section className={`font-sans bg-white p-[50px] pb-9 ${className}`} id={anchor}>
+    <BlockWrapper className={`font-sans bg-white p-[50px] pb-9 ${className}`} {...rest}>
       <div className="container">
         {title ? <Heading headingType="h3" className="text-center" title={title} /> : null}
         {description ? (
@@ -47,6 +48,6 @@ export const Bonus = JSX<BonusProps>((props) => {
             : null}
         </div>
       </div>
-    </section>
+    </BlockWrapper>
   );
 });

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
@@ -8,11 +9,11 @@ import { getElementsColsValue } from './getElementsColsValue';
 export interface BenefitsBlockProps extends BonusBenefitsBlockContent, UniBlockProps {}
 
 export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
-  ({ className = '', title, subtitle, bonusBenefits, anchor = null }) => {
+  ({ className = '', title, subtitle, bonusBenefits, ...rest }) => {
     return (
-      <section
+      <BlockWrapper
         className={`font-sans text-primary-text bg-white p-50 flex flex-col text-center ${className}`}
-        id={anchor}
+        {...rest}
       >
         {title ? <Heading headingType="h3" className="mb-[10px]" title={title} /> : null}
         {subtitle ? <span className="text-md font-normal">{subtitle}</span> : null}
@@ -21,7 +22,7 @@ export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
             {bonusBenefits.map(renderBonusBenefit)}
           </div>
         ) : null}
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/Calculator/Calculator.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { FuncReturnVoid, UniBlockProps } from '../../types';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Img } from '../../ui-kit/Img/Img';
@@ -22,7 +23,7 @@ type NavButtonProps = {
 };
 
 export const Calculator = JSX<CalculatorProps>(
-  ({ className = '', context, calcTabs = [], anchor = null }) => {
+  ({ className = '', context, calcTabs = [], ...rest }) => {
     const tabsNav = calcTabs.map((_) => _.nav || ({} as CalculatorNav));
     const blockCalcTabs = calcTabs.map(
       ({ calculatorBlock }) => calculatorBlock || ({} as CalculatorBlockDef),
@@ -38,9 +39,10 @@ export const Calculator = JSX<CalculatorProps>(
     const showPrevButton = tabsShift > 0;
 
     return (
-      <section
-        id={anchor}
+      <BlockWrapper
+        context={context}
         className={`box-border overflow-hidden relative font-sans w-100 bg-white text-primary-text ${className}`}
+        {...rest}
       >
         <div>
           {tabsNav.length > 1
@@ -62,7 +64,7 @@ export const Calculator = JSX<CalculatorProps>(
             ? blockCalcTabs.map(renderCalculatorBlock({ context, className }))
             : null}
         </div>
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/Catalog/Catalog.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Description } from '../../ui-kit/Description/Description';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -14,13 +15,14 @@ const CARD_FULL_VIEW_COUNT = 3;
 const CARD_SHIFT = 430;
 
 export const Catalog = JSX<CatalogProps>(
-  ({ context, cards = [], className = '', title, description, anchor = null }) => {
+  ({ context, cards = [], className = '', title, description, ...rest }) => {
     const [activeCardIndex, setActiveCardIndex] = context.useState(0);
 
     return (
-      <section
+      <BlockWrapper
+        context={context}
         className={`bg-white relative font-sans p-9 overflow-hidden text-center ${className}`}
-        id={anchor}
+        {...rest}
       >
         {title ? <Heading headingType="h2" className="mb-6" title={title} /> : null}
         {description ? <Description className="mb-6" description={description} /> : null}
@@ -38,7 +40,7 @@ export const Catalog = JSX<CatalogProps>(
         })}
         <div className={`${BLUR_BLOCK_CLASSES} left-0 ${'bg-opacity-from-white'}`} />
         <div className={`${BLUR_BLOCK_CLASSES} right-0 ${'bg-opacity-to-white'}`} />
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/ComparisonTable/ComparisonTable.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { ComparisonTableBody } from './ComparisonTableBody';
@@ -16,17 +17,18 @@ export const ComparisonTable = JSX<ComparisonTableProps>(
     columns,
     visibleRowLength = 0,
     isColoredFirstColumn = false,
-    anchor = null,
+    ...rest
   }) => {
     const [isShowAllRow, setIsShowAllRow] = context.useState(!visibleRowLength);
     const showToggle = () => setIsShowAllRow(!isShowAllRow);
 
     return (
-      <section
+      <BlockWrapper
+        context={context}
         className={`bg-white font-sans py-[50px] pl-[50px] overflow-hidden text-primary-text relative ${
           className || ''
         }`}
-        id={anchor}
+        {...rest}
       >
         <Heading
           headingType="h2"
@@ -44,7 +46,7 @@ export const ComparisonTable = JSX<ComparisonTableProps>(
         {visibleRowLength
           ? renderShowMoreToggleButton({ isShowAllRow, onClick: showToggle })
           : null}
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/ComparisonTable/TableCell.tsx

@@ -29,7 +29,7 @@ export const TableCell = JSX<TableCellProps>(({ cell, isFirstRow, isLastRow, isF
 });
 
 const labelStyle = (isFillGradient = false): string =>
-  `text-xl font-medium m-0 ${isFillGradient ? 'text-white' : ''}`;
+  `text-xl-light font-medium m-0 ${isFillGradient ? 'text-white' : ''}`;
 const descriptionStyle = (isFillGradient = false): string =>
   `text-sm opacity-80 ${isFillGradient ? 'text-white' : 'text-secondary-text'}`;
 

package/src/components/ContentPage/ContentPage.tsx

@@ -1,7 +1,5 @@
 import { JSX, PropsWithChildren } from '@redneckz/uni-jsx';
 import type { BlockDef, ContentPageDef, UniBlockProps } from '../../types';
-import { changeHashOnScroll } from '../../utils/changeHashOnScroll';
-import { isSSR } from '../../utils/isSSR';
 import { style2className } from '../../utils/style2className';
 import type { BlockContent } from '../BlockContent';
 import { LikeControl } from '../LikeControl/LikeControl';
@@ -39,8 +37,6 @@ export interface RenderBlockFunc {
   context: ContentPageContext;
 }
 
-const isClient = !isSSR();
-
 const defaultBlockDecorator: BlockDecorator = ({ blockClassName, block, render }) =>
   render({ blockClassName, block });
 
@@ -53,16 +49,6 @@ export const ContentPage = JSX<ContentPageProps>(
     blockDecorator = defaultBlockDecorator,
   }) => {
     const { header } = slots;
-    const router = context.useRouter();
-
-    // listener is for NavigatorTabs
-    isClient &&
-      globalThis.addEventListener('load', () => {
-        const sectionsWithAnchors = globalThis.document.querySelectorAll('section[id]');
-        globalThis.document.addEventListener('scroll', () =>
-          changeHashOnScroll(router, sectionsWithAnchors),
-        );
-      });
 
     return (
       <section

package/src/components/ContentPage/ContentPageContext.tsx

@@ -31,12 +31,15 @@ export type AsyncDataHook = <Data, Err = any>(
 export type GeolocationHook = (defaultLocation: string) => [string, () => void];
 
 export type SetStateAction<S> = S | ((prevState: S) => S);
+
 export type SetStateHook = <State>(
   initialState: State | (() => State),
 ) => [State, FuncReturnVoid<SetStateAction<State>>];
 
 export interface IntersectionObserverTagProps {
   Tag: string;
+  className?: string;
+  anchor?: string;
   children?: VNode;
   observerCallback: IntersectionObserverCallback;
   observerOptions?: IntersectionObserverInit;

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useExchangeRates } from '../../hooks/useExchangeRates';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { BaseTile } from '../BaseTile/BaseTile';
@@ -18,7 +19,7 @@ const DEFAULT_LOCATION = {
 export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlockProps {}
 
 export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
-  ({ className = '', context, title = 'Курсы обмена валют', anchor = null }) => {
+  ({ className = '', context, title = 'Курсы обмена валют', ...rest }) => {
     const currencyRates = useExchangeRates(context.useAsyncData);
 
     const currencyRatesBuy = currencyRates.filter((_) => _.buy);
@@ -28,9 +29,10 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
     currencyRatesSell.push({ code: Currency.RUB });
 
     return (
-      <section
+      <BlockWrapper
+        context={context}
         className={`bg-white text-primary-text font-sans p-9 box-border ${className}`}
-        id={anchor}
+        {...rest}
       >
         <BaseTile
           context={context}
@@ -59,7 +61,7 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
             ) : null}
           </div>
         </BaseTile>
-      </section>
+      </BlockWrapper>
     );
   },
 );

package/src/components/Footer/Contacts.tsx

@@ -50,7 +50,7 @@ const renderText = (type: ContactInfo['type'], text = '') => {
     case 'tel':
       return (
         <a
-          className="font-sans text-xl text-primary-text no-underline"
+          className="font-sans text-xl-light text-primary-text no-underline"
           href={`tel:${formatTel(text)}`}
         >
           {text}
@@ -58,7 +58,10 @@ const renderText = (type: ContactInfo['type'], text = '') => {
       );
     case 'email':
       return (
-        <a className="font-sans text-xl text-primary-text no-underline" href={`mailto:${text}`}>
+        <a
+          className="font-sans text-xl-light text-primary-text no-underline"
+          href={`mailto:${text}`}
+        >
           {text}
         </a>
       );

package/src/components/Footer/Footer.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
 import { Logo } from '../../ui-kit/Logo/Logo';
 import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
@@ -23,10 +24,15 @@ export const Footer = JSX<FooterProps>(
     mobileApps,
     topItems,
     context,
-    anchor = null,
+    ...rest
   }) => {
     return (
-      <footer className={`p-9 bg-white ${className || ''}`} id={anchor}>
+      <BlockWrapper
+        Tag="footer"
+        context={context}
+        className={`p-9 bg-white ${className || ''}`}
+        {...rest}
+      >
         <div className="flex items-stretch gap-[54px] pb-[30px] xl:gap-8">
           <Logo className={LEFT_COL_WIDTH_FULL_HD} />
           <SearchBar context={context} className="grow" />
@@ -45,7 +51,7 @@ export const Footer = JSX<FooterProps>(
         </div>
         <HorizontalNavigation className="mt-[98px]" links={relatedEnterprises} context={context} />
         <TextInformation links={documents} context={context} />
-      </footer>
+      </BlockWrapper>
     );
   },
 );

package/src/components/Gallery/GalleryCardInner.tsx

@@ -40,7 +40,7 @@ function renderButton(button) {
 }
 
 function renderCardTitle(title: string, className: string) {
-  return <div className={`text-xl m-0 ${className}`}>{title}</div>;
+  return <div className={`text-xl-light m-0 ${className}`}>{title}</div>;
 }
 
 function renderItems(items: GalleryItem[], isDotted: boolean, version: BlockVersion = 'primary') {
@@ -58,7 +58,7 @@ function renderItems(items: GalleryItem[], isDotted: boolean, version: BlockVers
 }
 
 function getTitleStyle(version) {
-  return `text-xl m-0
+  return `text-xl-light m-0
         ${version !== 'secondary' ? 'text-primary-text' : ''}
       `;
 }