Merge branch 'malj/2610-2' into staging

equinor · Feb 13, 2025 · cd718a2 · cd718a2
2 parents 01b8a0d + 12a03ab
commit cd718a2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 216 deletions.
diff --git a/web/core/Carousel/Carousel.tsx b/web/core/Carousel/Carousel.tsx
@@ -466,6 +466,7 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
       case 'image':
         return (
           <CarouselImageItem
+            //@ts-ignore:TOdo
             key={item?.id ?? item?._key ?? `image_carousel_${sliderRef.current}_item_${i}`}
             {...(item as ImageCarouselItem)}
             displayMode={displayMode}
@@ -486,7 +487,7 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
       case 'event':
         return getEventVariantBody(item as EventCardData, i)
       case 'keyNumber':
-        return getKeyNumberVariantBody(item as KeyNumberItemData, i)
+        return getKeyNumberVariantBody(item as KeyNumberItemData)
       case 'iframe':
         return getIframeVariantBody(item as IFrameCarouselItemData, i)
     }

diff --git a/web/core/Carousel/CarouselImageItem.tsx b/web/core/Carousel/CarouselImageItem.tsx
@@ -116,6 +116,7 @@ export const CarouselImageItem = forwardRef<HTMLLIElement, CarouselImageItemProp
       return (
         <ImageWithOverlay
           teaserTitle={captionTeaserTitle}
+          //@ts-ignore:TODO
           title={captionTitle as PortableTextBlock[]}
           text={captionText}
           image={image}
@@ -135,7 +136,12 @@ export const CarouselImageItem = forwardRef<HTMLLIElement, CarouselImageItemProp
           <figcaption
             className={`max-w-text py-6 px-8 ${displayMode === 'single' ? singleClassname : scrollClassname}`}
           >
-            {caption && <Blocks value={caption} />}
+            {caption && (
+              <Blocks
+                //@ts-ignore:TODO
+                value={caption}
+              />
+            )}
           </figcaption>
         </figure>
       )

diff --git a/web/pageComponents/shared/ImageCarousel/ImageCarousel.tsx b/web/pageComponents/shared/ImageCarousel/ImageCarousel.tsx
diff --git a/web/pageComponents/shared/ImageCarousel/ImageCarouselItem.tsx b/web/pageComponents/shared/ImageCarousel/ImageCarouselItem.tsx
diff --git a/web/pageComponents/shared/ImageCarousel/Navigation.tsx b/web/pageComponents/shared/ImageCarousel/Navigation.tsx