Skip to content

Commit

Permalink
馃寶 fix #8970 register remove existing registered fields (#8973)
Browse files Browse the repository at this point in the history
* fix #8970 register wipe existing fields

* update test case
  • Loading branch information
bluebill1049 committed Sep 3, 2022
1 parent 6f95711 commit d33e099
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 4 deletions.
56 changes: 56 additions & 0 deletions src/__tests__/useFieldArray.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3659,4 +3659,60 @@ describe('useFieldArray', () => {
screen.getByText('Min length of 3');
});
});

it('should update isValid correctly with rules props and inline validation', async () => {
const App = () => {
const {
control,
register,
formState: { isValid },
} = useForm({
defaultValues: {
test: [{ value: '1' }],
},
});
const { fields, append } = useFieldArray({
control,
name: 'test',
rules: {
required: true,
},
});

return (
<div>
{fields.map((field, index) => (
<input
key={field.id}
{...register(`test.${index}.value`, { required: true })}
/>
))}

<button
onClick={() =>
append({
value: '',
})
}
>
Append
</button>

<p>{isValid ? 'valid' : 'invalid'}</p>
</div>
);
};

render(<App />);

await waitFor(() => {
screen.getByText('valid');
});

fireEvent.click(screen.getByRole('button'));

await waitFor(() => {
screen.getByText('invalid');
});
});
});
1 change: 1 addition & 0 deletions src/logic/createFormControl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,7 @@ export function createFormControl<
const disabledIsDefined = isBoolean(options.disabled);

set(_fields, name, {
...(field || {}),
_f: {
...(field && field._f ? field._f : { ref: { name } }),
name,
Expand Down
7 changes: 3 additions & 4 deletions src/useFieldArray.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,14 @@ export function useFieldArray<
const _fieldIds = React.useRef(fields);
const _name = React.useRef(name);
const _actioned = React.useRef(false);
React.useRef(
props.rules &&
(control as Control).register(name as InternalFieldName, props.rules),
);

_name.current = name;
_fieldIds.current = fields;
control._names.array.add(name);

props.rules &&
(control as Control).register(name as InternalFieldName, props.rules);

const callback = React.useCallback(
({
values,
Expand Down

0 comments on commit d33e099

Please sign in to comment.