Merge branch 'bose/2599' into staging

equinor · Nov 3, 2024 · 815c82d · 815c82d
2 parents 0388b39 + f702613
commit 815c82d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/sanityv3/schemas/objects/card.tsx b/sanityv3/schemas/objects/card.tsx
@@ -1,21 +1,19 @@
 /* eslint-disable react/display-name */
 import { configureBlockContent } from '../editors'
 import type { PortableTextBlock } from 'sanity'
-import { Stack, Text, Card } from '@sanity/ui'
+import { Text, Card, Box } from '@sanity/ui'
 import blocksToText from '../../helpers/blocksToText'
 
 const CardField = (props: any) => {
   const { renderDefault } = props
   return (
-    <Stack>
-      <Card padding={3} borderLeft>
-        <Text muted size={2} align={'left'}>
-          If only title are used it will render only title as statement. If content below are used, both title and
-          content will be rendered.
-        </Text>
-      </Card>
+    <Box>
+      <Text muted size={2} align="left" style={{ marginBottom: 20 }}>
+        If only title are used it will render only title as statement. If content below are used, both title and content
+        will be rendered.
+      </Text>
       <>{renderDefault(props)}</>
-    </Stack>
+    </Box>
   )
 }
 

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' },
 }
 const snippets: textSnippet = {
@@ -942,6 +943,11 @@ const snippets: textSnippet = {
     defaultValue: 'Select all',
     group: groups.others,
   },
+  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'
@@ -360,7 +361,9 @@ export const Carousel = forwardRef<HTMLElement, CarouselProps>(function Carousel
           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()