Merge pull request #101 from rumeshudash/main

Optimize AutoForm value change handling
vantezzen · Oct 4, 2024 · dea897c · dea897c
2 parents 6957675 + 64e5b63
commit dea897c
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/components/ui/auto-form/index.tsx b/src/components/ui/auto-form/index.tsx
@@ -72,17 +72,17 @@ function AutoForm<SchemaType extends ZodObjectOrWrapped>({
     }
   }
 
-  const values = form.watch();
-  // valuesString is needed because form.watch() returns a new object every time
-  const valuesString = JSON.stringify(values);
-
   React.useEffect(() => {
-    onValuesChangeProp?.(values);
-    const parsedValues = formSchema.safeParse(values);
-    if (parsedValues.success) {
-      onParsedValuesChange?.(parsedValues.data);
-    }
-  }, [valuesString]);
+    const subscription = form.watch((values) => {
+      onValuesChangeProp?.(values);
+      const parsedValues = formSchema.safeParse(values);
+      if (parsedValues.success) {
+        onParsedValuesChange?.(parsedValues.data);
+      }
+    });
+
+    return () => subscription.unsubscribe();
+  }, [form, formSchema, onValuesChangeProp, onParsedValuesChange]);
 
   const renderChildren =
     typeof children === "function"