Skip to content
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

Jump to bottom

feat(ByRole): improved byRole query performance #1086

Merged
merged 3 commits into from Aug 9, 2022
Merged

feat(ByRole): improved byRole query performance #1086

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62785b8
feat(ByRole): improved byRole query performance (#698)
kalmi Jan 14, 2022
1eb9627
Merge branch 'main' into byrole_perf
eps1lon Aug 9, 2022
95e546e
Remove short circuits
eps1lon Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 23 additions & 18 deletions src/role-helpers.js
View file
Open in desktop
Expand Up @@ -105,27 +105,32 @@ function buildElementRoleList(elementRolesMap) {
}

function match(element) {
let {attributes = []} = element

// https://github.com/testing-library/dom-testing-library/issues/814
const typeTextIndex = attributes.findIndex(
attribute =>
attribute.value &&
attribute.name === 'type' &&
attribute.value === 'text',
)

if (typeTextIndex >= 0) {
// not using splice to not mutate the attributes array
attributes = [
...attributes.slice(0, typeTextIndex),
...attributes.slice(typeTextIndex + 1),
]
}

const selector = makeElementSelector({...element, attributes})

return node => {
let {attributes = []} = element
// https://github.com/testing-library/dom-testing-library/issues/814
const typeTextIndex = attributes.findIndex(
attribute =>
attribute.value &&
attribute.name === 'type' &&
attribute.value === 'text',
)
if (typeTextIndex >= 0) {
// not using splice to not mutate the attributes array
attributes = [
...attributes.slice(0, typeTextIndex),
...attributes.slice(typeTextIndex + 1),
]
if (node.type !== 'text') {
return false
}
if (typeTextIndex >= 0 && node.type !== 'text') {
return false
}

return node.matches(makeElementSelector({...element, attributes}))
return node.matches(selector)
}
}

Expand Down