@homebound/form-state 2.9.0 → 2.9.1

package/dist/useFormStates.js

@@ -11,38 +11,39 @@ function useFormStates(opts) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [config]);
     // Keep track of ObjectStates that triggered auto-save when a save was already in progress.
-    const pendingAutoSaves = react_1.useRef([]);
+    const pendingAutoSaves = react_1.useRef(new Set());
     // Use a ref so our memo'ized `autoSave` always see the latest value
     const autoSaveRef = react_1.useRef(autoSave);
     autoSaveRef.current = autoSave;
-    async function maybeAutoSave(form) {
-        if (isAutoSaving && !pendingAutoSaves.current.includes(form)) {
-            pendingAutoSaves.current.push(form);
-        }
-        // Don't use canSave() because we don't want to set touched for all the fields
-        if (autoSaveRef.current && form.dirty && form.valid && !isAutoSaving) {
-            try {
-                isAutoSaving = true;
-                // See if we have any reactions that want to run (i.e. added by addRules hooks)
-                await new Promise((resolve) => setTimeout(resolve, 0));
-                // If a reaction re-queued our form during the ^ wait, remove it
-                let i = -1;
-                while ((i = pendingAutoSaves.current.indexOf(form)) !== -1) {
-                    pendingAutoSaves.current.splice(i, 1);
+    const getFormState = react_1.useCallback((input) => {
+        const existing = objectStateCache[getId(input)];
+        let form = existing === null || existing === void 0 ? void 0 : existing[0];
+        async function maybeAutoSave(form) {
+            // Don't use canSave() because we don't want to set touched for all the fields
+            if (autoSaveRef.current && form.dirty && form.valid) {
+                const { current: pending } = pendingAutoSaves;
+                if (isAutoSaving) {
+                    pending.add(form);
+                    return;
                 }
-                await autoSaveRef.current(form);
-            }
-            finally {
-                isAutoSaving = false;
-                if (pendingAutoSaves.current.length > 0) {
-                    await maybeAutoSave(pendingAutoSaves.current.shift());
+                try {
+                    isAutoSaving = true;
+                    // See if we have any reactions that want to run (i.e. added by addRules hooks)
+                    await new Promise((resolve) => setTimeout(resolve, 0));
+                    // If a reaction re-queued our form during the ^ wait, remove it
+                    pending.delete(form);
+                    await autoSaveRef.current(form);
+                }
+                finally {
+                    isAutoSaving = false;
+                    if (pending.size > 0) {
+                        const first = pending.values().next().value;
+                        pending.delete(first);
+                        await maybeAutoSave(first);
+                    }
                 }
             }
         }
-    }
-    const getFormState = react_1.useCallback((input) => {
-        const existing = objectStateCache[getId(input)];
-        let form = existing === null || existing === void 0 ? void 0 : existing[0];
         // If it didn't exist, then add to the cache.
         if (!form) {
             form = formState_1.createObjectState(config, utils_1.initValue(config, map ? { map, input } : input), {

package/dist/useFormStates.test.js

@@ -167,7 +167,6 @@ describe("useFormStates", () => {
                 addRules(fs) {
                     // And they have a reactive true that calculates last name
                     mobx_1.reaction(() => fs.firstName.value, (curr) => {
-                        console.log({ curr });
                         fs.lastName.set(curr);
                     });
                 },

package/package.json

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