From 145099f9f9577e641add1b9ae9f953f684fe9766 Mon Sep 17 00:00:00 2001
From: webblocksapp <mauriver21@gmail.com>
Date: Mon, 25 Mar 2024 15:01:39 -0500
Subject: [PATCH] Fix validateOn events.

---
 .../implementations/ValidateOnImpl/index.tsx  |  7 ++-
 .../ValidateOnZodImpl/index.stories.tsx       | 12 +++++
 .../ValidateOnZodImpl/index.tsx               | 53 +++++++++++++++++++
 packages/lib/src/components/Field/index.tsx   |  6 +--
 .../lib/src/hooks/useFormHandler/index.ts     | 10 +++-
 5 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 packages/lib/examples/implementations/ValidateOnZodImpl/index.stories.tsx
 create mode 100644 packages/lib/examples/implementations/ValidateOnZodImpl/index.tsx

diff --git a/packages/lib/examples/implementations/ValidateOnImpl/index.tsx b/packages/lib/examples/implementations/ValidateOnImpl/index.tsx
index a7b1c3b3..ba3f3711 100644
--- a/packages/lib/examples/implementations/ValidateOnImpl/index.tsx
+++ b/packages/lib/examples/implementations/ValidateOnImpl/index.tsx
@@ -40,8 +40,13 @@ export const ValidateOnImpl: Component = () => {
           </div>
         </div>
         <div class="mb-3 w-100">
-          <button class="btn btn-primary me-2 mt-2">Submit</button>
+          <button disabled={formHandler.isFormInvalid()} class="btn btn-primary me-2 mt-2">
+            Submit
+          </button>
         </div>
+        <pre>
+          <code>{JSON.stringify(formHandler._.getFormState(), null, 2)}</code>
+        </pre>
       </form>
     </>
   );
diff --git a/packages/lib/examples/implementations/ValidateOnZodImpl/index.stories.tsx b/packages/lib/examples/implementations/ValidateOnZodImpl/index.stories.tsx
new file mode 100644
index 00000000..77539e5d
--- /dev/null
+++ b/packages/lib/examples/implementations/ValidateOnZodImpl/index.stories.tsx
@@ -0,0 +1,12 @@
+import type { Meta } from 'storybook-solidjs';
+
+import { ValidateOnZodImpl } from '.';
+
+const meta = {
+  title: 'BS5 Implementations',
+  component: ValidateOnZodImpl,
+} satisfies Meta<typeof ValidateOnZodImpl>;
+
+export default meta;
+
+export const ValidateOnZod = {};
diff --git a/packages/lib/examples/implementations/ValidateOnZodImpl/index.tsx b/packages/lib/examples/implementations/ValidateOnZodImpl/index.tsx
new file mode 100644
index 00000000..b1bb97a8
--- /dev/null
+++ b/packages/lib/examples/implementations/ValidateOnZodImpl/index.tsx
@@ -0,0 +1,53 @@
+import { Component } from 'solid-js';
+import { useFormHandler } from '@hooks';
+import { zodSchema } from '@adapters';
+import { TextInput } from '@example-components';
+import { z } from 'zod';
+
+export type Schema = { name: string; email: string };
+
+export const schema = z.object({
+  name: z.string().min(1, 'Required field'),
+  email: z.string().email().min(1, 'Required field'),
+});
+
+export const ValidateOnZodImpl: Component = () => {
+  const formHandler = useFormHandler(zodSchema(schema), {
+    validateOn: ['input'],
+  });
+  const { formData } = formHandler;
+
+  const submit = async (event: Event) => {
+    event.preventDefault();
+    try {
+      await formHandler.validateForm();
+      alert(JSON.stringify(formData()));
+      formHandler.resetForm();
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+  return (
+    <>
+      <form onSubmit={submit}>
+        <div class="row gy-3">
+          <div class="col-sm-12 col-md-6">
+            <TextInput label="Name" name="name" formHandler={formHandler} />
+          </div>
+          <div class="col-sm-12 col-md-6">
+            <TextInput label="Email" name="email" formHandler={formHandler} />
+          </div>
+        </div>
+        <div class="mb-3 w-100">
+          <button disabled={formHandler.isFormInvalid()} class="btn btn-primary me-2 mt-2">
+            Submit
+          </button>
+        </div>
+        <pre>
+          <code>{JSON.stringify(formHandler._.getFormState(), null, 2)}</code>
+        </pre>
+      </form>
+    </>
+  );
+};
diff --git a/packages/lib/src/components/Field/index.tsx b/packages/lib/src/components/Field/index.tsx
index 5378822a..a2663a36 100644
--- a/packages/lib/src/components/Field/index.tsx
+++ b/packages/lib/src/components/Field/index.tsx
@@ -1,5 +1,5 @@
 import { CommonEvent, FieldProps, SetFieldValueOptions, ValidateFieldOptions } from '@interfaces';
-import { createEffect, createUniqueId, splitProps } from 'solid-js';
+import { createEffect, createUniqueId, mergeProps, splitProps } from 'solid-js';
 import { useFieldContext, withFieldProvider } from '@hocs';
 import {
   CheckboxField,
@@ -48,8 +48,8 @@ export const Field = withFieldProvider((props: FieldComponentProps) => {
    * if no form field event attribute matches the expected interface.
    */
   const onFieldBlur = (options?: ValidateFieldOptions) => {
-    props.formHandler?.validateField?.(props.name, options);
     props.formHandler?.touchField?.(props.name);
+    props.formHandler?.setFieldValue(props.name, props.formHandler?.getFieldValue(props.name), options);
   };
 
   /**
@@ -57,7 +57,7 @@ export const Field = withFieldProvider((props: FieldComponentProps) => {
    */
   const onBlur: FieldComponentProps['onBlur'] = (event) => {
     //Form handler prop validate and touch the field.
-    onFieldBlur(props.onBlurOptions);
+    onFieldBlur({ ...props.onBlurOptions, validateOn: ['blur'] });
 
     //onBlur prop is preserved
     if (typeof props.onBlur === 'function') {
diff --git a/packages/lib/src/hooks/useFormHandler/index.ts b/packages/lib/src/hooks/useFormHandler/index.ts
index c957cf96..5c5390cf 100644
--- a/packages/lib/src/hooks/useFormHandler/index.ts
+++ b/packages/lib/src/hooks/useFormHandler/index.ts
@@ -199,8 +199,16 @@ export const useFormHandler = <T = any>(validationSchema: ValidationSchema<T>, o
     _?: FormStateUpdateBehavior
   ): Promise<any> => {
     if (!path) return;
+    const validateOn = options?.validateOn || formHandlerOptions.validateOn;
+
+    options = {
+      touch: true,
+      dirty: true,
+      validate: hasEventTypes(validateOn),
+      mapValue: (value) => value,
+      ...options,
+    };
 
-    options = { touch: true, dirty: true, validate: true, mapValue: (value) => value, ...options };
     setFieldData(path, value, { mapValue: options.mapValue });
 
     const promises = Promise.all([