parent form should trigger subform validate event (#2820)

Co-authored-by: hoppe <hoppewang@microsoft.com>
Azure · Oct 24, 2023 · 54a9e5e · 54a9e5e
1 parent f98e158
commit 54a9e5e
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 41 deletions.
diff --git a/packages/bonito-core/src/form/__tests__/form.spec.ts b/packages/bonito-core/src/form/__tests__/form.spec.ts
@@ -528,6 +528,33 @@ describe("Form tests", () => {
         expect(validationStatus).toBe(form.validationStatus);
     });
 
+    test("Subform validate event", async () => {
+        type HelloWorldFormValues = {
+            message: string;
+        };
+
+        const form = createForm<HelloWorldFormValues>({
+            values: {
+                message: "Hello world!",
+            },
+        });
+
+        const parentForm = createForm({
+            values: {
+                child: {},
+            },
+        });
+
+        parentForm.subForm("child", form);
+
+        const validateSpy = jest.fn();
+        form.on("validate", validateSpy);
+        parentForm.validate();
+        expect(validateSpy).toHaveBeenCalled();
+        await parentForm.waitForValidation();
+        expect(validateSpy).toHaveBeenCalledTimes(2);
+    });
+
     test("Events", () => {
         type ElfType = {
             name: string;

diff --git a/packages/bonito-core/src/form/form.ts b/packages/bonito-core/src/form/form.ts
@@ -129,24 +129,6 @@ export interface Form<V extends FormValues> {
      */
     validate(opts?: ValidationOpts): Promise<ValidationSnapshot<V>>;
 
-    /**
-     * Perform synchronous validation
-     * @param opts Validation options
-     */
-    validateSync(
-        snapshot: ValidationSnapshot<V>,
-        opts: ValidationOpts
-    ): ValidationSnapshot<V>;
-
-    /**
-     * Perform asynchronous validation
-     * @param opts Validation options
-     */
-    validateAsync(
-        snapshot: ValidationSnapshot<V>,
-        opts: ValidationOpts
-    ): Promise<ValidationSnapshot<V>>;
-
     /**
      * Returns a promise that resolves when any current form validation is
      * finished. If there is no validation in progress, returns a promise which

diff --git a/packages/bonito-core/src/form/internal/form-impl.ts b/packages/bonito-core/src/form/internal/form-impl.ts
@@ -296,10 +296,6 @@ export class FormImpl<V extends FormValues> implements Form<V> {
         this._validationSnapshot = snapshot;
         this.validateSync(snapshot, opts);
 
-        // Fire a validation event to allow updates after synchronous
-        // validation to happen immediately
-        this._emitValidateEvent(snapshot);
-
         // Yield before doing any async validation to check if another validation
         // attempt has come in.
         let delayMs = 0;
@@ -320,26 +316,13 @@ export class FormImpl<V extends FormValues> implements Form<V> {
 
         await this.validateAsync(snapshot, opts);
 
-        if (this._checkAndCancelValidationSnapshot(snapshot, opts.force)) {
-            return snapshot;
-        }
-
-        // This snapshot is done, and is now the current in-effect snapshot
-        snapshot.validationCompleteDeferred.resolve();
-        snapshot.updateOverallStatus();
-        this._validationSnapshot = snapshot;
-
-        this._emitValidateEvent(snapshot);
-
-        if (!snapshot.overallStatus) {
-            // Hitting this indicates a bug. This shouldn't ever be undefined
-            // at this point.
-            throw new Error("Failed to compute overall validation status");
-        }
-
         return snapshot;
     }
 
+    /**
+     * Perform synchronous validation
+     * @param opts Validation options
+     */
     validateSync(
         snapshot: ValidationSnapshot<V>,
         opts: ValidationOpts
@@ -373,9 +356,17 @@ export class FormImpl<V extends FormValues> implements Form<V> {
 
         snapshot.syncValidationComplete = true;
 
+        // Fire a validation event to allow updates after synchronous
+        // validation to happen immediately
+        this._emitValidateEvent(snapshot);
+
         return snapshot;
     }
 
+    /**
+     * Perform asynchronous validation
+     * @param opts Validation options
+     */
     async validateAsync(
         snapshot: ValidationSnapshot<V>,
         opts: ValidationOpts
@@ -443,6 +434,23 @@ export class FormImpl<V extends FormValues> implements Form<V> {
 
         snapshot.asyncValidationComplete = true;
 
+        if (this._checkAndCancelValidationSnapshot(snapshot, opts.force)) {
+            return snapshot;
+        }
+
+        // This snapshot is done, and is now the current in-effect snapshot
+        snapshot.validationCompleteDeferred.resolve();
+        snapshot.updateOverallStatus();
+        this._validationSnapshot = snapshot;
+
+        this._emitValidateEvent(snapshot);
+
+        if (!snapshot.overallStatus) {
+            // Hitting this indicates a bug. This shouldn't ever be undefined
+            // at this point.
+            throw new Error("Failed to compute overall validation status");
+        }
+
         return snapshot;
     }
 

diff --git a/packages/bonito-core/src/form/subform.ts b/packages/bonito-core/src/form/subform.ts
@@ -220,14 +220,14 @@ export class SubForm<
         snapshot: ValidationSnapshot<S>,
         opts: ValidationOpts
     ): ValidationSnapshot<S> {
-        return this.form.validateSync(snapshot, opts);
+        return (this.form as FormImpl<S>).validateSync(snapshot, opts);
     }
 
     async validateAsync(
         snapshot: ValidationSnapshot<S>,
         opts: ValidationOpts
     ): Promise<ValidationSnapshot<S>> {
-        return this.form.validateAsync(snapshot, opts);
+        return (this.form as FormImpl<S>).validateAsync(snapshot, opts);
     }
 
     forceValidationStatus(status: ValidationStatus): void {