From 43a98cbd4b873335f5d049b76474f2ae64a20836 Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Sat, 28 Sep 2019 11:34:42 +0200
Subject: [PATCH 1/3] feat: Export shouldExcludeFromA11yTree

---
 src/__tests__/role-helpers.js | 21 ++++++++++++++++++++-
 src/index.js                  |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/__tests__/role-helpers.js b/src/__tests__/role-helpers.js
index 9e7ae158..5db8f065 100644
--- a/src/__tests__/role-helpers.js
+++ b/src/__tests__/role-helpers.js
@@ -1,4 +1,9 @@
-import {getRoles, logRoles, getImplicitAriaRoles} from '../role-helpers'
+import {
+  getRoles,
+  logRoles,
+  getImplicitAriaRoles,
+  shouldExcludeFromA11yTree,
+} from '../role-helpers'
 import {render} from './helpers/test-utils'
 
 beforeEach(() => {
@@ -160,4 +165,18 @@ test('getImplicitAriaRoles returns expected roles for various dom nodes', () =>
   expect(getImplicitAriaRoles(input)).toEqual(['textbox'])
 })
 
+test.each([
+  ['<div hidden />', true],
+  ['<div style="display: none;"/>', true],
+  ['<div style="visibility: hidden;"/>', true],
+  ['<div aria-hidden="true" />', true],
+])('shouldExcludeFromA11yTree for %s returns %p', (html, expected) => {
+  const {container} = render(html)
+  container.firstChild.appendChild(document.createElement('button'))
+
+  expect(shouldExcludeFromA11yTree(container.querySelector('button'))).toBe(
+    expected,
+  )
+})
+
 /* eslint no-console:0 */
diff --git a/src/index.js b/src/index.js
index 582b455c..b475999d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,7 +12,7 @@ export * from './get-node-text'
 export * from './events'
 export * from './get-queries-for-element'
 export * from './query-helpers'
-export {getRoles, logRoles} from './role-helpers'
+export {getRoles, logRoles, shouldExcludeFromA11yTree} from './role-helpers'
 export * from './pretty-dom'
 export {configure} from './config'
 

From 4ae554b9c6b97be28c965d88a2f919f2c8ebb0ff Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Mon, 7 Oct 2019 09:53:34 +0200
Subject: [PATCH 2/3] Add tests for negative assertions

---
 src/__tests__/role-helpers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/__tests__/role-helpers.js b/src/__tests__/role-helpers.js
index 5db8f065..d14c0a2c 100644
--- a/src/__tests__/role-helpers.js
+++ b/src/__tests__/role-helpers.js
@@ -166,6 +166,9 @@ test('getImplicitAriaRoles returns expected roles for various dom nodes', () =>
 })
 
 test.each([
+  ['<div />', false],
+  ['<div aria-hidden="false" />', false],
+  ['<div style="visibility: visible" />', false],
   ['<div hidden />', true],
   ['<div style="display: none;"/>', true],
   ['<div style="visibility: hidden;"/>', true],

From ea42a4dc723415fdef926dd3cad0b7e21c823eeb Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Fri, 11 Oct 2019 08:41:22 +0200
Subject: [PATCH 3/3] shouldExcludeFromA11yTree -> isInaccessible

---
 src/__tests__/role-helpers.js |  6 ++----
 src/index.js                  |  2 +-
 src/queries/role.js           |  6 ++----
 src/role-helpers.js           | 14 +++-----------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/__tests__/role-helpers.js b/src/__tests__/role-helpers.js
index d14c0a2c..728e0d00 100644
--- a/src/__tests__/role-helpers.js
+++ b/src/__tests__/role-helpers.js
@@ -2,7 +2,7 @@ import {
   getRoles,
   logRoles,
   getImplicitAriaRoles,
-  shouldExcludeFromA11yTree,
+  isInaccessible,
 } from '../role-helpers'
 import {render} from './helpers/test-utils'
 
@@ -177,9 +177,7 @@ test.each([
   const {container} = render(html)
   container.firstChild.appendChild(document.createElement('button'))
 
-  expect(shouldExcludeFromA11yTree(container.querySelector('button'))).toBe(
-    expected,
-  )
+  expect(isInaccessible(container.querySelector('button'))).toBe(expected)
 })
 
 /* eslint no-console:0 */
diff --git a/src/index.js b/src/index.js
index b475999d..1469303f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,7 +12,7 @@ export * from './get-node-text'
 export * from './events'
 export * from './get-queries-for-element'
 export * from './query-helpers'
-export {getRoles, logRoles, shouldExcludeFromA11yTree} from './role-helpers'
+export {getRoles, logRoles, isInaccessible} from './role-helpers'
 export * from './pretty-dom'
 export {configure} from './config'
 
diff --git a/src/queries/role.js b/src/queries/role.js
index c9e06c34..4713cfe5 100644
--- a/src/queries/role.js
+++ b/src/queries/role.js
@@ -1,7 +1,7 @@
 import {
   getImplicitAriaRoles,
   prettyRoles,
-  shouldExcludeFromA11yTree,
+  isInaccessible,
 } from '../role-helpers'
 import {buildQueries, fuzzyMatches, makeNormalizer, matches} from './all-utils'
 
@@ -15,9 +15,7 @@ function queryAllByRole(
 
   return Array.from(container.querySelectorAll('*'))
     .filter(element => {
-      return hidden === false
-        ? shouldExcludeFromA11yTree(element) === false
-        : true
+      return hidden === false ? isInaccessible(element) === false : true
     })
     .filter(node => {
       const isRoleSpecifiedExplicitly = node.hasAttribute('role')
diff --git a/src/role-helpers.js b/src/role-helpers.js
index 7948f4e2..8ed3568b 100644
--- a/src/role-helpers.js
+++ b/src/role-helpers.js
@@ -14,7 +14,7 @@ const elementRoleList = buildElementRoleList(elementRoles)
  * @param {Element} element -
  * @returns {boolean} true if excluded, otherwise false
  */
-function shouldExcludeFromA11yTree(element) {
+function isInaccessible(element) {
   const window = element.ownerDocument.defaultView
   const computedStyle = window.getComputedStyle(element)
   // since visibility is inherited we can exit early
@@ -120,9 +120,7 @@ function getRoles(container, {hidden = false} = {}) {
 
   return flattenDOM(container)
     .filter(element => {
-      return hidden === false
-        ? shouldExcludeFromA11yTree(element) === false
-        : true
+      return hidden === false ? isInaccessible(element) === false : true
     })
     .reduce((acc, node) => {
       const roles = getImplicitAriaRoles(node)
@@ -155,12 +153,6 @@ function prettyRoles(dom, {hidden}) {
 const logRoles = (dom, {hidden = false} = {}) =>
   console.log(prettyRoles(dom, {hidden}))
 
-export {
-  getRoles,
-  logRoles,
-  getImplicitAriaRoles,
-  prettyRoles,
-  shouldExcludeFromA11yTree,
-}
+export {getRoles, logRoles, getImplicitAriaRoles, prettyRoles, isInaccessible}
 
 /* eslint no-console:0 */