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

Fix modal being displayed when dropdown toggle is clicked #41083

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+41 −0
Open

Fix modal being displayed when dropdown toggle is clicked #41083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aead52
Fix modal being displayed when dropdown toggle is clicked
alhernandez25 Dec 7, 2024
43292aa
Merge branch 'main' into dropdown-toggle-fix
alhernandez25 Dec 7, 2024
0620092
Linting fix
alhernandez25 Dec 7, 2024
4f69bc1
Merge remote-tracking branch 'origin/dropdown-toggle-fix' into dropdo…
alhernandez25 Dec 7, 2024
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 @@ -10,6 +10,8 @@ import BaseComponent from './base-component.js'
import EventHandler from './dom/event-handler.js'
import Manipulator from './dom/manipulator.js'
import SelectorEngine from './dom/selector-engine.js'
import Modal from "./modal.js"

import {
defineJQueryPlugin,
execute,
Expand Down Expand Up @@ -442,8 +444,10 @@ EventHandler.on(document, EVENT_KEYDOWN_DATA_API, SELECTOR_MENU, Dropdown.dataAp
EventHandler.on(document, EVENT_CLICK_DATA_API, Dropdown.clearMenus)
EventHandler.on(document, EVENT_KEYUP_DATA_API, Dropdown.clearMenus)
EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
Modal.disableToggleEvent()
event.preventDefault()
Dropdown.getOrCreateInstance(this).toggle()
Modal.enableToggleEvent()
})

/**
Expand Down
37 changes: 37 additions & 0 deletions js/src/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,43 @@ class Modal extends BaseComponent {
data[config](relatedTarget)
})
}

static disableToggleEvent() {
EventHandler.off(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE)
}

static enableToggleEvent() {
EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
const target = SelectorEngine.getElementFromSelector(this)

if (['A', 'AREA'].includes(this.tagName)) {
event.preventDefault()
}

EventHandler.one(target, EVENT_SHOW, showEvent => {
if (showEvent.defaultPrevented) {
// only register focus restorer if modal will actually get shown
return
}

EventHandler.one(target, EVENT_HIDDEN, () => {
if (isVisible(this)) {
this.focus()
}
})
})

// avoid conflict when clicking modal toggler while another one is open
const alreadyOpen = SelectorEngine.findOne(OPEN_SELECTOR)
if (alreadyOpen) {
Modal.getInstance(alreadyOpen).hide()
}

const data = Modal.getOrCreateInstance(target)

data.toggle(this)
})
}
}

/**
Expand Down