[core] Port rjsf-team/react-jsonschema-form#4425 fix

Author: x0k

.changeset/weak-spies-matter.md

@@ -0,0 +1,5 @@
+---
+"@sjsf/form": patch
+---
+
+Port <https://github.com/rjsf-team/react-jsonschema-form/pull/4425> fix

packages/form/src/core/default-state.test.ts

@@ -3334,11 +3334,6 @@ describe("getDefaultFormState2()", () => {
       ).toEqual({
         baseRequiredProperty: {
           requiredProperty: "foo",
-          // NOTE: this part of data is not present in original test
-          // because original code ignores falsy defaults
-          optionalProperty: {
-            nestedRequiredProperty: "",
-          },
         },
       });
     });

packages/form/src/core/default-state.ts

@@ -555,13 +555,13 @@ function maybeAddDefaultToObject(
       obj.set(key, computedDefault);
     }
   } else if (emptyObjectFields !== "skipDefaults") {
-    if (isSchemaObjectValue(computedDefault)) {
-      // If isParentRequired is undefined, then we are at the root level of the schema so defer to the requiredness of
-      // the field key itself in the `requiredField` list
-      const isSelfOrParentRequired = isSchemaRoot
-        ? requiredFields.has(key)
-        : isParentRequired;
+    // If isParentRequired is undefined, then we are at the root level of the schema so defer to the requiredness of
+    // the field key itself in the `requiredField` list
+    const isSelfOrParentRequired = isSchemaRoot
+      ? requiredFields.has(key)
+      : isParentRequired;
 
+    if (isSchemaObjectValue(computedDefault)) {
       // If emptyObjectFields 'skipEmptyDefaults' store computedDefault if it's a non-empty object(e.g. not {})
       if (emptyObjectFields === "skipEmptyDefaults") {
         if (!isSchemaValueEmpty(computedDefault)) {
@@ -585,7 +585,7 @@ function maybeAddDefaultToObject(
       computedDefault !== undefined &&
       (emptyObjectFields === "populateAllDefaults" ||
         emptyObjectFields === "skipEmptyDefaults" ||
-        requiredFields.has(key))
+        (isSelfOrParentRequired && requiredFields.has(key)))
     ) {
       obj.set(key, computedDefault);
     }