From 1ee9d6bb12095e3e7da8ef55cc1143188cc471b4 Mon Sep 17 00:00:00 2001
From: Chris L <stylesuxx@gmail.com>
Date: Thu, 4 Jan 2024 20:03:33 +0100
Subject: [PATCH] Fix: Set disabled property last, otherwise it will be
 overwritten with 'undefined' from the spreaded rest property.

---
 src/components/Form/FormInput.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Form/FormInput.tsx b/src/components/Form/FormInput.tsx
index 92a40654..bd61a3f2 100644
--- a/src/components/Form/FormInput.tsx
+++ b/src/components/Form/FormInput.tsx
@@ -38,9 +38,9 @@ export function GenericInput<T extends FieldValues>({
                 : e.target.value,
             )
           }
-          disabled={disabled}
           {...field.properties}
           {...rest}
+          disabled={disabled}
         />
       )}
     />