Fix field validation causing form to submit without validation

NYPL · Dec 20, 2024 · 8b2d38d · 8b2d38d
1 parent c03586a
commit 8b2d38d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/components/HoldPages/EDDRequestForm.tsx b/src/components/HoldPages/EDDRequestForm.tsx
@@ -79,15 +79,14 @@ const EDDRequestForm = ({
 
   const validateAndSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault()
+    const newValidatedFields = validateEDDForm(eddFormState, invalidFields)
 
     // Validate the form on submission in case the user hasn't typed in all the required fields
-    setInvalidFields((prevInvalidFields) =>
-      validateEDDForm(eddFormState, prevInvalidFields)
-    )
+    setInvalidFields(newValidatedFields)
 
     // Find the first invalid field and focus on it
-    const firstInvalidField = invalidFields.find(
-      (firstInvalidFieldKey) => firstInvalidFieldKey.isInvalid
+    const firstInvalidField = newValidatedFields.find(
+      (validatedFieldKey) => validatedFieldKey.isInvalid
     )
 
     // Prevent form submission and focus on first invalid field if there is one