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

Prevent clicks originating inside modal from dismissing #36603

Closed
wants to merge 1 commit into from
Closed

Prevent clicks originating inside modal from dismissing #36603

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
12 changes: 9 additions & 3 deletions js/src/modal.js
View file
Open in desktop
Expand Up @@ -30,7 +30,8 @@ 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_MOUSEUP_DISMISS = `mouseup.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 @@ -69,6 +70,7 @@ class Modal extends BaseComponent {
this._focustrap = this._initializeFocusTrap()
this._isShown = false
this._isTransitioning = false
this._dismissOutside = false
this._scrollBar = new ScrollBarHelper()

this._addEventListeners()
Expand Down Expand Up @@ -221,8 +223,12 @@ class Modal extends BaseComponent {
}
})

EventHandler.on(this._element, EVENT_CLICK_DISMISS, event => {
if (event.target !== event.currentTarget) { // click is inside modal-dialog
EventHandler.on(this._element, EVENT_MOUSEDOWN_DISMISS, event => {
this._dismissOutside = (event.target === event.currentTarget)
})

EventHandler.on(this._element, EVENT_MOUSEUP_DISMISS, event => {
if (event.target !== event.currentTarget || !this._dismissOutside) { // click is inside (or originated inside) modal-dialog
return
}

Expand Down