Skip to content
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

Jump to bottom

Change Modal dismiss handler, listening to key down, instead of click #36401

Merged
merged 1 commit into from Jun 21, 2022
+15 −8
Merged

Change Modal dismiss handler, listening to key down, instead of click #36401

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/src/modal.js
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ const EVENT_HIDDEN = `hidden${EVENT_KEY}`
const EVENT_SHOW = `show${EVENT_KEY}`
const EVENT_SHOWN = `shown${EVENT_KEY}`
const EVENT_RESIZE = `resize${EVENT_KEY}`
const EVENT_CLICK_DISMISS = `click.dismiss${EVENT_KEY}`
const EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY}`
const EVENT_KEYDOWN_DISMISS = `keydown.dismiss${EVENT_KEY}`
const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`

Expand Down Expand Up @@ -221,7 +221,7 @@ class Modal extends BaseComponent {
}
})

EventHandler.on(this._element, EVENT_CLICK_DISMISS, event => {
EventHandler.on(this._element, EVENT_MOUSEDOWN_DISMISS, event => {
if (event.target !== event.currentTarget) { // click is inside modal-dialog
return
}
Expand Down
19 changes: 13 additions & 6 deletions js/tests/unit/modal.spec.js
View file
Open in desktop
Expand Up @@ -641,9 +641,10 @@ describe('Modal', () => {

modalEl.addEventListener('shown.bs.modal', () => {
const spy = spyOn(modal, '_queueCallback').and.callThrough()
const mouseDown = createEvent('mousedown')

modalEl.click()
modalEl.click()
modalEl.dispatchEvent(mouseDown)
modalEl.dispatchEvent(mouseDown)

setTimeout(() => {
expect(spy).toHaveBeenCalledTimes(1)
Expand Down Expand Up @@ -709,13 +710,19 @@ describe('Modal', () => {
fixtureEl.innerHTML = '<div class="modal"><div class="modal-dialog"></div></div>'

const modalEl = fixtureEl.querySelector('.modal')
const dialogEl = modalEl.querySelector('.modal-dialog')
const modal = new Modal(modalEl)

spyOn(modal, 'hide')

modalEl.addEventListener('shown.bs.modal', () => {
modalEl.click()
})
const mouseDown = createEvent('mousedown')

modalEl.addEventListener('hidden.bs.modal', () => {
expect(document.querySelector('.modal-backdrop')).toBeNull()
dialogEl.dispatchEvent(mouseDown)
expect(modal.hide).not.toHaveBeenCalled()

modalEl.dispatchEvent(mouseDown)
expect(modal.hide).toHaveBeenCalled()
resolve()
})

Expand Down