fix: fix duplicated field $state

qiqiboy · Sep 4, 2023 · b45428f · b45428f
1 parent 6b114c2
commit b45428f
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 42 deletions.
diff --git a/dist/react-formutil.cjs.development.js b/dist/react-formutil.cjs.development.js
@@ -674,6 +674,7 @@ var Form = /*#__PURE__*/function (_Component) {
         warning__default['default']($curRegistered.$$reserved, "The Field with a name '".concat(name, "' has been registered!"));
         $handler.$$reset($curRegistered.$getState());
         hasDup = delete $$regDuplications[name];
+        _this.$$formShouldUpdateFields[name] = true;
       });
       if (hasDup) {
         _this.$render();
@@ -1526,7 +1527,6 @@ function renderField($fieldutil, props) {
 function createHandler($this, owner) {
   var $fieldHandler = {
     $$FIELD_UUID: $this.$$FIELD_UUID,
-    $name: $this.props.name,
     $$reset: $$reset,
     $$merge: $$merge,
     $$detectChange: $$detectChange,
@@ -1909,8 +1909,7 @@ var Field = /*#__PURE__*/function (_Component) {
         }
         _this2.$registered = (_this2.$formContext.$$registers || {})[_this2.$fieldHandler.$name] || _this2.$fieldHandler;
         if (shouldInitial) {
-          var initialState = _this2.$registered.$getState();
-          _this2.$fieldHandler.$$reset(initialState);
+          _this2.$fieldHandler.$$reset();
           _this2.$fieldHandler.$validate();
         }
         return _this2._render();
@@ -2818,17 +2817,14 @@ function useField(name) {
   var _useState = useState(function () {
       $this.$$FIELD_UUID = GET_FIELD_UUID();
       $this.$fieldHandler = $registered = createHandler($this);
+      $this.$fieldHandler.$$reset();
+      $this.$fieldHandler.$validate();
     }),
     _useState2 = _slicedToArray(_useState, 2),
     setState = _useState2[1];
   if (!$registered) {
     $registered = ($formContext.$$registers || {})[$this.$fieldHandler.$name] || $this.$fieldHandler;
   }
-  useState(function () {
-    var initialState = $registered.$getState();
-    $this.$fieldHandler.$$reset(initialState);
-    $this.$fieldHandler.$validate();
-  });
   _useEffect(function () {
     var $state = $this.$state;
     if ($this.isMounting) {

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
@@ -528,6 +528,7 @@ var Form = /*#__PURE__*/function (_Component) {
         warning($curRegistered.$$reserved, "The Field with a name '".concat(name, "' has been registered!"));
         $handler.$$reset($curRegistered.$getState());
         hasDup = delete $$regDuplications[name];
+        _this.$$formShouldUpdateFields[name] = true;
       });
       if (hasDup) {
         _this.$render();
@@ -1365,7 +1366,6 @@ function renderField($fieldutil, props) {
 function createHandler($this, owner) {
   var $fieldHandler = {
     $$FIELD_UUID: $this.$$FIELD_UUID,
-    $name: $this.props.name,
     $$reset: $$reset,
     $$merge: $$merge,
     $$detectChange: $$detectChange,
@@ -1748,8 +1748,7 @@ var Field = /*#__PURE__*/function (_Component) {
         }
         _this2.$registered = (_this2.$formContext.$$registers || {})[_this2.$fieldHandler.$name] || _this2.$fieldHandler;
         if (shouldInitial) {
-          var initialState = _this2.$registered.$getState();
-          _this2.$fieldHandler.$$reset(initialState);
+          _this2.$fieldHandler.$$reset();
           _this2.$fieldHandler.$validate();
         }
         return _this2._render();
@@ -2657,17 +2656,14 @@ function useField(name) {
   var _useState = useState(function () {
       $this.$$FIELD_UUID = GET_FIELD_UUID();
       $this.$fieldHandler = $registered = createHandler($this);
+      $this.$fieldHandler.$$reset();
+      $this.$fieldHandler.$validate();
     }),
     _useState2 = _slicedToArray(_useState, 2),
     setState = _useState2[1];
   if (!$registered) {
     $registered = ($formContext.$$registers || {})[$this.$fieldHandler.$name] || $this.$fieldHandler;
   }
-  useState(function () {
-    var initialState = $registered.$getState();
-    $this.$fieldHandler.$$reset(initialState);
-    $this.$fieldHandler.$validate();
-  });
   _useEffect(function () {
     var $state = $this.$state;
     if ($this.isMounting) {

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
@@ -967,6 +967,7 @@
 	        warning_1($curRegistered.$$reserved, "The Field with a name '".concat(name, "' has been registered!"));
 	        $handler.$$reset($curRegistered.$getState());
 	        hasDup = delete $$regDuplications[name];
+	        _this.$$formShouldUpdateFields[name] = true;
 	      });
 	      if (hasDup) {
 	        _this.$render();
@@ -2267,7 +2268,6 @@
 	function createHandler($this, owner) {
 	  var $fieldHandler = {
 	    $$FIELD_UUID: $this.$$FIELD_UUID,
-	    $name: $this.props.name,
 	    $$reset: $$reset,
 	    $$merge: $$merge,
 	    $$detectChange: $$detectChange,
@@ -2650,8 +2650,7 @@
 	        }
 	        _this2.$registered = (_this2.$formContext.$$registers || {})[_this2.$fieldHandler.$name] || _this2.$fieldHandler;
 	        if (shouldInitial) {
-	          var initialState = _this2.$registered.$getState();
-	          _this2.$fieldHandler.$$reset(initialState);
+	          _this2.$fieldHandler.$$reset();
 	          _this2.$fieldHandler.$validate();
 	        }
 	        return _this2._render();
@@ -3559,17 +3558,14 @@
 	  var _useState = useState(function () {
 	      $this.$$FIELD_UUID = GET_FIELD_UUID();
 	      $this.$fieldHandler = $registered = createHandler($this);
+	      $this.$fieldHandler.$$reset();
+	      $this.$fieldHandler.$validate();
 	    }),
 	    _useState2 = _slicedToArray(_useState, 2),
 	    setState = _useState2[1];
 	  if (!$registered) {
 	    $registered = ($formContext.$$registers || {})[$this.$fieldHandler.$name] || $this.$fieldHandler;
 	  }
-	  useState(function () {
-	    var initialState = $registered.$getState();
-	    $this.$fieldHandler.$$reset(initialState);
-	    $this.$fieldHandler.$validate();
-	  });
 	  _useEffect(function () {
 	    var $state = $this.$state;
 	    if ($this.isMounting) {

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.7",
+  "version": "1.1.8",
   "description": "Happy to build the forms in React ^_^",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -116,7 +116,7 @@
     "rollup-plugin-filesize": "9.0.2",
     "rollup-plugin-sass": "1.2.2",
     "rollup-plugin-terser": "7.0.2",
-    "typescript": "4.0.5"
+    "typescript": "5.2.2"
   },
   "dependencies": {
     "hoist-non-react-statics": "^3.3.2",

diff --git a/src/Field.js b/src/Field.js
@@ -148,9 +148,7 @@ class Field extends Component {
                         (this.$formContext.$$registers || {})[this.$fieldHandler.$name] || this.$fieldHandler;
 
                     if (shouldInitial) {
-                        const initialState = this.$registered.$getState();
-
-                        this.$fieldHandler.$$reset(initialState);
+                        this.$fieldHandler.$$reset();
                         this.$fieldHandler.$validate();
                     }
 

diff --git a/src/Form.js b/src/Form.js
@@ -83,6 +83,8 @@ class Form extends Component {
             $handler.$$reset($curRegistered.$getState());
 
             hasDup = delete $$regDuplications[name];
+
+            this.$$formShouldUpdateFields[name] = true;
         });
 
         if (hasDup) {

diff --git a/src/fieldHelper.js b/src/fieldHelper.js
@@ -105,8 +105,6 @@ export function createHandler($this, owner) {
     const $fieldHandler = {
         $$FIELD_UUID: $this.$$FIELD_UUID,
 
-        $name: $this.props.name,
-
         $$reset,
         $$merge,
         $$detectChange,

diff --git a/src/hooks/useField.js b/src/hooks/useField.js
@@ -52,19 +52,15 @@ function useField(name, props = {}) {
     const [, setState] = useState(() => {
         $this.$$FIELD_UUID = GET_FIELD_UUID();
         $this.$fieldHandler = $registered = createHandler($this);
+
+        $this.$fieldHandler.$$reset();
+        $this.$fieldHandler.$validate();
     });
 
     if (!$registered) {
         $registered = ($formContext.$$registers || {})[$this.$fieldHandler.$name] || $this.$fieldHandler;
     }
 
-    useState(() => {
-        const initialState = $registered.$getState();
-
-        $this.$fieldHandler.$$reset(initialState);
-        $this.$fieldHandler.$validate();
-    });
-
     _useEffect(() => {
         const { $state } = $this;
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -15,7 +15,6 @@
     "noImplicitThis": true,
     "noImplicitAny": false,
     "strictNullChecks": true,
-    "suppressImplicitAnyIndexErrors": true,
     "noUnusedLocals": true,
     "importHelpers": true
   },