Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/stacks-svelte/src/components/Modal/Modal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@
}
};

const keyPress = (e: KeyboardEvent) => {
if (e.key === "Escape") {
const keyPress = (event: KeyboardEvent) => {
if (event.key === "Escape" && visible) {
event.stopImmediatePropagation();

close();
}
};
Expand Down
30 changes: 30 additions & 0 deletions packages/stacks-svelte/src/components/Modal/Modal.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,36 @@ describe("Modal", () => {
expectModalVisible(false);
});

it("should stop esc press propagation when closing a visible modal", async () => {
const laterWindowListener = sinon.spy();
render(Modal, { id: "test-modal", visible: true });
window.addEventListener("keydown", laterWindowListener);

try {
await userEvent.keyboard("{Escape}");

expectModalVisible(false);
expect(laterWindowListener).not.to.have.been.called;
} finally {
window.removeEventListener("keydown", laterWindowListener);
}
});

it("should not stop esc press propagation when modal is not visible", async () => {
const laterWindowListener = sinon.spy();
render(Modal, { id: "test-modal", visible: false });
window.addEventListener("keydown", laterWindowListener);

try {
await userEvent.keyboard("{Escape}");

expectModalVisible(false);
expect(laterWindowListener).to.have.been.calledOnce;
} finally {
window.removeEventListener("keydown", laterWindowListener);
}
});

it("should emit close event on close when modal is visible", async () => {
const onClose = sinon.spy();
render(Modal, {
Expand Down
Loading