diff --git a/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/BackButton.tsx b/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/BackButton.tsx index 98dda43822..3323535c70 100644 --- a/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/BackButton.tsx +++ b/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/BackButton.tsx @@ -4,7 +4,7 @@ import { Button } from "@clientComponents/forms"; import { Language } from "@lib/types/form-builder-types"; // Must be placed withing context of the GCFormsContext.Provider -export const BackButton = ({ language }: { language: Language }) => { +export const BackButton = ({ language, onClick }: { language: Language; onClick?: () => void }) => { const { t } = useTranslation("review"); const { setGroup, previousGroup } = useGCFormsContext(); return ( @@ -13,6 +13,7 @@ export const BackButton = ({ language }: { language: Language }) => { secondary={true} onClick={() => { setGroup(previousGroup); + onClick && onClick(); }} > {t("goBack", { lng: language })} diff --git a/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx b/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx index 0ec464b7a7..0d5d94dd08 100644 --- a/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx +++ b/app/(gcforms)/[locale]/(form administration)/form-builder/[id]/preview/Preview.tsx @@ -27,6 +27,7 @@ import { ErrorSaving } from "@formBuilder/components/shared/ErrorSaving"; import { toast } from "@formBuilder/components/shared"; import { defaultForm } from "@lib/store/defaults"; import { showReviewPage } from "@lib/utils/form-builder/showReviewPage"; +import { focusElement } from "@lib/client/clientHelpers"; export const Preview = ({ disableSubmit = true, @@ -209,7 +210,10 @@ export const Preview = ({ return ( <> {allowGrouping && isShowReviewPage && ( - + focusElement("h2")} + /> )}