Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

improve esc keyboard shortcut

Steven Tey44db3ed952ea
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index d5da8a07f8..52bc38c577 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -570,9 +570,6 @@ export function AppSidebarNav({
() => router.push(`/${slug}/${defaultProduct}`),
{
enabled: currentArea === "workspaceSettings",
- priority: 2,
- modal: false,
- sheet: false,
},
);
diff --git a/packages/ui/src/hooks/use-keyboard-shortcut.tsx b/packages/ui/src/hooks/use-keyboard-shortcut.tsx
index a87f4ef34a..ce7477bce7 100644
--- a/packages/ui/src/hooks/use-keyboard-shortcut.tsx
+++ b/packages/ui/src/hooks/use-keyboard-shortcut.tsx
@@ -57,6 +57,10 @@ export function useKeyboardShortcut(
(e: KeyboardEvent) => {
if (options.enabled === false) return;
+ // Skip if another handler already consumed this key (e.g. Radix
+ // popovers/menus/dialogs close on Escape in the capture phase).
+ if (e.defaultPrevented) return;
+
const target = e.target as HTMLElement;
const existingModalBackdrop = document.getElementById("modal-backdrop");
const existingSheetBackdrop = document.querySelector(