Use context properties

1 files changed, 3 insertions, 4 deletions

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 7561f9812..dac7368c2 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -428,13 +428,12 @@ class Dropdown extends BaseComponent {
         continue
       }
 
-      const dropdownMenu = context._menu
-      if (!toggles[i].classList.contains(CLASS_NAME_SHOW)) {
+      if (!context._element.classList.contains(CLASS_NAME_SHOW)) {
         continue
       }
 
       const relatedTarget = {
-        relatedTarget: toggles[i]
+        relatedTarget: context._element
       }
 
       if (event) {
@@ -444,7 +443,7 @@ class Dropdown extends BaseComponent {
         }
 
         // Tab navigation through the dropdown menu shouldn't close the menu
-        if (event.type === 'keyup' && event.key === TAB_KEY && dropdownMenu.contains(event.target)) {
+        if (event.type === 'keyup' && event.key === TAB_KEY && context._menu.contains(event.target)) {
           continue
         }