WIP

Author: x0k

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

@@ -938,8 +938,7 @@ describe("getDefaultFormState2()", () => {
           testValidator,
           defaultMerger,
           schema,
-          { ...defaults, rootSchema: schema },
-          {},
+          { ...defaults, rootSchema: schema, rawFormData: {} },
           undefined
         )
       ).toEqual({
@@ -972,8 +971,7 @@ describe("getDefaultFormState2()", () => {
           testValidator,
           defaultMerger,
           schema,
-          { ...defaults, rootSchema: schema },
-          {},
+          { ...defaults, rawFormData: {}, rootSchema: schema },
           undefined
         )
       ).toEqual({
@@ -1015,8 +1013,8 @@ describe("getDefaultFormState2()", () => {
             ...defaults,
             rootSchema: schema,
             includeUndefinedValues: true,
+            rawFormData: {},
           },
-          {},
           undefined
         )
       ).toEqual({
@@ -1065,8 +1063,8 @@ describe("getDefaultFormState2()", () => {
             ...defaults,
             rootSchema: schema,
             includeUndefinedValues: "excludeObjectChildren",
+            rawFormData: {},
           },
-          {},
           undefined
         )
       ).toEqual({
@@ -1097,8 +1095,7 @@ describe("getDefaultFormState2()", () => {
           testValidator,
           defaultMerger,
           schema,
-          { ...defaults, rootSchema: schema },
-          {},
+          { ...defaults, rootSchema: schema, rawFormData: {} },
           { foo: "bar" }
         )
       ).toEqual({
@@ -1132,8 +1129,8 @@ describe("getDefaultFormState2()", () => {
             ...defaults,
             rootSchema: schema,
             includeUndefinedValues: true,
+            rawFormData: {},
           },
-          {},
           {
             foo: "bar",
           }
@@ -1180,7 +1177,6 @@ describe("getDefaultFormState2()", () => {
             rootSchema: schema,
             rawFormData: { test: { foo: "x", newKey: {} } },
           },
-          {},
           undefined
         )
       ).toEqual({
@@ -1230,7 +1226,6 @@ describe("getDefaultFormState2()", () => {
             rootSchema: schema,
             rawFormData: { test: { foo: "x", newKey: {} } },
           },
-          {},
           undefined
         )
       ).toEqual({
@@ -1277,7 +1272,6 @@ describe("getDefaultFormState2()", () => {
             rootSchema: schema,
             rawFormData: {},
           },
-          {},
           undefined
         )
       ).toEqual({});
@@ -1298,8 +1292,8 @@ describe("getDefaultFormState2()", () => {
             ...defaults,
             rootSchema: schema,
             includeUndefinedValues: "excludeObjectChildren",
+            rawFormData: {},
           },
-          {},
           undefined
         )
       ).toEqual({});
@@ -1313,8 +1307,8 @@ describe("getDefaultFormState2()", () => {
           {
             ...defaults,
             rootSchema: RECURSIVE_REF_ALLOF,
+            rawFormData: {},
           },
-          {},
           undefined
         )
       ).toEqual({
@@ -1328,8 +1322,7 @@ describe("getDefaultFormState2()", () => {
           testValidator,
           defaultMerger,
           schema,
-          defaults,
-          {},
+          { ...defaults, rawFormData: {} },
           undefined
         )
       ).toStrictEqual({});

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

@@ -199,10 +199,10 @@ interface ComputeDefaultsProps {
   required?: boolean;
 }
 
-interface ComputeDefaultsProps2 {
+interface ComputeDefaultsProps2<FormData = SchemaValue | undefined> {
   parentDefaults: SchemaValue | undefined;
   rootSchema: Schema;
-  rawFormData: SchemaValue | undefined;
+  rawFormData: FormData;
   includeUndefinedValues: boolean | "excludeObjectChildren";
   stack: Set<string>;
   experimental_defaultFormStateBehavior: Experimental_DefaultFormStateBehavior;
@@ -312,8 +312,10 @@ export function computeDefaults3(
         validator,
         merger,
         schema,
-        computeDefaultsProps,
-        formData,
+        {
+          ...computeDefaultsProps,
+          rawFormData: formData,
+        },
         defaults
       ),
     };
@@ -516,17 +518,15 @@ export function getDefaultBasedOnSchemaType(
   switch (getSimpleSchemaType(rawSchema)) {
     // We need to recurse for object schema inner default values.
     case "object": {
-      const formData: SchemaObjectValue = isSchemaObjectValue(
-        computeDefaultsProps.rawFormData
-      )
-        ? computeDefaultsProps.rawFormData
-        : {};
+      const { rawFormData } = computeDefaultsProps;
       return getObjectDefaults(
         validator,
         merger,
         rawSchema,
-        computeDefaultsProps,
-        formData,
+        {
+          ...computeDefaultsProps,
+          rawFormData: isSchemaObjectValue(rawFormData) ? rawFormData : {},
+        },
         defaults
       );
     }
@@ -555,8 +555,8 @@ export function getObjectDefaults(
     experimental_defaultFormStateBehavior,
     required,
     isSchemaRoot,
-  }: ComputeDefaultsProps2,
-  formData: SchemaObjectValue,
+    rawFormData: formData,
+  }: ComputeDefaultsProps2<SchemaObjectValue>,
   defaults: SchemaValue | undefined
 ): SchemaObjectValue {
   // This is a custom addition that fixes this issue:
@@ -589,7 +589,8 @@ export function getObjectDefaults(
         required: retrievedSchemaRequired.has(key),
         isSchemaRoot: false,
       });
-      const isConst = value.const !== undefined || parentConstObject[key] !== undefined;
+      const isConst =
+        value.const !== undefined || parentConstObject[key] !== undefined;
       maybeAddDefaultToObject(
         objDefaults,
         key,