From 275ec6ef3e6ee1b88c7835e6fb646d8c2abc60a4 Mon Sep 17 00:00:00 2001 From: seaerchin Date: Wed, 13 Sep 2023 14:12:04 +0800 Subject: [PATCH] fix(herobody): solves empty highlight deafult issue --- src/layouts/EditHomepage/EditHomepage.jsx | 5 +++++ src/layouts/components/Homepage/HeroBody.tsx | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/layouts/EditHomepage/EditHomepage.jsx b/src/layouts/EditHomepage/EditHomepage.jsx index 2462c2070a..16341850a9 100644 --- a/src/layouts/EditHomepage/EditHomepage.jsx +++ b/src/layouts/EditHomepage/EditHomepage.jsx @@ -960,6 +960,11 @@ const EditHomepage = ({ match }) => { handleHighlightDropdownToggle={ handleHighlightDropdownToggle } + initialSectionType={ + section.hero.key_highlights + ? "highlights" + : "dropdown" + } > {({ currentSelectedOption }) => currentSelectedOption === "dropdown" ? ( diff --git a/src/layouts/components/Homepage/HeroBody.tsx b/src/layouts/components/Homepage/HeroBody.tsx index 038540a795..a63aadfc39 100644 --- a/src/layouts/components/Homepage/HeroBody.tsx +++ b/src/layouts/components/Homepage/HeroBody.tsx @@ -51,6 +51,7 @@ interface HeroBodyProps extends HeroBodyFormFields { children: (props: { currentSelectedOption: HeroSectionType }) => React.ReactNode + initialSectionType: HeroSectionType } export const HeroBody = ({ @@ -62,9 +63,10 @@ export const HeroBody = ({ handleHighlightDropdownToggle, notification, children, + initialSectionType, }: HeroBodyProps) => { const [heroSectionType, setHeroSectionType] = useState( - "highlights" + initialSectionType ) const { onChange } = useEditableContext() @@ -147,7 +149,7 @@ export const HeroBody = ({ }, }) }} - defaultValue="highlights" + defaultValue={initialSectionType} >