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.

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

fix(Dialog): dialog closes on Esc down if disable-close-esc-keydown is enabled #979

Merged
merged 1 commit into from
Apr 1, 2024
Merged

fix(Dialog): dialog closes on Esc down if disable-close-esc-keydown is enabled #979

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
12 changes: 9 additions & 3 deletions packages/beeq/src/components/dialog/bq-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,14 @@ export class BqDialog {
}

@Listen('keydown', { target: 'window', capture: true })
async handleKeyDown(event: KeyboardEvent) {
if (!this.open || !this.dialogElem || !(event.key === 'Escape' || event.key === 'Esc')) return;
async handleKeyDown(ev: KeyboardEvent) {
const isEscapeKey = ev.key === 'Escape' || ev.key === 'Esc';
if (!this.open || !this.dialogElem || !isEscapeKey) return;

if (this.disableCloseEscKeydown) {
ev.preventDefault();
return;
}

await this.cancel();
}
Expand Down Expand Up @@ -238,7 +244,7 @@ export class BqDialog {
return (
<dialog
style={style}
class={`bq-dialog hidden ${this.size}`}
class={`bq-dialog hidden ${this.size} focus-visible:outline-none`}
data-transition-enter="transition ease-in duration-300"
data-transition-enter-start="opacity-0 scale-75"
data-transition-enter-end="opacity-100 scale-100"
Expand Down