From 286654462ec4ba404c157769751c618da7112c87 Mon Sep 17 00:00:00 2001 From: Kai Hao Date: Wed, 3 Nov 2021 21:37:10 +0800 Subject: [PATCH] feat: Prioritize accessible names check higher than inaccessibility check in `byRole` queries (#1068) Co-authored-by: eps1lon --- src/queries/role.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/queries/role.js b/src/queries/role.js index 826edd43..339647a6 100644 --- a/src/queries/role.js +++ b/src/queries/role.js @@ -153,13 +153,6 @@ function queryAllByRole( // don't care if aria attributes are unspecified return true }) - .filter(element => { - return hidden === false - ? isInaccessible(element, { - isSubtreeInaccessible: cachedIsSubtreeInaccessible, - }) === false - : true - }) .filter(element => { if (name === undefined) { // Don't care @@ -176,6 +169,13 @@ function queryAllByRole( text => text, ) }) + .filter(element => { + return hidden === false + ? isInaccessible(element, { + isSubtreeInaccessible: cachedIsSubtreeInaccessible, + }) === false + : true + }) } function makeRoleSelector(role, exact, customNormalizer) {