From c44d99f55c0e1dcc5a23a9f420972bfccfcddb13 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Mon, 31 Jan 2022 00:09:13 +0200 Subject: Dropdown: use destructured variables in `dataApyKeydownHandler` --- js/src/dropdown.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'js/src/dropdown.js') diff --git a/js/src/dropdown.js b/js/src/dropdown.js index ed3feceb86..5635ec96ec 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) { -- cgit v1.2.3