Skip to content
Draft
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
1 change: 1 addition & 0 deletions packages/overlay/src/vaadin-overlay-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ export const OverlayMixin = (superClass) =>
this.dispatchEvent(evt);

if (this.opened && !evt.defaultPrevented) {
event.preventDefault();
this.close(event);
}
}
Expand Down
22 changes: 22 additions & 0 deletions packages/overlay/test/interactions.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,28 @@ describe('interactions', () => {
expect(overlay.opened).to.be.true;
});

it('should prevent default on the Escape keydown event when closing', () => {
const spy = sinon.spy();
document.addEventListener('keydown', spy, { once: true });

escKeyDown(document.body);

expect(overlay.opened).to.be.false;
expect(spy.firstCall.args[0].defaultPrevented).to.be.true;
});

it('should not prevent default on the Escape keydown event if overlay-escape-press is cancelled', () => {
overlay.addEventListener('vaadin-overlay-escape-press', (e) => e.preventDefault());

const spy = sinon.spy();
document.addEventListener('keydown', spy, { once: true });

escKeyDown(document.body);

expect(overlay.opened).to.be.true;
expect(spy.firstCall.args[0].defaultPrevented).to.be.false;
});

it('should not close on Esc if the keydown event was prevented', () => {
overlay.addEventListener('keydown', (e) => e.preventDefault());

Expand Down