Skip to content

feat(dashboards): Add ESC key to dismiss widget builder slideout #112186

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

Merged
NicoHinderling merged 5 commits into from
Apr 7, 2026
+16 −0
Merged

feat(dashboards): Add ESC key to dismiss widget builder slideout #112186

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa48899
feat(dashboards): Add ESC key to dismiss widget builder slideout
NicoHinderling Apr 2, 2026
0373efb
fix(dashboards): Skip ESC handler when confirmation modal is open
NicoHinderling Apr 2, 2026
cab9f4f
ref(dashboards): Use useHotkeys for ESC key handling in widget builder
NicoHinderling Apr 7, 2026
8dd2884
fix(dashboards): Restore missing useEffect import in widget builder
NicoHinderling Apr 7, 2026
ac660ef
fix(dashboards): Prevent ESC from blocking confirmation modal dismiss
NicoHinderling Apr 7, 2026
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
16 changes: 16 additions & 0 deletions static/app/views/dashboards/widgetBuilder/components/widgetBuilderSlideout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ import isEqual from 'lodash/isEqual';

import {Alert} from '@sentry/scraps/alert';
import {Button} from '@sentry/scraps/button';
import {useHotkeys} from '@sentry/scraps/hotkey';
import {Flex} from '@sentry/scraps/layout';
import {ExternalLink, Link} from '@sentry/scraps/link';
import {SlideOverPanel} from '@sentry/scraps/slideOverPanel';

import {Breadcrumbs} from 'sentry/components/breadcrumbs';
import {openConfirmModal} from 'sentry/components/confirm';
import {ErrorBoundary} from 'sentry/components/errorBoundary';
import {useGlobalModal} from 'sentry/components/globalModal/useGlobalModal';
import {Placeholder} from 'sentry/components/placeholder';
import {IconClose} from 'sentry/icons';
import {t, tctCode} from 'sentry/locale';
Expand Down Expand Up @@ -99,6 +101,7 @@ export function WidgetBuilderSlideout({
}: WidgetBuilderSlideoutProps) {
const organization = useOrganization();
const location = useLocation();
const {visible: isModalVisible} = useGlobalModal();
const {state, dispatch} = useWidgetBuilderContext();
const [initialState] = useState(state);
const [customizeFromLibrary, setCustomizeFromLibrary] = useState(false);
Expand Down Expand Up @@ -234,6 +237,19 @@ export function WidgetBuilderSlideout({
});
}, [initialState, onClose, state]);

useHotkeys([
{
match: 'Escape',
skipPreventDefault: true,
callback: (evt: KeyboardEvent) => {
if (!isModalVisible) {
evt.preventDefault();
onCloseWithModal();
}
},
},
]);
Comment thread
sentry[bot] marked this conversation as resolved.
Comment thread
cursor[bot] marked this conversation as resolved.

const breadcrumbs = customizeFromLibrary
? [
{
Expand Down
Loading