diff --git a/apps/backend/src/blocks/Banner/Component.tsx b/apps/backend/src/blocks/Banner/Component.tsx index 6abb8ad..3b84dc9 100644 --- a/apps/backend/src/blocks/Banner/Component.tsx +++ b/apps/backend/src/blocks/Banner/Component.tsx @@ -3,6 +3,7 @@ import type { BannerBlock as BannerBlockProps } from 'src/payload-types' import { cn } from '@/utilities/ui' import React from 'react' import RichText from '@/components/RichText' +import type { DefaultTypedEditorState } from '@payloadcms/richtext-lexical' type Props = { className?: string @@ -19,7 +20,11 @@ export const BannerBlock: React.FC = ({ className, content, style }) => { 'border-warning bg-warning/30': style === 'warning', })} > - + ) diff --git a/apps/backend/src/blocks/CallToAction/Component.tsx b/apps/backend/src/blocks/CallToAction/Component.tsx index 6b3771c..dbf6825 100644 --- a/apps/backend/src/blocks/CallToAction/Component.tsx +++ b/apps/backend/src/blocks/CallToAction/Component.tsx @@ -3,6 +3,7 @@ import React from 'react' import type { CallToActionBlock as CTABlockProps } from '@/payload-types' import RichText from '@/components/RichText' +import type { DefaultTypedEditorState } from '@payloadcms/richtext-lexical' import { CMSLink } from '@/components/Link' export const CallToActionBlock: React.FC = ({ links, richText }) => { @@ -10,7 +11,13 @@ export const CallToActionBlock: React.FC = ({ links, richText })
- {richText && } + {richText && ( + + )}
{(links || []).map(({ link }, i) => { diff --git a/apps/backend/src/blocks/Content/Component.tsx b/apps/backend/src/blocks/Content/Component.tsx index 2c2550b..1ee509c 100644 --- a/apps/backend/src/blocks/Content/Component.tsx +++ b/apps/backend/src/blocks/Content/Component.tsx @@ -1,6 +1,7 @@ import { cn } from '@/utilities/ui' import React from 'react' import RichText from '@/components/RichText' +import type { DefaultTypedEditorState } from '@payloadcms/richtext-lexical' import type { ContentBlock as ContentBlockProps } from '@/payload-types' @@ -31,7 +32,9 @@ export const ContentBlock: React.FC = (props) => { })} key={index} > - {richText && } + {richText && ( + + )} {enableLink && }
diff --git a/apps/backend/src/blocks/Form/Component.tsx b/apps/backend/src/blocks/Form/Component.tsx index f5f5639..19a97c5 100644 --- a/apps/backend/src/blocks/Form/Component.tsx +++ b/apps/backend/src/blocks/Form/Component.tsx @@ -121,7 +121,7 @@ export const FormBlock: React.FC<
{!isLoading && hasSubmitted && confirmationType === 'message' && ( - + )} {isLoading && !hasSubmitted &&

Loading, please wait...

} {error &&
{`${error.status || '500'}: ${error.message || ''}`}
} diff --git a/apps/backend/src/blocks/MediaBlock/Component.tsx b/apps/backend/src/blocks/MediaBlock/Component.tsx index a88896a..9ac0f0e 100644 --- a/apps/backend/src/blocks/MediaBlock/Component.tsx +++ b/apps/backend/src/blocks/MediaBlock/Component.tsx @@ -3,6 +3,7 @@ import type { StaticImageData } from 'next/image' import { cn } from '@/utilities/ui' import React from 'react' import RichText from '@/components/RichText' +import type { DefaultTypedEditorState } from '@payloadcms/richtext-lexical' import type { MediaBlock as MediaBlockProps } from '@/payload-types' @@ -59,7 +60,7 @@ export const MediaBlock: React.FC = (props) => { captionClassName, )} > - +
)}
diff --git a/apps/backend/src/heros/HighImpact/index.tsx b/apps/backend/src/heros/HighImpact/index.tsx index ae4d9f1..5015fb0 100644 --- a/apps/backend/src/heros/HighImpact/index.tsx +++ b/apps/backend/src/heros/HighImpact/index.tsx @@ -7,6 +7,7 @@ import type { Page } from '@/payload-types' import { CMSLink } from '@/components/Link' import { Media } from '@/components/Media' import RichText from '@/components/RichText' +import type { DefaultTypedEditorState } from '@payloadcms/richtext-lexical' export const HighImpactHero: React.FC = ({ links, media, richText }) => { const { setHeaderTheme } = useHeaderTheme() @@ -22,7 +23,13 @@ export const HighImpactHero: React.FC = ({ links, media, richText >
- {richText && } + {richText && ( + + )} {Array.isArray(links) && links.length > 0 && (
    {links.map(({ link }, i) => { diff --git a/apps/backend/src/heros/LowImpact/index.tsx b/apps/backend/src/heros/LowImpact/index.tsx index 7ea6183..7dafd79 100644 --- a/apps/backend/src/heros/LowImpact/index.tsx +++ b/apps/backend/src/heros/LowImpact/index.tsx @@ -3,6 +3,7 @@ import React from 'react' import type { Page } from '@/payload-types' import RichText from '@/components/RichText' +import type { DefaultTypedEditorState } from '@payloadcms/richtext-lexical' type LowImpactHeroType = | { @@ -18,7 +19,10 @@ export const LowImpactHero: React.FC = ({ children, richText return (
    - {children || (richText && )} + {children || + (richText && ( + + ))}
    ) diff --git a/apps/backend/src/heros/MediumImpact/index.tsx b/apps/backend/src/heros/MediumImpact/index.tsx index 14639a8..e1588c9 100644 --- a/apps/backend/src/heros/MediumImpact/index.tsx +++ b/apps/backend/src/heros/MediumImpact/index.tsx @@ -5,12 +5,19 @@ import type { Page } from '@/payload-types' import { CMSLink } from '@/components/Link' import { Media } from '@/components/Media' import RichText from '@/components/RichText' +import type { DefaultTypedEditorState } from '@payloadcms/richtext-lexical' export const MediumImpactHero: React.FC = ({ links, media, richText }) => { return (
    - {richText && } + {richText && ( + + )} {Array.isArray(links) && links.length > 0 && (
      @@ -35,7 +42,7 @@ export const MediumImpactHero: React.FC = ({ links, media, richTex /> {media?.caption && (
      - +
      )}