From 3c4333021fb88ffb04130e4742ef272e71a84ee8 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Wed, 15 Oct 2025 10:54:38 +0700 Subject: [PATCH] feat(FE-62,65): enhance MovementForm and FormActions to improve form validation and reset behavior --- src/components/helper/form/FormActions.tsx | 12 ++++++++++-- .../pages/inventory/movement/form/MovementForm.tsx | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/helper/form/FormActions.tsx b/src/components/helper/form/FormActions.tsx index 7ced46cd..54600d00 100644 --- a/src/components/helper/form/FormActions.tsx +++ b/src/components/helper/form/FormActions.tsx @@ -64,7 +64,10 @@ export const FormActions = ({ type='reset' color='warning' className='px-4' - onClick={formik.handleReset} + onClick={() => { + formik.handleReset(); + formik.validateForm(); + }} > Reset @@ -73,7 +76,12 @@ export const FormActions = ({ color='primary' className='px-4' isLoading={formik.isSubmitting} - disabled={disableSubmit || !formik.isValid || formik.isSubmitting} + disabled={ + disableSubmit || + !formik.isValid || + !formik.dirty || + formik.isSubmitting + } > Submit diff --git a/src/components/pages/inventory/movement/form/MovementForm.tsx b/src/components/pages/inventory/movement/form/MovementForm.tsx index 5d69f03e..f196b242 100644 --- a/src/components/pages/inventory/movement/form/MovementForm.tsx +++ b/src/components/pages/inventory/movement/form/MovementForm.tsx @@ -64,6 +64,7 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => { type === 'edit' ? UpdateMovementFormSchema : MovementFormSchema, validateOnChange: true, validateOnBlur: true, + validateOnMount: true, onSubmit: async (values) => { setMovementFormErrorMessage(''); const payload: CreateMovementPayload = {