Merge branch 'bose/2254' into staging

equinor · May 15, 2024 · fd054f2 · fd054f2
2 parents 58f6801 + d2d3e31
commit fd054f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/web/core/Typography/Heading.tsx b/web/core/Typography/Heading.tsx
@@ -98,7 +98,6 @@ export const Heading = ({
   ...props
 }: HeadingProps) => {
   let div: PortableTextBlock[] = []
-
   return (
     <>
       {value?.length > 1 ? (

diff --git a/web/pageComponents/shared/Teaser.tsx b/web/pageComponents/shared/Teaser.tsx
@@ -52,6 +52,7 @@ const Teaser = ({ data, anchor }: TeaserProps) => {
   }
 
   const isSvg = image?.extension === 'svg'
+
   return (
     <BackgroundContainer {...restOptions} id={anchor} renderFragmentWhenPossible>
       <StyledEnvisTeaser imagePosition={imagePosition}>

diff --git a/web/pageComponents/topicPages/Accordion/AccordionBlock.tsx b/web/pageComponents/topicPages/Accordion/AccordionBlock.tsx
@@ -7,7 +7,7 @@ import { FAQPageJsonLd } from 'next-seo'
 
 import type { AccordionData, AccordionListData } from '../../../types/types'
 import { toPlainText } from '@portabletext/react'
-import { Heading } from '../../../core/Typography'
+import { Heading, Typography } from '../../../core/Typography'
 import { twMerge } from 'tailwind-merge'
 
 export const StyledTextBlockWrapper = styled(BackgroundContainer)<{ id: string | undefined }>`
@@ -38,6 +38,7 @@ const buildJsonLdElements = (data: AccordionListData[]) => {
 
 const AccordionBlock = ({ data, anchor, className }: AccordionBlockProps) => {
   const { title, ingress, designOptions, accordion, id, image, enableStructuredMarkup } = data
+
   return (
     <>
       <StyledTextBlockWrapper {...designOptions} id={anchor || data.anchor} renderFragmentWhenPossible>
@@ -52,7 +53,13 @@ const AccordionBlock = ({ data, anchor, className }: AccordionBlockProps) => {
               <Img image={image} maxWidth={200} aspectRatio={Ratios.ONE_TO_ONE} />
             </div>
           )}
-          {title && <Heading value={title} as="h2" variant="xl" className="mb-2" />}
+          {Array.isArray(title) ? (
+            <Heading value={title} as="h2" variant="xl" className="mb-2" />
+          ) : (
+            <Typography as="h2" variant="xl" className="mb-2">
+              {title}
+            </Typography>
+          )}
           {ingress && <IngressText value={ingress} />}
           {accordion && accordion.length > 0 && (
             <Accordion data={accordion} id={id} hasTitle={!!title} queryParamName={id} />