Skip to content
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.

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

fix(input-date-picker, input-time-picker, modal, sheet): closes on escape when focusTrap is disabled #10578

Merged
Merged
Changes from 1 commit
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
Prev Previous commit
combine if blocks in escape keyDownHandlers
Elijbet committed Nov 27, 2024
commit f1402f76e949133a08f642df81487651e1e1e1b9
14 changes: 8 additions & 6 deletions packages/calcite-components/src/components/modal/modal.tsx
Original file line number Diff line number Diff line change
@@ -337,13 +337,15 @@ export class Modal
private keyDownHandler = (event: KeyboardEvent): void => {
const { defaultPrevented, key } = event;

if (defaultPrevented || !this.focusTrapDisabled) {
return;
}

if (this.open && !this.escapeDisabled && key === "Escape" && this.focusTrapDisabled) {
this.open = false;
if (
!defaultPrevented &&
this.focusTrapDisabled &&
this.open &&
!this.escapeDisabled &&
key === "Escape"
) {
event.preventDefault();
this.open = false;
}
};

12 changes: 7 additions & 5 deletions packages/calcite-components/src/components/sheet/sheet.tsx
Original file line number Diff line number Diff line change
@@ -253,11 +253,13 @@ export class Sheet
private keyDownHandler = (event: KeyboardEvent): void => {
const { defaultPrevented, key } = event;

if (defaultPrevented || this.escapeDisabled || !this.focusTrapDisabled) {
return;
}

if (this.open && key === "Escape") {
if (
!defaultPrevented &&
!this.escapeDisabled &&
this.focusTrapDisabled &&
this.open &&
key === "Escape"
) {
event.preventDefault();
this.open = false;
}