From 1f85145b670b9cf8ac680aa36aff4549bd3c6ead Mon Sep 17 00:00:00 2001 From: Tom Butcher Date: Mon, 17 Nov 2025 18:47:09 +0000 Subject: [PATCH] Refactor NewObjectForm to use merge for setting object data, ensuring computed values are correctly integrated with previous state. --- src/components/Dashboard/common/NewObjectForm.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Dashboard/common/NewObjectForm.jsx b/src/components/Dashboard/common/NewObjectForm.jsx index c78a1b7..7bd8af4 100644 --- a/src/components/Dashboard/common/NewObjectForm.jsx +++ b/src/components/Dashboard/common/NewObjectForm.jsx @@ -61,9 +61,10 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => { // Calculate computed values for initial data const computedValues = calculateComputedValues(defaultValues, model) const initialFormData = { ...defaultValues, ...computedValues } - form.setFieldsValue(initialFormData) - setObjectData(initialFormData) + setObjectData((prev) => { + return merge({}, prev, initialFormData) + }) } }, [form, defaultValues, calculateComputedValues, model]) @@ -113,7 +114,6 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => { // Merge all values (user input + computed values) const allValues = { ...values, ...computedValues } - setObjectData((prev) => { return merge({}, prev, allValues) })