From 0b3341f3a3ac9ea4644c6baa70139f8c22fa7856 Mon Sep 17 00:00:00 2001
From: David Pflasterer <dpflasterer@battleface.com>
Date: Fri, 26 Apr 2024 18:56:12 -0400
Subject: [PATCH 1/2] updated iterateFieldsByAction to break out of all loops
 on first focus

---
 .../logic/iterateFieldsByAction.test.ts       | 139 ++++++++++++++++++
 src/logic/iterateFieldsByAction.ts            |  14 +-
 2 files changed, 148 insertions(+), 5 deletions(-)

diff --git a/src/__tests__/logic/iterateFieldsByAction.test.ts b/src/__tests__/logic/iterateFieldsByAction.test.ts
index 7ede3c907b4..b482b193944 100644
--- a/src/__tests__/logic/iterateFieldsByAction.test.ts
+++ b/src/__tests__/logic/iterateFieldsByAction.test.ts
@@ -64,4 +64,143 @@ describe('focusFieldBy', () => {
       );
     }).not.toThrow();
   });
+
+  it('should focus on the first error it encounter and not the second', () => {
+    const focus = jest.fn();
+    iterateFieldsByAction(
+      {
+        first: {
+          _f: {
+            name: 'first',
+            ref: {
+              name: 'first',
+              focus,
+            },
+          },
+        },
+        second: {
+          _f: {
+            name: 'second',
+            ref: {
+              name: 'second',
+              focus,
+            },
+          },
+        },
+      },
+      (ref) => {
+        // @ts-ignore
+        ref.focus && ref.focus(ref.name);
+        return 1;
+      },
+    );
+    expect(focus).toBeCalledWith('first');
+    expect(focus).not.toBeCalledWith('second');
+  });
+
+  it('should recursively drill into objects', () => {
+    const focus = jest.fn();
+    iterateFieldsByAction(
+      {
+        test: {
+          name: {
+            first: {
+              _f: {
+                name: 'name.first',
+                ref: {
+                  name: 'first',
+                  focus,
+                },
+              },
+            },
+            last: {
+              _f: {
+                name: 'name.last',
+                ref: {
+                  name: 'last',
+                  focus,
+                },
+              },
+            },
+          },
+        },
+      },
+      (ref, key) => {
+        if (key === 'name.last') {
+          // @ts-ignore
+          ref.focus && ref.focus(ref.name);
+          return 1;
+        }
+        return;
+      },
+    );
+    expect(focus).not.toBeCalledWith('first');
+    expect(focus).toBeCalledWith('last');
+  });
+
+  it('should should recursively drill into objects and break out of all loops on first focus', () => {
+    const focus = jest.fn();
+    const notFocus = jest.fn();
+    iterateFieldsByAction(
+      {
+        personal: {
+          name: {
+            first: {
+              _f: {
+                name: 'name.first',
+                ref: {
+                  name: 'first',
+                  focus: notFocus,
+                },
+              },
+            },
+            last: {
+              _f: {
+                name: 'name.last',
+                ref: {
+                  name: 'last',
+                  focus,
+                },
+              },
+            },
+          },
+          phone: {
+            _f: {
+              name: 'phone',
+              ref: {
+                name: 'phone',
+                focus: notFocus,
+              },
+            },
+          },
+          address: {
+            line1: {
+              _f: {
+                name: 'address.line1',
+                ref: {
+                  name: 'line1',
+                  focus: notFocus,
+                },
+              },
+            },
+          },
+        },
+      },
+      (ref, key) => {
+        // @ts-ignore
+        ref.focus && ref.focus(ref.name);
+        return key === 'name.last' ? 1 : undefined;
+      },
+    );
+    // 'focus' should be called on 'last' and never again
+    expect(focus).not.toBeCalledWith('first'); // not valid
+    expect(focus).toBeCalledWith('last'); // valid
+    expect(focus).not.toBeCalledWith('phone'); // stopped
+    expect(focus).not.toBeCalledWith('line1');
+    // 'notFocus' should be called on the first, then never again
+    expect(notFocus).toBeCalledWith('first'); // not valid
+    expect(notFocus).not.toBeCalledWith('last'); // valid
+    expect(notFocus).not.toBeCalledWith('phone'); // stopped
+    expect(notFocus).not.toBeCalledWith('line1');
+  });
 });
diff --git a/src/logic/iterateFieldsByAction.ts b/src/logic/iterateFieldsByAction.ts
index 964f87a74e5..a785211dce7 100644
--- a/src/logic/iterateFieldsByAction.ts
+++ b/src/logic/iterateFieldsByAction.ts
@@ -16,17 +16,21 @@ const iterateFieldsByAction = (
 
       if (_f) {
         if (_f.refs && _f.refs[0] && action(_f.refs[0], key) && !abortEarly) {
-          break;
+          return true;
         } else if (_f.ref && action(_f.ref, _f.name) && !abortEarly) {
-          break;
+          return true;
         } else {
-          iterateFieldsByAction(currentField, action);
+          if (iterateFieldsByAction(currentField, action)) {
+            break;
+          }
         }
       } else if (isObject(currentField)) {
-        iterateFieldsByAction(currentField, action);
+        if (iterateFieldsByAction(currentField, action)) {
+          break;
+        }
       }
     }
   }
+  return;
 };
-
 export default iterateFieldsByAction;

From 08913e3ed76101b95714065d2b2b287645d602f6 Mon Sep 17 00:00:00 2001
From: David Pflasterer <dpflasterer@battleface.com>
Date: Fri, 26 Apr 2024 19:28:04 -0400
Subject: [PATCH 2/2] tsignore in test

---
 src/__tests__/logic/iterateFieldsByAction.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/__tests__/logic/iterateFieldsByAction.test.ts b/src/__tests__/logic/iterateFieldsByAction.test.ts
index b482b193944..f246beca00c 100644
--- a/src/__tests__/logic/iterateFieldsByAction.test.ts
+++ b/src/__tests__/logic/iterateFieldsByAction.test.ts
@@ -103,6 +103,7 @@ describe('focusFieldBy', () => {
     iterateFieldsByAction(
       {
         test: {
+          // @ts-ignore
           name: {
             first: {
               _f: {
@@ -144,6 +145,7 @@ describe('focusFieldBy', () => {
     iterateFieldsByAction(
       {
         personal: {
+          // @ts-ignore
           name: {
             first: {
               _f: {