[form] Port rjsf-team/react-jsonschema-form#4490

Author: x0k

.changeset/fuzzy-papayas-serve.md

@@ -0,0 +1,5 @@
+---
+"@sjsf/form": major
+---
+
+Port https://github.com/rjsf-team/react-jsonschema-form/pull/4490

packages/form/src/form/create-form.svelte.ts

@@ -316,10 +316,11 @@ export function createForm<T>(options: FormOptions<T>): FormState<T> {
     options.value
       ? refFromBind(options.value as unknown as Bind<FormValue>)
       : createValueRef(
-          merger.mergeFormDataAndSchemaDefaults(
-            options.initialValue as FormValue,
-            options.schema
-          )
+          merger.mergeFormDataAndSchemaDefaults({
+            formData: options.initialValue as FormValue,
+            schema: options.schema,
+            initialDefaultsGenerated: false,
+          })
         )
   );
   const errors = $derived(
@@ -383,6 +384,14 @@ export function createForm<T>(options: FormOptions<T>): FormState<T> {
   const isSubmitted = $derived(
     internalHasFieldState(fieldsStateMap, rootPath, FIELD_SUBMITTED)
   );
+  let isFirstRender = true
+  let initialDefaultsGenerated = $derived.by(() => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    options.schema;
+    const result = isFirstRender
+    isFirstRender = false
+    return result
+  });
   // STATE END
 
   const validateForm: AsyncFormValueValidator["validateFormValueAsync"] =
@@ -500,10 +509,11 @@ export function createForm<T>(options: FormOptions<T>): FormState<T> {
     e.preventDefault();
     fieldsStateMap.clear();
     errors.clear();
-    valueRef.current = merger.mergeFormDataAndSchemaDefaults(
-      options.initialValue as FormValue,
-      options.schema
-    );
+    valueRef.current = merger.mergeFormDataAndSchemaDefaults({
+      formData: options.initialValue as FormValue,
+      schema: options.schema,
+      initialDefaultsGenerated: false,
+    });
     options.onReset?.(e);
   }
 
@@ -514,10 +524,11 @@ export function createForm<T>(options: FormOptions<T>): FormState<T> {
       return getSnapshot() as T | undefined;
     },
     set value(v) {
-      valueRef.current = merger.mergeFormDataAndSchemaDefaults(
-        v as FormValue,
-        options.schema
-      );
+      valueRef.current = merger.mergeFormDataAndSchemaDefaults({
+        formData: v as FormValue,
+        schema: options.schema,
+        initialDefaultsGenerated: true,
+      });
     },
     get isSubmitted() {
       return isSubmitted;
@@ -606,10 +617,12 @@ export function createForm<T>(options: FormOptions<T>): FormState<T> {
   let isDefaultsInjectionQueued = false;
   function injectSchemaDefaults() {
     isDefaultsInjectionQueued = false;
-    const nextValue = merger.mergeFormDataAndSchemaDefaults(
-      valueRef.current,
-      options.schema
-    );
+    const nextValue = merger.mergeFormDataAndSchemaDefaults({
+      formData: valueRef.current,
+      schema: options.schema,
+      initialDefaultsGenerated,
+    });
+    initialDefaultsGenerated = true;
     const change = reconcileSchemaValues(valueRef.current, nextValue);
     if (change !== UNCHANGED) {
       valueRef.current = change;

packages/form/src/form/merger.ts

@@ -1,11 +1,16 @@
-import { type Merger, type Schema, type SchemaValue } from "@/core/index.js";
+import type { Merger, Schema, SchemaValue } from "@/core/index.js";
+
+export interface MergeFormDataAndSchemaDefaultsOptions {
+  schema: Schema;
+  formData: SchemaValue | undefined;
+  initialDefaultsGenerated: boolean;
+}
 
 export interface FormMerger extends Merger {
   /**
    * Merges defaults of `schema` into `formData`
    */
   mergeFormDataAndSchemaDefaults(
-    formData: SchemaValue | undefined,
-    schema: Schema
+    options: MergeFormDataAndSchemaDefaultsOptions
   ): SchemaValue | undefined;
 }

packages/form/src/form/state/schema.ts

@@ -118,7 +118,11 @@ export function getDefaultFieldState<T>(
   schema: Schema,
   formData: SchemaValue | undefined
 ) {
-  return ctx[FORM_MERGER].mergeFormDataAndSchemaDefaults(formData, schema);
+  return ctx[FORM_MERGER].mergeFormDataAndSchemaDefaults({
+    formData,
+    schema,
+    initialDefaultsGenerated: false,
+  });
 }
 
 export function markSchemaChange<T>(ctx: FormState<T>) {

packages/form/src/mergers/legacy.ts

@@ -181,15 +181,20 @@ export function createFormMerger(options: FormMergerOptions): FormMerger {
   const merger = createMerger();
   return {
     ...merger,
-    mergeFormDataAndSchemaDefaults(formData, schema) {
+    mergeFormDataAndSchemaDefaults({
+      formData,
+      schema,
+      initialDefaultsGenerated,
+    }) {
       return getDefaultFormState(
         options.validator,
         merger,
         schema,
         formData,
         options.schema,
         options.includeUndefinedValues,
-        options
+        options,
+        initialDefaultsGenerated
       );
     },
   };

packages/form/src/mergers/modern.ts

@@ -44,15 +44,20 @@ export function createFormMerger(options: FormMergerOptions): FormMerger {
   const merger = createMerger(options);
   return {
     ...merger,
-    mergeFormDataAndSchemaDefaults(formData, schema) {
+    mergeFormDataAndSchemaDefaults({
+      formData,
+      schema,
+      initialDefaultsGenerated,
+    }) {
       return getDefaultFormState(
         options.validator,
         merger,
         schema,
         formData,
         options.schema,
         options.includeUndefinedValues,
-        options
+        options,
+        initialDefaultsGenerated
       );
     },
   };