Merge pull request #43 from RyKilleen/fix-form-state

fix: use available hook for all of react-hook-form state

package.json

@@ -1,6 +1,6 @@
 {
   "name": "brancato",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "private": true,
   "dependencies": {
     "@algolia/autocomplete-js": "^1.5.3",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "brancato"
-version = "0.3.1"
+version = "0.3.2"
 description = "A tool for stage-managing your life"
 authors = ["Ryan Killeen"]
 license = ""

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "brancato",
-    "version": "0.3.1"
+    "version": "0.3.2"
   },
   "build": {
     "distDir": "../build",

src/Config.tsx

@@ -46,14 +46,12 @@ function Config() {
     getValues,
     setValue,
     reset,
-    trigger,
     formState,
   } = useForm<Workflows>({
     defaultValues,
   });
   const { isSubmitting } = formState;
-  const { isDirty } = useFormState({ control });
-  console.log({ isDirty, isSubmitting });
+  const { isDirty, isValid } = useFormState({ control });
 
   useEffect(() => {
     setTimeout(() => {
@@ -72,17 +70,10 @@ function Config() {
   );
 
   useEffect(() => {
-    async function validateAndSubmit() {
-      const valid = await trigger();
-
-      if (valid) {
-        handleSubmit(onSubmit)();
-      }
-    }
-    if (isDirty) {
-      validateAndSubmit();
+    if (isDirty && isValid) {
+      handleSubmit(onSubmit)();
     }
-  }, [isDirty, handleSubmit, trigger, onSubmit]);
+  }, [isDirty, handleSubmit, isValid, onSubmit]);
 
   //
   useEffect(() => {
@@ -149,7 +140,9 @@ function Config() {
       {/* <button type="button" onClick={addFilePath}>
             Add file/program
           </button> */}
-      <DevTool control={control} />
+      {(!process.env.NODE_ENV || process.env.NODE_ENV === "development") && (
+        <DevTool control={control} />
+      )}
     </div>
   );
 }