fix(forms): formState useForm rules proxy

parti-renaissance · Sep 24, 2024 · db03a4a · db03a4a
1 parent d19ed92
commit db03a4a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/screens/actions/form/ActionForm.tsx b/src/screens/actions/form/ActionForm.tsx
@@ -77,7 +77,7 @@ export default function ActionForm({ onCancel, onClose, uuid, scope }: Props) {
     if (formState.errors.post_address) {
       setManualAddress(true)
     }
-  }, [formState.errors.post_address])
+  }, [formState])
 
   if ((!data || !isFullAction(data)) && uuid) return null
 

diff --git a/src/screens/profil/account/form/AbstractProfilForm.tsx b/src/screens/profil/account/form/AbstractProfilForm.tsx
@@ -28,12 +28,13 @@ const AbstractForm = <T extends z.Schema<any, any>, TF extends FieldValues>(
     defaultValues: props.defaultValues,
     mode: 'all',
   })
+  const { isDirty, isValid } = formState
 
   React.useEffect(() => {
     if (props.onErrors) {
       props.onErrors(formState.errors)
     }
-  }, [formState.errors])
+  }, [formState])
 
   const { mutateAsync, isPending } = useMutationUpdateProfil({ userUuid: props.uuid })
 
@@ -60,10 +61,10 @@ const AbstractForm = <T extends z.Schema<any, any>, TF extends FieldValues>(
       <VoxCard.Content>
         {props.children({ control, formState })}
         <XStack justifyContent="flex-end" gap="$2">
-          <VoxButton variant="outlined" display={formState.isDirty ? 'flex' : 'none'} onPress={() => reset()}>
+          <VoxButton variant="outlined" display={isDirty ? 'flex' : 'none'} onPress={() => reset()}>
             Annuler
           </VoxButton>
-          <VoxButton variant="outlined" theme="blue" onPress={onSubmit} loading={isPending} disabled={!formState.isDirty || !formState.isValid}>
+          <VoxButton variant="outlined" theme="blue" onPress={onSubmit} loading={isPending} disabled={!isDirty || !isValid}>
             Enregister
           </VoxButton>
         </XStack>

diff --git a/src/screens/profil/elu/components/DeclaForm.tsx b/src/screens/profil/elu/components/DeclaForm.tsx
@@ -32,6 +32,7 @@ export default function (props: Props) {
   })
 
   const { mutateAsync, isPending } = usePostElectDeclaration()
+  const { isDirty, isValid } = formState
 
   const onSubmit = handleSubmit((data) => {
     mutateAsync(data)
@@ -89,10 +90,10 @@ export default function (props: Props) {
             }}
           />
           <XStack justifyContent="flex-end" gap="$2">
-            <VoxButton variant="outlined" display={formState.isDirty ? 'flex' : 'none'} onPress={() => reset()}>
+            <VoxButton variant="outlined" display={isDirty ? 'flex' : 'none'} onPress={() => reset()}>
               Annuler
             </VoxButton>
-            <VoxButton variant="outlined" theme="blue" onPress={onSubmit} loading={isPending} disabled={!formState.isDirty || !formState.isValid}>
+            <VoxButton variant="outlined" theme="blue" onPress={onSubmit} loading={isPending} disabled={!isDirty || !isValid}>
               Enregister
             </VoxButton>
           </XStack>

diff --git a/src/screens/profil/elu/components/DeclaMandateEluCard.tsx b/src/screens/profil/elu/components/DeclaMandateEluCard.tsx
@@ -79,6 +79,7 @@ export default function (props: { profil: RestElectedProfileResponse }) {
       mandates: props.profil?.mandates || [],
     },
   })
+  const { isDirty } = formState
   const { mutateAsync, isPending } = useMutationUpdateProfil({ userUuid: props.profil.uuid })
   const onSubmit = handleSubmit((x) =>
     mutateAsync(x).then(() => {
@@ -103,10 +104,10 @@ export default function (props: { profil: RestElectedProfileResponse }) {
             }}
           />
           <XStack justifyContent="flex-end" gap="$3">
-            <VoxButton variant="outlined" disabled={!formState.isDirty} onPress={() => reset()}>
+            <VoxButton variant="outlined" disabled={!isDirty} onPress={() => reset()}>
               Annuler
             </VoxButton>
-            <VoxButton theme="blue" variant="outlined" loading={isPending} onPress={onSubmit} disabled={!formState.isDirty}>
+            <VoxButton theme="blue" variant="outlined" loading={isPending} onPress={onSubmit} disabled={!isDirty}>
               Enregistrer
             </VoxButton>
           </XStack>

diff --git a/src/screens/profil/elu/components/IbanForm.tsx b/src/screens/profil/elu/components/IbanForm.tsx
@@ -76,6 +76,8 @@ export default function (props: Props) {
     mode: 'all',
   })
 
+  const { isDirty, isValid } = formState
+
   const { mutateAsync, isPending } = usePostElectPayment()
 
   const onSubmit = handleSubmit((data) => {
@@ -178,10 +180,10 @@ export default function (props: Props) {
             }}
           />
           <XStack justifyContent="flex-end" gap="$2">
-            <VoxButton variant="outlined" display={formState.isDirty ? 'flex' : 'none'} onPress={() => reset()}>
+            <VoxButton variant="outlined" display={isDirty ? 'flex' : 'none'} onPress={() => reset()}>
               Annuler
             </VoxButton>
-            <VoxButton variant="outlined" theme="blue" onPress={onSubmit} loading={isPending} disabled={!formState.isDirty || !formState.isValid}>
+            <VoxButton variant="outlined" theme="blue" onPress={onSubmit} loading={isPending} disabled={!isDirty || !isValid}>
               Enregister
             </VoxButton>
           </XStack>