fix: fix Field $merge()

qiqiboy · Nov 30, 2020 · 08d35a4 · 08d35a4
1 parent 54c03ef
commit 08d35a4
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/dist/react-formutil.cjs.development.js b/dist/react-formutil.cjs.development.js
@@ -1899,7 +1899,7 @@ function createHandler($this, owner) {
     if ('$valid' in $newState) {
       $newState.$invalid = !$newState.$valid;
     } else if ('$invalid' in $newState) {
-      $newState.$dirty = !$newState.$invalid;
+      $newState.$valid = !$newState.$invalid;
     } // process $dirty/$pristine
 
 

diff --git a/dist/react-formutil.cjs.production.js b/dist/react-formutil.cjs.production.js
diff --git a/dist/react-formutil.esm.development.js b/dist/react-formutil.esm.development.js
@@ -1828,7 +1828,7 @@ function createHandler($this, owner) {
     if ('$valid' in $newState) {
       $newState.$invalid = !$newState.$valid;
     } else if ('$invalid' in $newState) {
-      $newState.$dirty = !$newState.$invalid;
+      $newState.$valid = !$newState.$invalid;
     } // process $dirty/$pristine
 
 

diff --git a/dist/react-formutil.esm.production.js b/dist/react-formutil.esm.production.js
diff --git a/dist/react-formutil.umd.development.js b/dist/react-formutil.umd.development.js
@@ -2635,7 +2635,7 @@
       if ('$valid' in $newState) {
         $newState.$invalid = !$newState.$valid;
       } else if ('$invalid' in $newState) {
-        $newState.$dirty = !$newState.$invalid;
+        $newState.$valid = !$newState.$invalid;
       } // process $dirty/$pristine
 
 

diff --git a/dist/react-formutil.umd.production.js b/dist/react-formutil.umd.production.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-formutil",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Happy to build the forms in React ^_^",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

diff --git a/src/fieldHelper.js b/src/fieldHelper.js
@@ -418,7 +418,7 @@ export function createHandler($this, owner) {
         if ('$valid' in $newState) {
             $newState.$invalid = !$newState.$valid;
         } else if ('$invalid' in $newState) {
-            $newState.$dirty = !$newState.$invalid;
+            $newState.$valid = !$newState.$invalid;
         }
 
         // process $dirty/$pristine

diff --git a/tests/helper.tsx b/tests/helper.tsx
@@ -28,8 +28,8 @@ export function renderForm<Fields = any, Validators = {}, WeakFields = Fields>(
     };
 }
 
-export function renderField(fieldProps?: FieldProps) {
-    let fieldHandler: $Fieldutil;
+export function renderField<Value = string>(fieldProps?: FieldProps<Value>) {
+    let fieldHandler: $Fieldutil<Value>;
     let formHandler: $Formutil;
     let instance;
     const getForm = (newProps?: FieldProps) => (