Skip to content

Commit

Permalink
Close bookmark details with escape (#702)
Browse files Browse the repository at this point in the history
  • Loading branch information
sissbruecker committed Apr 15, 2024
1 parent 22ffecb commit a1822e2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 2 deletions.
5 changes: 5 additions & 0 deletions bookmarks/e2e/e2e_test_bookmark_details_modal.py
Expand Up @@ -34,6 +34,11 @@ def test_close_details(self):
overlay.click(position={"x": 0, "y": 0})
expect(details_modal).to_be_hidden()

# close with escape
details_modal = self.open_details_modal(bookmark)
self.page.keyboard.press("Escape")
expect(details_modal).to_be_hidden()

def test_toggle_archived(self):
bookmark = self.setup_bookmark()

Expand Down
32 changes: 30 additions & 2 deletions bookmarks/frontend/behaviors/modal.js
Expand Up @@ -4,13 +4,41 @@ class ModalBehavior extends Behavior {
constructor(element) {
super(element);

this.onClose = this.onClose.bind(this);
this.onKeyDown = this.onKeyDown.bind(this);

const modalOverlay = element.querySelector(".modal-overlay");
const closeButton = element.querySelector("button.close");
modalOverlay.addEventListener("click", this.onClose.bind(this));
closeButton.addEventListener("click", this.onClose.bind(this));
modalOverlay.addEventListener("click", this.onClose);
closeButton.addEventListener("click", this.onClose);

document.addEventListener("keydown", this.onKeyDown);
}

destroy() {
document.removeEventListener("keydown", this.onKeyDown);
}

onKeyDown(event) {
// Skip if event occurred within an input element
const targetNodeName = event.target.nodeName;
const isInputTarget =
targetNodeName === "INPUT" ||
targetNodeName === "SELECT" ||
targetNodeName === "TEXTAREA";

if (isInputTarget) {
return;
}

if (event.key === "Escape") {
event.preventDefault();
this.onClose();
}
}

onClose() {
document.removeEventListener("keydown", this.onKeyDown);
this.element.classList.add("closing");
this.element.addEventListener("animationend", (event) => {
if (event.animationName === "fade-out") {
Expand Down

0 comments on commit a1822e2

Please sign in to comment.