diff options
| author | GeoSot <[email protected]> | 2022-01-31 00:09:13 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2022-02-01 08:58:46 +0200 |
| commit | c44d99f55c0e1dcc5a23a9f420972bfccfcddb13 (patch) | |
| tree | c012a267f8ef9561d154580209c25f7f04945b27 | |
| parent | c14fc989df8dc107b0ba86c241487b192841d753 (diff) | |
| download | bootstrap-c44d99f55c0e1dcc5a23a9f420972bfccfcddb13.tar.xz bootstrap-c44d99f55c0e1dcc5a23a9f420972bfccfcddb13.zip | |
Dropdown: use destructured variables in `dataApyKeydownHandler`
| -rw-r--r-- | js/src/dropdown.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index ed3feceb8..5635ec96e 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -385,9 +385,10 @@ class Dropdown extends BaseComponent { // - If key is not UP or DOWN => not a dropdown command // - If trigger inside the menu => not a dropdown command - const isInput = /input|textarea/i.test(event.target.tagName) - const isEscapeEvent = event.key === ESCAPE_KEY - const isUpOrDownEvent = [ARROW_UP_KEY, ARROW_DOWN_KEY].includes(event.key) + const { target, key, delegateTarget } = event + const isInput = /input|textarea/i.test(target.tagName) + const isEscapeEvent = key === ESCAPE_KEY + const isUpOrDownEvent = [ARROW_UP_KEY, ARROW_DOWN_KEY].includes(key) if (!isInput && !(isUpOrDownEvent || isEscapeEvent)) { return @@ -395,12 +396,12 @@ class Dropdown extends BaseComponent { if (isInput && !isEscapeEvent) { // eslint-disable-next-line unicorn/no-lonely-if - if (!isUpOrDownEvent || event.target.closest(SELECTOR_MENU)) { + if (!isUpOrDownEvent || target.closest(SELECTOR_MENU)) { return } } - const isActive = this.classList.contains(CLASS_NAME_SHOW) + const isActive = delegateTarget.classList.contains(CLASS_NAME_SHOW) if (!isActive && isEscapeEvent) { return @@ -413,7 +414,7 @@ class Dropdown extends BaseComponent { 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) if (isEscapeEvent) { |