Merge branch 'main' into vaash/2609

equinor · Nov 26, 2024 · 5e3a197 · 5e3a197
2 parents 02979b7 + 70a1884
commit 5e3a197
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/sanityv3/schemas/textSnippets.ts b/sanityv3/schemas/textSnippets.ts
@@ -13,6 +13,7 @@ export const groups = {
   pensionForm: { title: 'Pension form', hidden: !Flags.HAS_PENSION_FORM },
   form: { title: 'Form', hidden: !Flags.HAS_FORMS },
   cookie: { title: 'Cookie' },
+  carousel: { title: 'Carousel' },
   others: { title: 'Others' },
   common: { title: 'Common' },
 }
@@ -295,7 +296,7 @@ const snippets: textSnippet = {
     title: 'Pension Category',
     defaultValue: 'Pension',
     group: groups.pensionForm,
-  }, 
+  },
   pension_form_select_topic: {
     title: 'Default Pension Category',
     defaultValue: 'Pension',
@@ -816,6 +817,11 @@ const snippets: textSnippet = {
     defaultValue: `Please don't enter any personal information`,
     group: groups.common,
   },
+  carousel_controls: {
+    title: 'Carousel controls',
+    defaultValue: 'Carousel controls',
+    group: groups.carousel,
+  },
 }
 
 type textSnippetGroup = { title: string; hidden?: boolean }

diff --git a/web/core/Carousel/Carousel.tsx b/web/core/Carousel/Carousel.tsx
@@ -27,6 +27,7 @@ import { useMediaQuery } from '../../lib/hooks/useMediaQuery'
 import { CarouselEventItem } from './CarouselEventItem'
 import { CarouselKeyNumberItem } from './CarouselKeyNumberItem'
 import { CarouselIframeItem } from './CarouselIframeItem'
+import { FormattedMessage } from 'react-intl'
 
 export type DisplayModes = 'single' | 'scroll'
 export type Layouts = 'full' | 'default'
@@ -300,7 +301,7 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
         return (
           <CarouselIframeItem
             className="pt-lg"
-            key={item.id}
+            key={(item as IFrameCarouselItemData)._key}
             noOfSiblings={items.length}
             displayMode={displayMode}
             aria-label={ariaLabel}
@@ -356,11 +357,13 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
           variant === 'image' && displayMode === 'single'
             ? 'w-[var(--image-carousel-card-w-sm)] md:w-[var(--image-carousel-card-w-md)] lg:w-[var(--image-carousel-card-w-lg)] mx-auto col-start-1 col-end-1 row-start-2 row-end-2'
             : ''
-        } pt-6 pb-2 ${items.length === 2 ? 'lg:hidden' : ''} flex ${
+        } pt-6 pb-2 ${items.length === 3 ? 'lg:hidden' : ''} flex ${
           internalAutoRotation ? 'justify-between' : 'justify-end'
         }`}
       >
-        <div id={controlsId} className="sr-only">{`Carousel controls`}</div>
+        <div id={controlsId} className="sr-only">
+          <FormattedMessage id="carousel_controls" defaultMessage="Carousel controls" />
+        </div>
         {internalAutoRotation && (
           <MediaButton
             key={`play_pause_button_${currentIndex}`}
@@ -378,7 +381,7 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
             title={`Go to previous`}
             aria-controls={carouselItemsId}
             mode="previous"
-            disabled={displayMode === 'scroll' && scrollPosition === 'start'}
+            disabled={(displayMode === 'scroll' && scrollPosition === 'start') ?? false}
             onClick={() => {
               if (variant === 'image' && displayMode === 'single') {
                 loopSlidePrev()
@@ -395,7 +398,7 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
             title={`Go to next`}
             mode="next"
             aria-controls={carouselItemsId}
-            disabled={displayMode === 'scroll' && scrollPosition === 'end'}
+            disabled={(displayMode === 'scroll' && scrollPosition === 'end') ?? false}
             onClick={() => {
               if (variant === 'image' && displayMode === 'single') {
                 loopSlideNext()

diff --git a/web/pageComponents/topicPages/promotions/pastEvents/PastEventsListItem.tsx b/web/pageComponents/topicPages/promotions/pastEvents/PastEventsListItem.tsx
@@ -49,7 +49,7 @@ const PastEventsListItem = forwardRef<HTMLAnchorElement, PastEventsListItemProps
           <FormattedDateParts value={start} year="numeric" month="short" day="2-digit">
             {(parts) => {
               return (
-                <div className="flex flex-col gap-4 justify-start items-center">
+                <div className="flex flex-col gap-4 justify-start items-center text-center">
                   <span className="text-md">{`${parts[0].value} ${parts[2].value}`}</span>
                   <span className="text-sm">{parts[4].value}</span>
                 </div>

diff --git a/web/templates/newsroom/sanity/NewsroomSanity.tsx b/web/templates/newsroom/sanity/NewsroomSanity.tsx
@@ -36,6 +36,7 @@ const NewsRoomTemplateSanity = forwardRef<HTMLElement, NewsRoomTemplateProps>(fu
     localNewsPages,
     fallbackImages,
   } = pageData || {}
+
   const intl = useIntl()
   const router = useRouter()
   const { locale } = router
@@ -116,10 +117,10 @@ const NewsRoomTemplateSanity = forwardRef<HTMLElement, NewsRoomTemplateProps>(fu
       <main ref={ref} className="">
         <div className="flex flex-col gap-8 lg:gap-12">
           <div className="bg-slate-blue-95 dark py-24">
-            <div className="flex flex-col gap-4  grid-rows-2 mx-auto px-layout-sm max-w-viewport">
-              {title && <Heading value={title} as="h1" variant="h2" />}
+            <div className="flex flex-col gap-4 lg:grid lg:grid-cols-2 lg:grid-rows-[auto_1fr] mx-auto px-layout-sm max-w-viewport">
+              {title && <Heading value={title} as="h1" variant="h2" className="lg:col-span-2" />}
               {ingress && <Blocks value={ingress} />}
-              <div className="w-full flex flex-col gap-8 lg:flex-row lg:justify-between items-center">
+              <div className="w-full flex flex-col gap-8 items-center">
                 <List
                   role="navigation"
                   className="max-lg:w-full"
@@ -139,9 +140,13 @@ const NewsRoomTemplateSanity = forwardRef<HTMLElement, NewsRoomTemplateProps>(fu
                   {localNewsPages &&
                     localNewsPages?.length > 0 &&
                     localNewsPages?.map((localNewsPage) => {
-                      return localNewsPage?.link?.slug ? (
+                      return localNewsPage?.link?.slug || localNewsPage?.href ? (
                         <List.Item key={localNewsPage.id} className="w-full">
-                          <ResourceLink type={localNewsPage.type} href={localNewsPage?.link?.slug} className="w-full">
+                          <ResourceLink
+                            type={localNewsPage.type}
+                            href={localNewsPage?.link?.slug || (localNewsPage?.href as string)}
+                            className="w-full"
+                          >
                             {localNewsPage?.label}
                           </ResourceLink>
                         </List.Item>