Add more robust selector handling for getByLabelText

src/__tests__/element-queries.js

@@ -199,7 +199,7 @@ test('can get elements labelled with aria-labelledby attribute', () => {
   expect(getByLabelText('Section One').id).toBe('section-one')
 })
 
-test('can get sibling elements with aria-labelledby attrib ute', () => {
+test('can get sibling elements with aria-labelledby attribute', () => {
   const {getAllByLabelText} = render(`
     <div>
       <svg id="icon" aria-labelledby="icon-desc"></svg>
@@ -212,6 +212,68 @@ test('can get sibling elements with aria-labelledby attrib ute', () => {
   expect(result[0].id).toBe('icon')
 })
 
+test('can filter results of label query based on selector', () => {
+  const {getAllByLabelText} = render(`
+    <div>
+      <label id="label1" for="input1">
+        Test Label
+        <input id="input2" />
+      </label>
+      <input id="input1" class="fancy-input" />
+      <span aria-labelledby="label1">Some hint text</span>
+    </div>
+  `)
+
+  const result = getAllByLabelText('Test Label', {selector: '.fancy-input'})
+  expect(result).toHaveLength(1)
+  expect(result[0].id).toBe('input1')
+})
+
+test('can find input or textarea when label text is inside other elements', () => {
+  const {getAllByLabelText} = render(`
+    <label>
+      <span>Test</span>
+      <span>Label</span>
+      <textarea id="textarea1" />
+    </label>
+  `)
+
+  const result = getAllByLabelText('Test Label')
+  expect(result).toHaveLength(1)
+  expect(result[0].id).toBe('textarea1')
+})
+
+test('can find non-input elements when aria-labelledby a label', () => {
+  const {getAllByLabelText} = render(`
+    <div>
+      <label id="label1">Test Label</label>
+      <ul aria-labelledby="label1">
+        <li>Hello</li>
+      </ul
+    </div>
+  `)
+
+  const result = getAllByLabelText('Test Label')
+  expect(result).toHaveLength(1)
+  expect(result[0].nodeName).toBe('UL')
+})
+
+test('can find the correct element when there are multiple matching labels', () => {
+  const {getByLabelText} = render(`
+    <label>
+      Test Label
+      <input />
+    </label>
+    <label>
+      Test Label
+      <textarea></textarea>
+    </label>
+  `)
+
+  const result = getByLabelText('Test Label', {selector: 'input'})
+  expect(result.nodeName).toBe('INPUT')
+})
+
 test('get can get form controls by placeholder', () => {
   const {getByPlaceholderText} = render(`
     <input id="username-id" placeholder="username" />,

src/queries/label-text.js

@@ -40,9 +40,10 @@ function queryAllByLabelText(
     normalizer: matchNormalizer,
   })
   const labelledElements = labels
-    .map(label => {
+    .reduce((matchedElements, label) => {
+      const elementsForLabel = []
       if (label.control) {
-        return label.control
+        elementsForLabel.push(label.control)
       }
       /* istanbul ignore if */
       if (label.getAttribute('for')) {
@@ -51,21 +52,25 @@ function queryAllByLabelText(
         // <label for="someId">text</label><input id="someId" />
 
         // .control support has landed in jsdom (https://github.com/jsdom/jsdom/issues/2175)
-        return container.querySelector(`[id="${label.getAttribute('for')}"]`)
+        elementsForLabel.push(
+          container.querySelector(`[id="${label.getAttribute('for')}"]`),
+        )
       }
       if (label.getAttribute('id')) {
         // <label id="someId">text</label><input aria-labelledby="someId" />
-        return container.querySelector(
-          `[aria-labelledby~="${label.getAttribute('id')}"]`,
-        )
+        container
+          .querySelectorAll(`[aria-labelledby~="${label.getAttribute('id')}"]`)
+          .forEach(element => elementsForLabel.push(element))
       }
       if (label.childNodes.length) {
         // <label>text: <input /></label>
-        return label.querySelector(selector)
+        label
+          .querySelectorAll('input, textarea')
+          .forEach(element => elementsForLabel.push(element))
       }
-      return null
-    })
-    .filter(label => label !== null)
+      return matchedElements.concat(elementsForLabel)
+    }, [])
+    .filter(element => element !== null)
     .concat(queryAllByAttribute('aria-label', container, text, {exact}))
 
   const possibleAriaLabelElements = queryAllByText(container, text, {
@@ -89,7 +94,9 @@ function queryAllByLabelText(
     [],
   )
 
-  return Array.from(new Set([...labelledElements, ...ariaLabelledElements]))
+  return Array.from(
+    new Set([...labelledElements, ...ariaLabelledElements]),
+  ).filter(element => element.matches(selector))
 }
 
 // the getAll* query would normally look like this: