Merge pull request #5476 from dfe-analytical-services/EES-5580-editab…

…le-content-bug EES-5580 validate EditableContentForm on submit after reinitialisation
dfe-analytical-services · Dec 20, 2024 · 8c58d8b · 8c58d8b
2 parents ef639a0 + 7372f24
commit 8c58d8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/explore-education-statistics-admin/src/components/editable/EditableContentForm.tsx b/src/explore-education-statistics-admin/src/components/editable/EditableContentForm.tsx
@@ -289,6 +289,7 @@ const EditableContentForm = ({
                   onChange={setElements}
                   onCancelComment={toggleCommentAddForm.off}
                   onClickAddComment={toggleCommentAddForm.on}
+                  onElementsReady={setElements}
                   onImageUpload={onImageUpload}
                   onImageUploadCancel={onImageUploadCancel}
                 />

diff --git a/src/explore-education-statistics-admin/src/components/form/FormFieldEditor.tsx b/src/explore-education-statistics-admin/src/components/form/FormFieldEditor.tsx
@@ -42,6 +42,7 @@ export default function FormFieldEditor<TFormValues extends FieldValues>({
   testId,
   onBlur,
   onChange,
+  onElementsReady,
   ...props
 }: Props<TFormValues>) {
   const {
@@ -86,7 +87,10 @@ export default function FormFieldEditor<TFormValues extends FieldValues>({
           }
         }}
         onElementsChange={handleElements}
-        onElementsReady={handleElements}
+        onElementsReady={els => {
+          handleElements(els);
+          onElementsReady?.(els);
+        }}
         onChange={nextValue => {
           setValue(
             name,