@homebound/form-state 2.2.7 → 2.2.8

package/dist/formState.js

@@ -180,7 +180,7 @@ function newObjectState(config, parentState, instance, key, onBlur) {
                 throw new Error(`${key || "formState"} is currently readOnly`);
             }
             getFields(this).forEach((field) => {
-                if (field.key in value && (!field.dirty || !field._focused)) {
+                if (field.key in value) {
                     field.set(value[field.key], opts);
                 }
             });
@@ -329,8 +329,10 @@ function newValueFieldState(parentInstance, parentState, key, rules, isIdKey, is
             if (this.readOnly && !opts.resetting && !opts.refreshing) {
                 throw new Error(`${key} is currently readOnly`);
             }
-            if (opts.refreshing && this.dirty && value !== this.value) {
-                // Ignore refreshed values if we're already dirty
+            if (opts.refreshing && this.dirty && this.value !== value) {
+                // Ignore incoming values if we have changes (this.dirty) unless our latest change (this.value)
+                // matches the incoming value (value), b/c if it does we should accept it and reset originalValue
+                // so that we're not longer dirty.
                 return;
             }
             else if (computed && (opts.resetting || opts.refreshing)) {

package/dist/formState.test.js

@@ -931,7 +931,7 @@ describe("formState", () => {
         // And they have wip edits
         formState.firstName.set("ff");
         // When a mutation result sets both firstName and lastName
-        formState.set({ firstName: "f2", lastName: "l2" });
+        formState.set({ firstName: "f2", lastName: "l2" }, { refreshing: true });
         // Then we don't overwrite the user's WIP work
         expect(formState.firstName.value).toEqual("ff");
         expect(formState.lastName.value).toEqual("l2");
@@ -944,7 +944,7 @@ describe("formState", () => {
         // Given first name is focused, but has not changed
         formState.firstName.focus();
         // When a mutation result sets both firstName and lastName
-        formState.set({ firstName: "f2", lastName: "l2" });
+        formState.set({ firstName: "f2", lastName: "l2" }, { refreshing: true });
         // Then we do update the value
         expect(formState.firstName.value).toEqual("f2");
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebound/form-state",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "author": "Homebound",
   "license": "MIT",
   "main": "dist/index.js",