From 03d67738d5acf4880b644867a162f0a5b7c2c5ee Mon Sep 17 00:00:00 2001 From: Ryan Killeen Date: Fri, 11 Mar 2022 21:26:44 -0500 Subject: [PATCH] fix: use available hook for all of react-hook-form state 0.3.2 --- package-lock.json | 4 ++-- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- src/Config.tsx | 21 +++++++-------------- 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97d3e52..0d70159 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "brancato", - "version": "0.3.1", + "version": "0.3.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "brancato", - "version": "0.3.1", + "version": "0.3.2", "dependencies": { "@algolia/autocomplete-js": "^1.5.3", "@algolia/autocomplete-theme-classic": "^1.5.3", diff --git a/package.json b/package.json index 913eafb..244475f 100644 --- a/package.json +++ b/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", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index de70072..2691a5b 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -274,7 +274,7 @@ dependencies = [ [[package]] name = "brancato" -version = "0.3.1" +version = "0.3.2" dependencies = [ "directories", "execute", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 8e7811f..0b4a481 100644 --- a/src-tauri/Cargo.toml +++ b/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 = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 99ee086..05ad5e3 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "brancato", - "version": "0.3.1" + "version": "0.3.2" }, "build": { "distDir": "../build", diff --git a/src/Config.tsx b/src/Config.tsx index 39ecbfb..73e8914 100644 --- a/src/Config.tsx +++ b/src/Config.tsx @@ -46,14 +46,12 @@ function Config() { getValues, setValue, reset, - trigger, formState, } = useForm({ 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() { {/* */} - + {(!process.env.NODE_ENV || process.env.NODE_ENV === "development") && ( + + )} ); }