From 0d8d955277bd60f7396d08d099246e6231f7b00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=95=9C=EC=9E=AC=EC=A4=80?= <jj2726@daimresearch.com>
Date: Fri, 3 May 2024 17:33:12 +0900
Subject: [PATCH] fix #3759

---
 packages/core/src/components/fields/ObjectField.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/components/fields/ObjectField.tsx b/packages/core/src/components/fields/ObjectField.tsx
index 107cda80df..c782faec27 100644
--- a/packages/core/src/components/fields/ObjectField.tsx
+++ b/packages/core/src/components/fields/ObjectField.tsx
@@ -13,6 +13,7 @@ import {
   TranslatableString,
   ADDITIONAL_PROPERTY_FLAG,
   PROPERTIES_KEY,
+  DEFAULT_KEY,
   REF_KEY,
   ANY_OF_KEY,
   ONE_OF_KEY,
@@ -137,7 +138,7 @@ class ObjectField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends Fo
       if (oldValue === value) {
         return;
       }
-      const { formData, onChange, errorSchema } = this.props;
+      const { formData, onChange, errorSchema, schema } = this.props;
 
       value = this.getAvailableKey(value, formData);
       const newFormData: GenericObjectType = {
@@ -152,6 +153,12 @@ class ObjectField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends Fo
 
       this.setState({ wasPropertyKeyModified: true });
 
+      if (DEFAULT_KEY in schema) {
+        const defaults = schema[DEFAULT_KEY] as GenericObjectType;
+        unset(defaults, oldValue);
+        set(defaults, value, newFormData[oldValue]);
+      }
+
       onChange(
         renamedObj,
         errorSchema &&