Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@react-aria/form/src/useFormValidation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function getNativeValidity(input: ValidatableElement): ValidationResult {
function getFirstInvalidInput(form: HTMLFormElement): ValidatableElement | null {
for (let i = 0; i < form.elements.length; i++) {
let element = form.elements[i] as ValidatableElement;
if (!element.validity.valid) {
if (element.validity?.valid === false) {
return element;
}
}
Expand Down
46 changes: 46 additions & 0 deletions packages/react-aria-components/test/Form.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,50 @@ describe('Form', () => {
let form = getByTestId('form');
expect(form).toHaveAttribute('data-custom', 'true');
});

it('should not throw when form contains elements without validity property', async () => {
function Test() {
return (
<Form data-testid="form">
<TextField name="name" isRequired>
<Label>Name</Label>
<Input />
<FieldError />
</TextField>
<Button type="submit">Submit</Button>
</Form>
);
}

let {getByTestId, getByRole} = render(<Test />);
let form = getByTestId('form');
let input = getByRole('textbox');

// Mock form.elements to include an element without validity property (simulates Web Component)
let originalElements = form.elements;
let mockElement = {name: 'custom-element'}; // No validity property
Object.defineProperty(form, 'elements', {
get: () => ({
length: originalElements.length + 1,
[Symbol.iterator]: function* () {
yield mockElement;
yield* originalElements;
},
0: mockElement,
...Array.from(originalElements).reduce((acc, el, i) => ({...acc, [i + 1]: el}), {})
}),
configurable: true
});

// Should not throw when iterating form.elements with element lacking validity
await user.click(getByRole('button'));

expect(document.activeElement).toBe(input);

// Restore original elements
Object.defineProperty(form, 'elements', {
get: () => originalElements,
configurable: true
});
});
});