Dropdown: use a better selector to avoid triggering click if button is disabled ...

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 4bb1379f576199de3d32a9395691864bc94bfb56..da56f48256e0bdbaa9e7ffad2deae45c2fd4ca8e 100644 (file)
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -49,7 +49,7 @@ const CLASS_NAME_DROPUP = 'dropup'
 const CLASS_NAME_DROPEND = 'dropend'
 const CLASS_NAME_DROPSTART = 'dropstart'
 
-const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="dropdown"]'
+const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="dropdown"]:not(.disabled):not(:disabled)'
 const SELECTOR_DATA_TOGGLE_SHOWN = `${SELECTOR_DATA_TOGGLE}.${CLASS_NAME_SHOW}`
 const SELECTOR_MENU = '.dropdown-menu'
 const SELECTOR_NAVBAR = '.navbar'
@@ -407,10 +407,6 @@ class Dropdown extends BaseComponent {
     event.preventDefault()
     event.stopPropagation()
 
-    if (isDisabled(this)) {
-      return
-    }
-
     const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE, delegateTarget.parentNode)
     const instance = Dropdown.getOrCreateInstance(getToggleButton)