fix(Form): reset non-touched fields when form default values change (#…

…564)
cube-js · Jan 10, 2025 · 106f4b2 · 106f4b2
1 parent 18b4557
commit 106f4b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.changeset/olive-cows-compare.md b/.changeset/olive-cows-compare.md
@@ -0,0 +1,5 @@
+---
+'@cube-dev/ui-kit': minor
+---
+
+Apply form `defaultValues` change synchronously to avoid inconsistency.
diff --git a/src/components/form/Form/Form.tsx b/src/components/form/Form/Form.tsx
@@ -5,7 +5,6 @@ import {
   forwardRef,
   ReactNode,
   useContext,
-  useEffect,
   useRef,
 } from 'react';
 import { DOMRef } from '@react-types/shared';
@@ -117,6 +116,7 @@ function Form<T extends FieldTypes>(
     onSubmitFailed,
     ...otherProps
   } = props;
+  const defaultValuesRef = useRef(defaultValues);
   const firstRunRef = useRef(true);
   const isHorizontal = orientation === 'horizontal';
 
@@ -224,11 +224,10 @@ function Form<T extends FieldTypes>(
     }
   }
 
-  useEffect(() => {
-    if (defaultValues) {
-      form?.setInitialFieldsValue(defaultValues);
-    }
-  }, [defaultValues]);
+  if (defaultValuesRef.current !== defaultValues) {
+    form?.setInitialFieldsValue(defaultValues ?? {});
+    defaultValuesRef.current = defaultValues;
+  }
 
   return (
     <FormElement