🐞 fix #11842 radio buttons not disabled when multiple share a name (#…

…11873) * feat: allow `iterateFieldsByAction` to iterate over multiple refs * fix: `_disableForm` only disables one input when inputs share a name * test: add unit tests for action iteration over multiple refs * refactor: invert `abortEarly` param's logic to respect semantic meaning * refactor: move ref iteration logic to if block * chore: fix lint errors * test: rename tests to reflect changes * Update createFormControl.ts * Update iterateFieldsByAction.ts * Update iterateFieldsByAction.test.ts --------- Co-authored-by: Beier (Bill) <[email protected]>
react-hook-form · May 18, 2024 · 52611a5 · 52611a5
1 parent 4549afd
commit 52611a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/__tests__/logic/iterateFieldsByAction.test.ts b/src/__tests__/logic/iterateFieldsByAction.test.ts
@@ -1,6 +1,6 @@
 import iterateFieldsByAction from '../../logic/iterateFieldsByAction';
 
-describe('focusFieldBy', () => {
+describe('iterateFieldsByAction', () => {
   it('should focus on the first error it encounter', () => {
     const focus = jest.fn();
     iterateFieldsByAction(

diff --git a/src/logic/createFormControl.ts b/src/logic/createFormControl.ts
@@ -1098,13 +1098,16 @@ export function createFormControl<
       iterateFieldsByAction(
         _fields,
         (ref, name) => {
-          let requiredDisabledState = disabled;
-          const currentField = get(_fields, name);
-          if (currentField && isBoolean(currentField._f.disabled)) {
-            requiredDisabledState ||= currentField._f.disabled;
+          const currentField: Field = get(_fields, name);
+          if (currentField) {
+            ref.disabled = currentField._f.disabled || disabled;
+
+            if (Array.isArray(currentField._f.refs)) {
+              currentField._f.refs.forEach((inputRef) => {
+                inputRef.disabled = currentField._f.disabled || disabled;
+              });
+            }
           }
-
-          ref.disabled = requiredDisabledState;
         },
         0,
         false,