Skip to content

Prevent just a pointerdown on modal close button from closing dialog. #19603

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
johndoknjas wants to merge 4 commits into
base: master
Choose a base branch
from
+3 −8
Open

Prevent just a pointerdown on modal close button from closing dialog. #19603

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad85686
Prevent just a pointerdown event on close button from closing modal d…
johndoknjas Feb 24, 2026
f5d7b21
Merge branch 'master' into require-click-on-close-button-to-close
johndoknjas Feb 24, 2026
61421d3
Merge remote-tracking branch 'upstream/master' into require-click-on-…
johndoknjas Feb 27, 2026
70152e7
Remove condition checking that the event is in the bounding client rect.
johndoknjas Feb 27, 2026
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
11 changes: 6 additions & 5 deletions ui/lib/src/view/dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ export async function domDialog(o: DomDialogOpts): Promise<Dialog> {
(o.parent ?? document.body).appendChild(dialog);

const wrapper = new DialogWrapper(dialog, view, o, false);
if (o.show) return wrapper.show();

return wrapper;
return o.show ? wrapper.show() : wrapper;
}

export function snabDialog(o: SnabDialogOpts): VNode {
Expand Down Expand Up @@ -167,7 +165,10 @@ class DialogWrapper implements Dialog {
if (!this.dialog.isConnected) console.trace('likely zombie dialog. Always Be Close()ing');
if (Date.now() - justThen < 200) return;
const r = dialog.getBoundingClientRect();
if (e.clientX < r.left || e.clientX > r.right || e.clientY < r.top || e.clientY > r.bottom)
if (
(e.clientX < r.left || e.clientX > r.right || e.clientY < r.top || e.clientY > r.bottom) &&
!dialog.contains(e.target as Node | null) // close button could be positioned outside the dialog
Copy link
Collaborator

@ornicar ornicar Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still need the X/Y position checks then?

Copy link
Contributor Author

@johndoknjas johndoknjas Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ornicar Tested on Chrome & Safari (Mac) and it seems fine to remove them. I don't know enough about modal dialogs to be sure there aren't any edge cases where it'd make a difference though. @jonbgamble any thoughts on this?

)
this.close('cancel');
};
this.observer.observe(document.body, { childList: true, subtree: true });
Expand All @@ -176,7 +177,7 @@ class DialogWrapper implements Dialog {

this.dialogEvents.addListener(dialog, 'cancel', e => {
if (o.noClickAway && o.noCloseButton && o.class !== 'alert') return e.preventDefault();
if (!this.returnValue) this.returnValue = 'cancel';
this.returnValue ||= 'cancel';
});
this.dialogEvents.addListener(dialog, 'close', this.onRemove);
if (!o.noCloseButton)
Expand Down