root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Dropdown: use destructured variables in `dataApyKeydownHandler`

This commit is contained in:
GeoSot 2022-01-31 00:09:13 +02:00 committed by XhmikosR
parent c14fc989df
commit c44d99f55c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/dropdown.js
View File

@ -385,9 +385,10 @@ class Dropdown extends BaseComponent {
// - If key is not UP or DOWN => not a dropdown command // - If key is not UP or DOWN => not a dropdown command
// - If trigger inside the menu => not a dropdown command // - If trigger inside the menu => not a dropdown command
const isInput = /input|textarea/i.test(event.target.tagName) const { target, key, delegateTarget } = event
const isEscapeEvent = event.key === ESCAPE_KEY const isInput = /input|textarea/i.test(target.tagName)
const isUpOrDownEvent = [ARROW_UP_KEY, ARROW_DOWN_KEY].includes(event.key) const isEscapeEvent = key === ESCAPE_KEY
const isUpOrDownEvent = [ARROW_UP_KEY, ARROW_DOWN_KEY].includes(key)
if (!isInput && !(isUpOrDownEvent || isEscapeEvent)) { if (!isInput && !(isUpOrDownEvent || isEscapeEvent)) {
return return
@ -395,12 +396,12 @@ class Dropdown extends BaseComponent {
if (isInput && !isEscapeEvent) { if (isInput && !isEscapeEvent) {
// eslint-disable-next-line unicorn/no-lonely-if // eslint-disable-next-line unicorn/no-lonely-if
if (!isUpOrDownEvent || event.target.closest(SELECTOR_MENU)) { if (!isUpOrDownEvent || target.closest(SELECTOR_MENU)) {
return return
} }
} }
const isActive = this.classList.contains(CLASS_NAME_SHOW) const isActive = delegateTarget.classList.contains(CLASS_NAME_SHOW)
if (!isActive && isEscapeEvent) { if (!isActive && isEscapeEvent) {
return return
@ -413,7 +414,7 @@ class Dropdown extends BaseComponent {
return return
} }
const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE, event.delegateTarget.parentNode) const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE, delegateTarget.parentNode)
const instance = Dropdown.getOrCreateInstance(getToggleButton) const instance = Dropdown.getOrCreateInstance(getToggleButton)
if (isEscapeEvent) { if (isEscapeEvent) {