Skip to content

fix: Only return first child element in label query #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kentcdodds merged 2 commits into from
Apr 6, 2020
Merged

fix: Only return first child element in label query #520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81c50ba
fix: Only return first child element in label query
Apr 6, 2020
7cf5496
fix: Link to spec and correct terminology
Apr 6, 2020
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
Next Next commit
fix: Only return first child element in label query
  • Loading branch information
Aaron Pettengill committed Apr 6, 2020
commit 81c50ba8445f138a681349ab06cc20fd8fba1699
36 changes: 33 additions & 3 deletions src/__tests__/element-queries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ test('can filter results of label query based on selector', () => {
})

test('can find any form control when label text is inside other elements', () => {
const {getAllByLabelText} = render(`
const {getByLabelText} = render(`
<label>
<span>Test</span>
<span>Label</span>
Expand All @@ -244,8 +244,38 @@ test('can find any form control when label text is inside other elements', () =>
</label>
`)

const result = getAllByLabelText('Test Label')
expect(result).toHaveLength(7)
const nodeTypes = [
'button',
'input',
'meter',
'output',
'progress',
'select',
'textarea',
]
nodeTypes.forEach(nodeType => {
expect(getByLabelText('Test Label', {selector: nodeType}).nodeName).toEqual(
nodeType.toUpperCase(),
)
})
})

test('returns the first form control inside a label', () => {
const {getByLabelText} = render(`
<label>
<span>Test</span>
<span>Label</span>
<button />
<input />
<meter />
<output />
<progress />
<select />
<textarea />
</label>
`)

expect(getByLabelText('Test Label').nodeName).toEqual('BUTTON')
})

test('can find non-input elements when aria-labelledby a label', () => {
Expand Down
5 changes: 3 additions & 2 deletions src/queries/label-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ function queryAllByLabelText(
// <label>text: <input /></label>
const formControlSelector =
'button, input, meter, output, progress, select, textarea'
Array.from(
const labelledFormControl = Array.from(
label.querySelectorAll(formControlSelector),
).forEach(element => elementsForLabel.push(element))
).filter(element => element.matches(selector))[0]
if (labelledFormControl) elementsForLabel.push(labelledFormControl)
}
return matchedElements.concat(elementsForLabel)
}, [])
Expand Down