Skip to content

Fix dropdown keyboard submenu dismissal #42528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mturac wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix dropdown keyboard submenu dismissal #42528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions js/src/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,10 @@ class Dropdown extends BaseComponent {

if (isUpOrDownEvent) {
event.stopPropagation()
if (this.matches(SELECTOR_DATA_TOGGLE)) {
Dropdown.clearMenus(event)
}

instance.show()
instance._selectMenuItem(event)
return
Expand Down
54 changes: 54 additions & 0 deletions js/tests/unit/dropdown.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,6 +1763,60 @@ describe('Dropdown', () => {
})
})

it('should close sibling submenus when opening nested dropdowns with keyboard navigation', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
'<div class="dropdown">',
' <button id="menuDemo" class="btn dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside">Demo</button>',
' <ul class="dropdown-menu">',
' <li class="dropend">',
' <a id="subMenuDemo1" class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" href="#">Submenu 1</a>',
' <ul id="subMenuDemo1Menu" class="dropdown-menu"><li>Menu Item 1A</li></ul>',
' </li>',
' <li class="dropend">',
' <a id="subMenuDemo2" class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" href="#">Submenu 2</a>',
' <ul id="subMenuDemo2Menu" class="dropdown-menu"><li>Menu Item 2A</li></ul>',
' </li>',
' <li class="dropend">',
' <a id="subMenuDemo3" class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside" href="#">Submenu 3</a>',
' <ul id="subMenuDemo3Menu" class="dropdown-menu"><li>Menu Item 3A</li></ul>',
' </li>',
' </ul>',
'</div>'
].join('')

const menuDemo = fixtureEl.querySelector('#menuDemo')
const subMenuDemo2 = fixtureEl.querySelector('#subMenuDemo2')
const subMenuDemo2Menu = fixtureEl.querySelector('#subMenuDemo2Menu')
const subMenuDemo3 = fixtureEl.querySelector('#subMenuDemo3')
const subMenuDemo3Menu = fixtureEl.querySelector('#subMenuDemo3Menu')

subMenuDemo3.addEventListener('shown.bs.dropdown', () => {
setTimeout(() => {
subMenuDemo2.focus()

const keydownArrowDown = createEvent('keydown', { bubbles: true })
keydownArrowDown.key = 'ArrowDown'
subMenuDemo2.dispatchEvent(keydownArrowDown)

setTimeout(() => {
expect(subMenuDemo2).toHaveClass('show')
expect(subMenuDemo2Menu).toHaveClass('show')
expect(subMenuDemo3).not.toHaveClass('show')
expect(subMenuDemo3Menu).not.toHaveClass('show')
resolve()
})
})
})

menuDemo.addEventListener('shown.bs.dropdown', () => {
subMenuDemo3.click()
})

menuDemo.click()
})
})

it('should open the dropdown and focus on the last item when using ArrowUp for the first time', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
Expand Down