@redneckz/wildless-cms-uni-blocks 0.4.2 → 0.4.4

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

@@ -47,7 +47,7 @@ const getDotStyles = (
   indexFraction: number,
 ): Record<string, string> | undefined => {
   if (currentIdx < activeIndex || currentIdx > activeIndex + 1) {
-    return;
+    return undefined;
   }
 
   const leftIndexMod = 1 - indexFraction;

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { BgColorVersion } from '../../model/BgColorVersion';
+import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { LinkProps } from '../../model/LinkProps';
 
 export interface TopItemContent extends LinkProps {
@@ -54,8 +54,8 @@ const getLinkClasses = (bgColor: BgColorVersion, active = false, flat = false) =
 };
 
 const getTextClasses = (bgColor: BgColorVersion, active = false, flat = false) => {
-  if (bgColor !== 'bg-white') {
-    return `text-white ${TEXT_CLASSES}`;
+  if (bgColor === 'transparent') {
+    return `text-white hover:text-primary-hover ${TEXT_CLASSES}`;
   }
   const nonActiveAtoms = `${
     flat ? 'text-primary-text' : 'text-secondary-text'

package/mobile/src/utils/assertUnreachable.ts

@@ -0,0 +1,3 @@
+export function assertUnreachable(x: never): never {
+  throw new Error(x);
+}

package/mobile/src/utils/fetchJSON.ts

@@ -0,0 +1,24 @@
+export async function fetchJSON<R = unknown>(
+  url: string,
+  options?: RequestInit,
+): Promise<R | null> {
+  try {
+    return await fetchJSONUnsafe(url, options);
+  } catch (err) {
+    console.error(err);
+  }
+
+  return null;
+}
+
+export async function fetchJSONUnsafe<R = unknown>(url: string, options?: RequestInit): Promise<R> {
+  const response = await fetch(url, {
+    ...options,
+    headers: {
+      ...options?.headers,
+      'Content-Type': 'application/json',
+    },
+  });
+
+  return await response.json();
+}

package/mobile/src/utils/roundTo.ts

@@ -1,5 +1,5 @@
-export const roundTo = (value: number, precision = 2) => {
-  const factor = Math.pow(10, precision);
+export const roundTo = (value: number | string, precision = 2) => {
+  const factor = 10 ** precision;
 
   return Math.round(parseFloat(String(value)) * factor) / factor;
 };

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
   "description": "Инструмент для просмотра UI Kit",
   "type": "module",
+  "bin": {
+    "wcms-migrate": "./bin/migrate.js"
+  },
   "main": "./dist/index.js",
   "types": "./lib/index.d.ts",
   "engines": {
@@ -164,7 +167,7 @@
   },
   "size-limit": [
     {
-      "limit": "7 kB",
+      "limit": "8 kB",
       "path": "lib/common.css"
     },
     {

package/src/EventBus/EventMap.ts

@@ -1,5 +1,6 @@
 import type { TabActivationEvent } from '../components/Tabs/Tabs';
-
+import type { TariffsTableInnerEvent } from '../ui-kit/InnerTable/InnerTableProps';
 export interface EventMap {
   tab: TabActivationEvent;
+  tariffInnerTable: TariffsTableInnerEvent;
 }

package/src/components/Accordion/AccordionItem.mobile.tsx

@@ -25,11 +25,13 @@ export const AccordionItem = JSX<AccordionItemProps>(
             }`}
           >
             {labelIcon ? (
-              <Img image={labelIcon} width="24" height="24" asSVG className="mr-3" />
+              <Img image={labelIcon} className="mr-3 flex-shrink-0" width="24" height="24" asSVG />
             ) : null}
             {label}
           </span>
-          {hasContent ? <Img className="w-6" image={icon} width="24" height="24" asSVG /> : null}
+          {hasContent ? (
+            <Img className="flex-shrink-0" image={icon} width="24" height="24" asSVG />
+          ) : null}
         </button>
         {hasContent ? <AccordionItemInner blocks={blocks} context={context} /> : null}
       </li>

package/src/components/Accordion/AccordionItem.tsx

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

package/src/components/BaseTile/BaseTile.tsx

@@ -10,9 +10,9 @@ export const BaseTile = JSX<BaseTileProps>(
       <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 w-full">
+          <div className="flex flex-col justify-between w-full">
             <div>{children}</div>
-            {buttons ? <div className="mt-9">{buttons}</div> : null}
+            {buttons ? <div className="mt-auto">{buttons}</div> : null}
           </div>
           {image}
         </div>

package/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import type { TitleProp } from '../../model/HeadlineType';
+import type { TitleProps } from '../../model/HeadlineType';
 import type { EmptyOption } from '../../model/EmptyOptionType';
 
 /**
@@ -48,7 +48,7 @@ export interface BenefitItemProps {
 /**
  * @title Блок преимущества
  */
-export type BenefitsBlockContent = TitleProp & {
+export type BenefitsBlockContent = TitleProps & {
   /**
    * @title Список преимуществ
    * @maxItems 6

package/src/components/BlockContent.ts

@@ -6,14 +6,12 @@ import type { ExchangeRateTileContent } from './ExchangeRateTile/ExchangeRateTil
 import type { FooterContent } from './Footer/FooterContent';
 import type { GalleryContent } from './Gallery/GalleryContent';
 import type { GracePeriodContent } from './GracePeriod/GracePeriodContent';
-import type { GroupBlockContent } from './GroupBlock/GroupBlockContent';
 import type { HeaderContent } from './Header/HeaderContent';
 import type { InsuranceAmountBlockContent } from './InsuranceAmountBlock/InsuranceAmountBlockContent';
 import type { LinkDocsContent } from './LinkDocs/LinkDocsContent';
 import type { LinkListContent } from './LinkList/LinkListContent';
 import type { MobileAppTileContent } from './MobileAppTile/MobileAppTileContent';
 import type { NavigationContent } from './Navigation/NavigationContent';
-import type { NavigatorTabsContent } from './NavigatorTabs/NavigatorTabsContent';
 import type { PictureTextContent } from './PictureText/PictureTextContent';
 import type { PlaceholderContent } from './Placeholder/PlaceholderContent';
 import type { ProductBlockContent } from './ProductBlock/ProductBlockContent';
@@ -22,6 +20,7 @@ import type { ProductTileContent } from './ProductTile/ProductTileContent';
 import type { PromoTileContent } from './PromoTile/PromoTileContent';
 import type { SafeDepositRentalContent } from './SafeDepositRental/SafeDepositRentalContent';
 import type { StepsBlockContent } from './StepsBlock/StepsBlockContent';
+import { TabsContent } from './Tabs/TabsContent';
 import type { TariffsTableContent } from './TariffsTable/TariffsTableContent';
 import type { TextBlockContent } from './TextBlock/TextBlockContent';
 import type { TileContent } from './Tile/TileContent';
@@ -41,7 +40,6 @@ export type BlockContent =
   | InsuranceAmountBlockContent
   | LinkDocsContent
   | MobileAppTileContent
-  | NavigatorTabsContent
   | PictureTextContent
   | PlaceholderContent
   | ProductBlockContent
@@ -54,6 +52,6 @@ export type BlockContent =
   | TileContent
   | NavigationContent
   | LinkListContent
-  | GroupBlockContent
   | BonusBenefitsBlockContent
-  | SafeDepositRentalContent;
+  | SafeDepositRentalContent
+  | TabsContent;

package/src/components/Blocks.ts

@@ -9,7 +9,6 @@ import { ExchangeRateTile } from './ExchangeRateTile/ExchangeRateTile';
 import { Footer } from './Footer/Footer';
 import { Gallery } from './Gallery/Gallery';
 import { GracePeriod } from './GracePeriod/GracePeriod';
-import { GroupBlock } from './GroupBlock/GroupBlock';
 import { Header } from './Header/Header';
 import { Headline } from './Headline/Headline';
 import { InsuranceAmountBlock } from './InsuranceAmountBlock/InsuranceAmountBlock';
@@ -17,7 +16,6 @@ import { LinkDocs } from './LinkDocs/LinkDocs';
 import { MiniGallery } from './MiniGallery/MiniGallery';
 import { MobileAppTile } from './MobileAppTile/MobileAppTile';
 import { Navigation } from './Navigation/Navigation';
-import { NavigatorTabs } from './NavigatorTabs/NavigatorTabs';
 import { OtherProducts } from './OtherProducts/OtherProducts';
 import { PictureText } from './PictureText/PictureText';
 import { Placeholder } from './Placeholder/Placeholder';
@@ -50,7 +48,6 @@ export const Blocks = {
   LinkDocs,
   MiniGallery,
   MobileAppTile,
-  NavigatorTabs,
   PictureText,
   ProductBlock,
   ProductGallery,
@@ -64,7 +61,6 @@ export const Blocks = {
   Tile,
   Navigation,
   Placeholder,
-  GroupBlock,
   BonusBenefitsBlock,
   SafeDepositRental,
   Tabs,

package/src/components/Calculator/Calculator.tsx

@@ -109,7 +109,7 @@ function renderTabs({ tabsShift, tabsNav, activeSlideIndex, setActiveSlideIndex
     <div>
       <div
         style={{ transform: `translateX(-${tabsShift * 388}px)` }}
-        className="flex flex-col justify-end items-center h-[126px] pt-[38px] box-border duration-1000"
+        className="flex flex-col justify-end items-center h-[126px] pt-9 box-border duration-1000"
       >
         <div className="w-full flex flex-nowrap items-end gap-2">
           {tabsNav.map((tab, i) =>

package/src/components/Calculator/useCalculatorParams.ts

@@ -1,16 +1,8 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { fetchJSONUnsafe } from '../../utils/fetchJSON';
 
 export function useCalculatorParams<Data>(dir: string) {
-  const { data } = useAsyncData<Data>(
-    `/wcms-resources/${dir}.json`,
-    fetchCalculatorSourceBookParams,
-  );
+  const { data } = useAsyncData<Data>(`/wcms-resources/${dir}.json`, fetchJSONUnsafe);
 
   return data;
 }
-
-async function fetchCalculatorSourceBookParams<Data>(url: string): Promise<Data> {
-  const response = await fetch(url);
-
-  return await response.json();
-}

package/src/components/Calculator/useCreditCalculatorParams.ts

@@ -54,12 +54,10 @@ export const useCreditCalculatorParams = (
   const finalRate = moneyValue <= sumBorder ? rateBottomRange : rateTopRange;
   const monthlyPayment = getMonthlyPayment(finalRate, userInputParams);
 
-  const extendedCalculatorParams = {
+  return {
     ...creditCalculatorSourceBookParams,
     ...userInputParams,
     finalRate,
     monthlyPayment,
   };
-
-  return extendedCalculatorParams;
 };

package/src/components/Catalog/Catalog.fixture.tsx

@@ -1,6 +1,6 @@
 import type { Picture } from '../../model/Picture';
 import { context } from '../../react/setup-fixture';
-import type { ButtonCommonProps } from '../../ui-kit/Button/Button';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Catalog, CatalogProps } from './Catalog';
 import type { CatalogProductColor } from './CatalogContent';
 
@@ -16,11 +16,14 @@ const payRing: Picture = {
 
 const colors: CatalogProductColor[] = ['black', 'white'];
 
-const buttonPrimary: ButtonCommonProps = {
+const buttonPrimary: ButtonWithIconProps = {
   href: '/credit-cards',
   text: 'Подробнее',
   target: '_blank',
   version: 'primary',
+  icon: {
+    icon: 'AppleIcon',
+  },
 };
 
 const catalogCard = {

package/src/components/Catalog/CatalogCard.tsx

@@ -12,6 +12,12 @@ export interface CatalogCardProps extends CatalogCardType, UniBlockProps {
   version?: BlockVersion;
 }
 
+const iconVersionMap = {
+  default: 'normal',
+  primary: 'white',
+  secondary: 'black',
+};
+
 const cardStyleMap: Record<CatalogProductColor, string> = {
   black: 'bg-black',
   white: 'bg-white',
@@ -50,22 +56,23 @@ const renderColorOption = (color: CatalogProductColor, i: number) => (
 );
 
 const renderButton = (button: ButtonWithIconProps) => {
-  const { icon, iconRight, text } = button;
+  const { icon, iconRight, ...other } = button;
 
-  if (!text) {
+  if (!button?.text) {
     return null;
   }
 
-  const leftIcon = renderButtonIcon(icon);
-  const rightIcon = renderButtonIcon(iconRight);
+  const iconVersion = iconVersionMap[button?.version || 'default'];
+  const leftIcon = renderButtonIcon({ ...icon, iconVersion });
+  const rightIcon = renderButtonIcon({ ...iconRight, iconVersion });
 
   return (
-    <Button className="mt-5 w-full" appendLeft={leftIcon} appendRight={rightIcon} {...button} />
+    <Button className="mt-5 w-full" appendLeft={leftIcon} appendRight={rightIcon} {...other} />
   );
 };
 
 const renderButtonIcon = (buttonIcon?: Picture) => {
-  if (!buttonIcon || !buttonIcon.icon) {
+  if (!buttonIcon || (!buttonIcon?.icon && !buttonIcon?.src)) {
     return null;
   }
 

package/src/components/ComparisonTable/ComparisonTableContent.ts

@@ -1,6 +1,6 @@
 import type { LinkProps } from '../../model/LinkProps';
-import type { Picture } from '../../model/Picture';
 import type { ListOrientation } from '../../model/ListOrientation';
+import type { Picture } from '../../model/Picture';
 
 /**
  * @hidden
@@ -28,7 +28,13 @@ export interface ColumnHeader {
   title?: string;
   /** @title Подзаголовок */
   subtitle?: string;
+  /**
+   * @default { "format": "webp", "size": { "width": 24 } }
+   */
   icon?: Picture;
+  /**
+   * @default { "format": "webp", "size": { "width": 100 } }
+   */
   image?: Picture;
   link?: LinkProps;
 }
@@ -64,6 +70,7 @@ export interface TableColumnData {
 export interface TableColumnHeader {
   /** @title Заголовок */
   title?: string;
+
   icon?: Picture;
 }
 

package/src/components/ComparisonTable/ComparisonTableRows.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { TableRow } from './TableRow';
+import type { TitleProps } from '../../model/HeadlineType';
 import { TableArrowScrollControl } from '../../ui-kit/TableArrowScrollControl/TableArrowScrollControl';
 import type { TableArrowScrollControlProps } from '../../ui-kit/TableArrowScrollControl/TableArrowScrollControlProps';
 import type { CellData } from './ComparisonTableContent';
-import type { TitleProp } from '../../model/HeadlineType';
+import { TableRow } from './TableRow';
 
 type ComparisonTableRowsProps = TableArrowScrollControlProps & {
-  rowData: { header: TitleProp; data: CellData[][] }[];
+  rowData: { header: TitleProps; data: CellData[][] }[];
   activeCardIndex: number;
   isColoredFirstColumn: boolean;
 };

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

@@ -16,7 +16,7 @@
   },
   "jsonLd": "json",
   "date": "2022-04-08",
-  "style": ["bg-secondary-light"],
+  "style": ["bg-main-divider"],
   "likeControl": true,
   "slots": {
     "header": {
@@ -554,39 +554,6 @@
         }
       }
     },
-    {
-      "type": "NavigatorTabs",
-      "style": ["col-span-12"],
-      "content": {
-        "navigatorTabs": [
-          {
-            "text": "Калькулятор",
-            "href": "#calculator"
-          },
-          {
-            "text": "Преимущества",
-            "href": "#advantages"
-          },
-          {
-            "text": "Как оформить",
-            "href": "#howToApply"
-          },
-          {
-            "text": "Тарифы",
-            "href": "#tariffs"
-          },
-          {
-            "text": "Документы",
-            "href": "#documents"
-          },
-          {
-            "text": "Урожай",
-            "href": "https://rshb.ru/",
-            "target": "_blank"
-          }
-        ]
-      }
-    },
     {
       "type": "ProductTile",
       "style": ["col-span-6"],

package/src/components/ContentPage/normalizePage.mobile.ts

@@ -7,7 +7,7 @@ export function normalizePage(
   contentPage: ContentPageDef | undefined | null,
 ): ContentPageDef | undefined {
   if (!contentPage) {
-    return;
+    return undefined;
   }
 
   const { blocks, slots } = contentPage;

package/src/components/ContentPage/normalizePage.ts

@@ -7,7 +7,7 @@ export function normalizePage<T extends ContentPageDef | undefined | null>(
   contentPage: T,
 ): ContentPageDef | undefined {
   if (!contentPage) {
-    return;
+    return undefined;
   }
 
   const { blocks, slots } = contentPage;

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

@@ -1,9 +1,9 @@
-import { ListOrientation } from '../../model/ListOrientation';
-import type { Picture } from '../../model/Picture';
 import { context } from '../../react/setup-fixture';
-import type { ButtonCommonProps } from '../../ui-kit/Button/Button';
+import type { ListOrientation } from '../../model/ListOrientation';
+import type { Picture } from '../../model/Picture';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { GalleryCardProps } from './GalleryContent';
 import { Gallery } from './Gallery';
-import { GalleryCard } from './GalleryContent';
 
 const isDotted = true;
 
@@ -17,7 +17,7 @@ const image: Picture = {
   title: 'money',
 };
 
-const link: ButtonCommonProps = {
+const link: ButtonWithIconProps = {
   href: '/credit-cards',
   text: 'Подробнее',
   target: '_blank',
@@ -30,7 +30,7 @@ const defaultItems = [
   { title: 'До 15% ', text: 'Кэшбэк от покупок' },
 ];
 
-const cards: GalleryCard[] = [
+const cards: GalleryCardProps[] = [
   {
     image,
     title: 'Вклады в любой валюте',

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

@@ -1,6 +1,6 @@
 import type { Picture } from '../../model/Picture';
 import { context } from '../../react/setup-fixture';
-import type { ButtonCommonProps } from '../../ui-kit/Button/Button';
+import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { Gallery } from './Gallery';
 import type { GalleryProps } from './GalleryProps';
 
@@ -16,14 +16,14 @@ const image: Picture = {
   title: 'money',
 };
 
-const buttonPrimary: ButtonCommonProps = {
+const buttonPrimary: ButtonWithIconProps = {
   href: '/credit-cards',
   text: 'Подробнее',
   target: '_blank',
   version: 'secondary',
 };
 
-const buttonPrimaryIcon: ButtonCommonProps = {
+const buttonPrimaryIcon: ButtonWithIconProps = {
   href: '/credit-cards',
   text: 'Подробнее',
   target: '_blank',

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

@@ -1,19 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { ListOrientation } from '../../model/ListOrientation';
+import type { GalleryCardProps, GalleryItemProps } from './GalleryContent';
+import type { GalleryProps } from './GalleryProps';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { getListStyle } from '../../ui-kit/List/ListItem';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
-import type { GalleryCard } from './GalleryContent';
-import { GalleryItem } from './GalleryContent';
-import type { GalleryProps } from './GalleryProps';
-
-const blockStyle: Record<BlockVersion, string> = {
-  primary: 'bg-white',
-  secondary: 'bg-primary-main text-white',
-};
+import { VersionStyleMap } from '../../model/BlockVersion';
 
 export const Gallery = JSX<GalleryProps>(
   ({ context, title, description, cards = [], className, orientation = 'horizontal' }) => {
@@ -37,7 +32,7 @@ export const Gallery = JSX<GalleryProps>(
   },
 );
 
-function renderCardsLayout(orientation: ListOrientation, cards: GalleryCard[], context) {
+function renderCardsLayout(orientation: ListOrientation, cards: GalleryCardProps[], context) {
   return orientation === 'horizontal' ? (
     <SwipeListControl context={context}>{cards?.map(renderCard)}</SwipeListControl>
   ) : (
@@ -45,11 +40,11 @@ function renderCardsLayout(orientation: ListOrientation, cards: GalleryCard[], c
   );
 }
 
-function renderCard(card: GalleryCard, key: number) {
+function renderCard(card: GalleryCardProps, key: number) {
   return (
     <div
       className={`h-full justify-between box-border horizontal-list-item border-solid border rounded-md border-main-stroke p-4 flex flex-col
-      ${blockStyle[card.version ?? 'primary']}`}
+      ${VersionStyleMap[card.version ?? 'primary']}`}
       key={key}
     >
       <div>
@@ -77,7 +72,7 @@ function renderButton(button) {
   );
 }
 
-function renderDescription(card: GalleryCard) {
+function renderDescription(card: GalleryCardProps) {
   return (
     <div
       className={`text-secondary-text mt-1 text-s ${
@@ -89,7 +84,7 @@ function renderDescription(card: GalleryCard) {
   );
 }
 
-function renderItems(items: GalleryItem[], isDotted, version: BlockVersion = 'primary') {
+function renderItems(items: GalleryItemProps[], isDotted, version: BlockVersion = 'primary') {
   return (
     <section className="mt-3">
       {items.map((item, i) => (

package/src/components/Gallery/GalleryCardInner.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion } from '../../model/BlockVersion';
 import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
-import type { GalleryCard, GalleryItem } from './GalleryContent';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { GalleryCardProps, GalleryItemProps } from './GalleryContent';
 
-export const GalleryCardInner = JSX<GalleryCard>(
+export const GalleryCardInner = JSX<GalleryCardProps>(
   ({ title, description, image, items, button, version, isDotted = true }) => {
     const titleStyleClasses = getTitleStyle(version);
 
@@ -41,7 +41,11 @@ function renderCardTitle(title: string, className: string) {
   return <div className={`text-xl-light m-0 ${className}`}>{title}</div>;
 }
 
-function renderItems(items: GalleryItem[], isDotted: boolean, version: BlockVersion = 'primary') {
+function renderItems(
+  items: GalleryItemProps[],
+  isDotted: boolean,
+  version: BlockVersion = 'primary',
+) {
   return (
     <List
       className={`max-w-[308px] mt-2 text-s ${version === 'primary' ? '!text-secondary-text' : ''}`}

package/src/components/Gallery/GalleryContainer.tsx

@@ -1,18 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { VersionStyleMap } from '../../model/BlockVersion';
 import type { GalleryVersion } from '../../model/GalleryVersion';
 import type { ContentPageContext } from '../ContentPage/ContentPageContext';
-import { cardStyleMap, cardVersionMap, cardWidthMap, galleryLengthForScrollMap } from './constants';
+import { Headline } from '../Headline/Headline';
+import { cardStyleMap, cardWidthMap, galleryLengthForScrollMap } from './constants';
 import { GalleryCardInner } from './GalleryCardInner';
-import type { GalleryCard } from './GalleryContent';
+import type { GalleryCardProps } from './GalleryContent';
 import type { GalleryInnerProps } from './GalleryInner';
-import { Headline } from '../Headline/Headline';
 
 export interface GalleryContainerProps extends Omit<GalleryInnerProps, 'className'> {
   activeCardIndex: number;
 }
 
 export interface GalleryCardData {
-  card: GalleryCard;
+  card: GalleryCardProps;
   version: GalleryVersion;
   context: ContentPageContext;
 }
@@ -49,7 +50,7 @@ function renderCard({ card, version }: GalleryCardData, i: number) {
     <section
       className={`box-border border-solid border border-main-stroke p-6 mx-2 flex flex-col justify-between
         items-stretch ${cardStyleMap[version]} ${
-        cardVersionMap[card.version ?? 'primary']
+        VersionStyleMap[card.version ?? 'primary']
       } w-full col-span-4`}
       key={String(i)}
       role="listitem"