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.

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

Selector Engine: improve parents method to utilize newer JS native methods #35684

Merged
merged 2 commits into from
Jan 30, 2022
Merged
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions js/src/dom/selector-engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import { isDisabled, isVisible } from '../util/index'
* Constants
*/

const NODE_TEXT = 3

const SelectorEngine = {
find(selector, element = document.documentElement) {
return [].concat(...Element.prototype.querySelectorAll.call(element, selector))
Expand All @@ -28,14 +26,11 @@ const SelectorEngine = {

parents(element, selector) {
const parents = []
let ancestor = element.parentNode

while (ancestor && ancestor.nodeType === Node.ELEMENT_NODE && ancestor.nodeType !== NODE_TEXT) {
if (ancestor.matches(selector)) {
parents.push(ancestor)
}
let ancestor = element.parentNode.closest(selector)

ancestor = ancestor.parentNode
while (ancestor) {
parents.push(ancestor)
ancestor = ancestor.parentNode.closest(selector)
}

return parents
Expand Down