diff options
author | Louis-Maxime Piton <louismaxime.piton@orange.com> | 2022-09-02 10:52:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-02 10:52:33 +0300 |
commit | 337068f8b1044004f4b9abfffbb433694ae87993 (patch) | |
tree | c870d6966098f480ec14ef447cc47d807ce11513 /js/src | |
parent | 54b4b2c66a6f0f403a8120a0c7720f29aaa71f7c (diff) |
fix(dropdowns): Fix multiple dropdowns when they are inside the same tag (#37011)
Diffstat (limited to 'js/src')
-rw-r--r-- | js/src/dropdown.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 601792953e..424b187ffe 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -95,7 +95,8 @@ class Dropdown extends BaseComponent { this._popper = null this._parent = this._element.parentNode // dropdown wrapper - this._menu = SelectorEngine.findOne(SELECTOR_MENU, this._parent) + // todo: v6 revert #37011 & change markup https://getbootstrap.com/docs/5.2/forms/input-group/ + this._menu = SelectorEngine.next(this._element, SELECTOR_MENU)[0] || SelectorEngine.prev(this._element, SELECTOR_MENU)[0] this._inNavbar = this._detectNavbar() } @@ -405,7 +406,8 @@ class Dropdown extends BaseComponent { event.preventDefault() - const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE, event.delegateTarget.parentNode) + // todo: v6 revert #37011 & change markup https://getbootstrap.com/docs/5.2/forms/input-group/ + const getToggleButton = this.matches(SELECTOR_DATA_TOGGLE) ? this : SelectorEngine.prev(this, SELECTOR_DATA_TOGGLE)[0] || SelectorEngine.next(this, SELECTOR_DATA_TOGGLE)[0] const instance = Dropdown.getOrCreateInstance(getToggleButton) if (isUpOrDownEvent) { |