solid-hook-form 2.1.0 → 2.3.0

package/dist/main.d.ts

@@ -67,6 +67,16 @@ type ControllerProps<F extends FormValues> = {
 
 type DirtyFields<F extends FormValues = FormValues> = Partial<Record<Path<F>, boolean>>;
 
+type ResetOptions = {
+    keepErrors?: boolean;
+    keepValues?: boolean;
+    keepTouched?: boolean;
+    keepDirty?: boolean;
+    keepIsSubmitted?: boolean;
+    keepSubmitCount?: boolean;
+};
+type Reset<F extends FormValues> = (values?: Partial<F>, options?: ResetOptions) => void;
+
 type TouchedFields<F extends FormValues = FormValues> = Partial<Record<Path<F>, boolean>>;
 
 type FormValues = Record<string, any>;
@@ -87,11 +97,6 @@ type Trigger<F extends FormValues> = (name?: Path<F> | Path<F>[], options?: Trig
 type SubmitHandler<F extends FormValues> = (values: F) => void;
 type SubmitErrorHandler<F extends FormValues> = (errors: FieldErrors<F>) => void;
 type HandleSubmit<F extends FormValues> = (onSubmit: SubmitHandler<F>, onError?: SubmitErrorHandler<F>) => (event: SubmitEvent) => void;
-type ResetOptions = {
-    keepTouched?: boolean;
-    keepDirty?: boolean;
-};
-type Reset<F extends FormValues> = (newDefaultValues?: Partial<F>, options?: ResetOptions) => void;
 type CreateFormArg<F extends FormValues> = {
     defaultValues: F;
     mode?: "onChange" | "onSubmit" | "onBlur";
@@ -105,6 +110,8 @@ type CreateFormReturn<F extends FormValues = FormValues> = {
         isDirty: Accessor<boolean>;
         touchedFields: Accessor<TouchedFields<F>>;
         dirtyFields: Accessor<DirtyFields<F>>;
+        isSubmitted: Accessor<boolean>;
+        submitCount: Accessor<number>;
     };
     values: Accessor<F>;
     errors: FieldErrors<F>;

package/dist/main.js

@@ -95,7 +95,10 @@ var createErrors = () => {
       })
     );
   };
-  const resetErrors = () => {
+  const resetErrors = (keepErrors) => {
+    if (keepErrors) {
+      return;
+    }
     setErrors(reconcile({}));
   };
   return {
@@ -143,6 +146,23 @@ var createRules = () => {
   };
   return { rules, addRule, getRule };
 };
+var createSubmit = () => {
+  const [isSubmitted, setIsSubmitted] = createSignal(false);
+  const [submitCount, setSubmitCount] = createSignal(0);
+  const logSubmit = () => {
+    setIsSubmitted(true);
+    setSubmitCount((prev) => prev + 1);
+  };
+  const resetSubmit = (keepIsSubmitted, keepSubmitCount) => {
+    if (!keepIsSubmitted) {
+      setIsSubmitted(false);
+    }
+    if (!keepSubmitCount) {
+      setSubmitCount(0);
+    }
+  };
+  return { isSubmitted, submitCount, logSubmit, resetSubmit };
+};
 var createTouchedFields = () => {
   const [touchedFields, setTouchedFields] = createSignal({});
   const addTouched = (name) => {
@@ -280,6 +300,7 @@ var createForm = (arg) => {
   const { errors, appendError, removeError, resetErrors, getError } = createErrors();
   const { touchedFields, addTouched, resetTouched } = createTouchedFields();
   const { dirtyFields, isDirty, checkDirty, resetDirty } = createDirtyFields(defaultValues);
+  const { isSubmitted, submitCount, logSubmit, resetSubmit } = createSubmit();
   const isValid = createMemo(() => {
     return !Object.keys(errors).length;
   });
@@ -415,6 +436,7 @@ var createForm = (arg) => {
   const handleSubmit = (onSubmit, onError) => {
     return async (event) => {
       event.preventDefault();
+      logSubmit();
       await validateAllFields();
       if (isValid()) {
         onSubmit(getValues());
@@ -425,11 +447,15 @@ var createForm = (arg) => {
     };
   };
   const reset = (values2, options = {}) => {
-    const newValues = values2 ? values2 : structuredClone(defaultValues);
-    setValues(() => newValues);
-    resetErrors();
+    resetSubmit(options.keepIsSubmitted, options.keepSubmitCount);
+    resetErrors(options.keepErrors);
     resetTouched(options.keepTouched);
     resetDirty(options.keepDirty);
+    if (options.keepValues) {
+      return;
+    }
+    const newValues = values2 ? values2 : structuredClone(defaultValues);
+    setValues(() => newValues);
     Object.entries(fields).forEach(([name, field]) => {
       setFieldValue(field, get(newValues, name));
     });
@@ -452,7 +478,9 @@ var createForm = (arg) => {
       isValid,
       isDirty,
       touchedFields,
-      dirtyFields
+      dirtyFields,
+      isSubmitted,
+      submitCount
     },
     values,
     errors,

package/dist/main.jsx

@@ -1,5 +1,5 @@
 // src/create_form.ts
-import { createMemo as createMemo2, createSignal as createSignal3 } from "solid-js";
+import { createMemo as createMemo2, createSignal as createSignal4 } from "solid-js";
 
 // src/logic/create_dirty_fields.ts
 import { createMemo, createSignal } from "solid-js";
@@ -98,7 +98,10 @@ var createErrors = () => {
       })
     );
   };
-  const resetErrors = () => {
+  const resetErrors = (keepErrors) => {
+    if (keepErrors) {
+      return;
+    }
     setErrors(reconcile({}));
   };
   return {
@@ -147,10 +150,30 @@ var createRules = () => {
   return { rules, addRule, getRule };
 };
 
-// src/logic/create_touched_fields.ts
+// src/logic/create_submit.ts
 import { createSignal as createSignal2 } from "solid-js";
+var createSubmit = () => {
+  const [isSubmitted, setIsSubmitted] = createSignal2(false);
+  const [submitCount, setSubmitCount] = createSignal2(0);
+  const logSubmit = () => {
+    setIsSubmitted(true);
+    setSubmitCount((prev) => prev + 1);
+  };
+  const resetSubmit = (keepIsSubmitted, keepSubmitCount) => {
+    if (!keepIsSubmitted) {
+      setIsSubmitted(false);
+    }
+    if (!keepSubmitCount) {
+      setSubmitCount(0);
+    }
+  };
+  return { isSubmitted, submitCount, logSubmit, resetSubmit };
+};
+
+// src/logic/create_touched_fields.ts
+import { createSignal as createSignal3 } from "solid-js";
 var createTouchedFields = () => {
-  const [touchedFields, setTouchedFields] = createSignal2({});
+  const [touchedFields, setTouchedFields] = createSignal3({});
   const addTouched = (name) => {
     setTouchedFields((prev) => {
       const newState = { ...prev };
@@ -282,10 +305,11 @@ var createForm = (arg) => {
   const { defaultValues, mode = "onChange", resolver } = arg;
   const { fields, getField, setField } = createFields();
   const { rules, addRule, getRule } = createRules();
-  const [values, setValues] = createSignal3(structuredClone(defaultValues));
+  const [values, setValues] = createSignal4(structuredClone(defaultValues));
   const { errors, appendError, removeError, resetErrors, getError } = createErrors();
   const { touchedFields, addTouched, resetTouched } = createTouchedFields();
   const { dirtyFields, isDirty, checkDirty, resetDirty } = createDirtyFields(defaultValues);
+  const { isSubmitted, submitCount, logSubmit, resetSubmit } = createSubmit();
   const isValid = createMemo2(() => {
     return !Object.keys(errors).length;
   });
@@ -421,6 +445,7 @@ var createForm = (arg) => {
   const handleSubmit = (onSubmit, onError) => {
     return async (event) => {
       event.preventDefault();
+      logSubmit();
       await validateAllFields();
       if (isValid()) {
         onSubmit(getValues());
@@ -431,11 +456,15 @@ var createForm = (arg) => {
     };
   };
   const reset = (values2, options = {}) => {
-    const newValues = values2 ? values2 : structuredClone(defaultValues);
-    setValues(() => newValues);
-    resetErrors();
+    resetSubmit(options.keepIsSubmitted, options.keepSubmitCount);
+    resetErrors(options.keepErrors);
     resetTouched(options.keepTouched);
     resetDirty(options.keepDirty);
+    if (options.keepValues) {
+      return;
+    }
+    const newValues = values2 ? values2 : structuredClone(defaultValues);
+    setValues(() => newValues);
     Object.entries(fields).forEach(([name, field]) => {
       setFieldValue(field, get(newValues, name));
     });
@@ -458,7 +487,9 @@ var createForm = (arg) => {
       isValid,
       isDirty,
       touchedFields,
-      dirtyFields
+      dirtyFields,
+      isSubmitted,
+      submitCount
     },
     values,
     errors,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-hook-form",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "type": "module",
   "main": "./dist/main.js",
   "module": "./dist/main.js",