Skip to content

fix(QMenu): prevent nested menus from closing on unrelated click-outside (#18091) #18134

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
IceIsFrozen wants to merge 1 commit into
base: dev
Choose a base branch
from
+10 −0
Open

fix(QMenu): prevent nested menus from closing on unrelated click-outside (#18091) #18134

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
5 changes: 5 additions & 0 deletions ui/src/components/menu/QMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ export default createComponent({
if (props.persistent !== true && showing.value === true) {
hide(e)

// prevent further processing of click-outside handlers
if (props.separateClosePopup === true) {
e.qSeparateClosePopup = true
}

if (
// always prevent touch event
e.type === 'touchstart'
Expand Down
5 changes: 5 additions & 0 deletions ui/src/utils/private.click-outside/click-outside.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ function globalHandler (evt) {
// used to prevent refocus after menu close
evt.qClickOutside = true
state.onClickOutside(evt)

// used to prevent closing all if nested
if (evt.qSeparateClosePopup === true) {
return
}
}
else {
return
Expand Down