@homebound/form-state 2.26.11 → 2.26.12

package/dist/fields/listField.js

@@ -223,17 +223,20 @@ parentInstance, parentState, key, rules, listConfig, config, strictOrder, maybeA
                         // Once matched, we don't this to be an addedRow anymore
                         addedRows.delete(currentItem);
                     }
-                    else if (childState.dirty || addedRows.has(currentItem)) {
-                        // If no incoming, but we're dirty (...and not deleted), keep the WIP change
-                        if (hasOpKey && currentItem.op === "delete") {
-                            // delete
-                        }
-                        else {
-                            mergedItems.push(currentItem);
-                        }
+                    else if (!childState.dirty && !addedRows.has(currentItem)) {
+                        // Local is not dirty/added, and it's not upstream, so let it get removed
+                    }
+                    else if (hasOpKey && currentItem.op === "delete") {
+                        // We were locally marked as deleted, and not finding a match is the server acking that we're gone
+                    }
+                    else if (currentItems.length === incomingItems.length &&
+                        !!idKey &&
+                        currentItem[idKey] === undefined) {
+                        // Assume our newly-assigned id is coming back
                     }
                     else {
-                        // Local is not dirty, and it's not upstream, so remove it
+                        // If no incoming, but we're dirty (see above) and not deleted (see above), keep the WIP change
+                        mergedItems.push(currentItem);
                     }
                 }
                 // Then, add any incoming items that don't exist in current

package/dist/formState.test.js

@@ -258,6 +258,27 @@ describe("formState", () => {
         // And we're not dirty
         expect(state.books.dirty).toBe(false);
     });
+    it("list value can refresh and merge children that were added", () => {
+        // Given a list field that is currently populated with 1 child
+        const a1 = { id: "a:1", books: [{ id: "b:1", title: "b1" }] };
+        const state = createAuthorInputState(a1);
+        // When we add a new book
+        state.books.add({ title: "b2" });
+        // When we refresh it with both books, and the 2nd book now has its id assigned
+        state.set({
+            books: [
+                { id: "b:1", title: "b1" },
+                { id: "b:2", title: "b2" },
+            ],
+        }, { refreshing: true });
+        // Then wes till have two books
+        expect(state.books.value).toEqual([
+            { id: "b:1", title: "b1" },
+            { id: "b:2", title: "b2" },
+        ]);
+        // And we're not dirty
+        expect(state.books.dirty).toBe(false);
+    });
     it("list value can observe changes", () => {
         const b1 = { title: "t1" };
         const a1 = { firstName: "a1", books: [b1] };

package/package.json

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