Skip to content

feat: Allow closing popovers by right clicking the curtain #720

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Allow closing popovers by right clicking the curtain #720

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
6 changes: 4 additions & 2 deletions studio/src/ui/popoverMenus/PopoverManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ export class PopoverManager {
const needsListener = Boolean(this.#activePopovers.length);
if (needsListener == this.#hasBodyClickListener) return;
if (needsListener) {
document.body.addEventListener("click", this.#onBodyClick);
document.body.addEventListener("pointerdown", this.#onBodyClick);
} else {
document.body.removeEventListener("click", this.#onBodyClick);
document.body.removeEventListener("pointerdown", this.#onBodyClick);
}
this.#hasBodyClickListener = needsListener;
}
Expand All @@ -122,6 +122,8 @@ export class PopoverManager {
return;
}

e.preventDefault();

this.#activePopovers.forEach(p => {
p.close();
});
Expand Down
7 changes: 4 additions & 3 deletions test/unit/studio/src/ui/popoverMenus/PopoverManager.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ Deno.test({
await waitForMicrotasks();

// Clicking the popover should not close it
const mouseEvent1 = new FakeMouseEvent("click");
const mouseEvent1 = new FakeMouseEvent("pointerdown");
popover.el.dispatchEvent(mouseEvent1);

assertExists(manager.curtainEl.parentElement);
assertStrictEquals(manager.getLastPopover(), popover);

// But clicking any other element should
const mouseEvent2 = new FakeMouseEvent("click");
// But clicking any other element should close the popover and remove the curtain
const mouseEvent2 = new FakeMouseEvent("pointerdown");
document.body.dispatchEvent(mouseEvent2);
assertEquals(manager.curtainEl.parentElement, null);

Expand Down