From 300fb5c3e507da0c9cc80b844e4a9258e53d6a7f Mon Sep 17 00:00:00 2001
From: Hunter Thornsberry <hunter@hunterthornsberry.com>
Date: Wed, 4 Sep 2024 21:54:48 -0400
Subject: [PATCH] fix disabled check location

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

diff --git a/src/components/Form/DynamicForm.tsx b/src/components/Form/DynamicForm.tsx
index 63d2dbf5..f957e7f0 100644
--- a/src/components/Form/DynamicForm.tsx
+++ b/src/components/Form/DynamicForm.tsx
@@ -67,10 +67,10 @@ export function DynamicForm<T extends FieldValues>({
     disabledBy?: DisabledBy<T>[],
     disabled?: boolean,
   ): boolean => {
+    if (disabled) return true;
     if (!disabledBy) return false;
 
     return disabledBy.some((field) => {
-      if (disabled) return true;
       const value = getValues(field.fieldName);
       if (value === "always") return true;
       if (typeof value === "boolean") return field.invert ? value : !value;