upstream/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-02-18 18:20:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 68

Tooltips: Prevent dismissing with keyboard shortcuts (#115802)

Browse source
This commit is contained in:
Adela Almasan 2026-01-05 08:56:21 -06:00 committed by GitHub
parent d8cdee80f0
commit 5698f2d039
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
e2e-playwright/panels-suite/state-timeline.spec.ts
View file

@ -78,6 +78,16 @@ test.describe('Panels test: StateTimeine', { tag: ['@panels', '@state-timeline']
await dashboardPage.getByGrafanaSelector(selectors.components.Portal.container).getByLabel('Close').click();
await expect(tooltip, 'tooltip closed on "x" click').toBeHidden();
// test that CMD/CTRL+C doesn't dismiss the tooltip
await stateTimelineUplot.click({ position: { x: 100, y: 50 } });
await expect(tooltip, 'tooltip appears on click').toBeVisible();
await page.keyboard.press('Meta+C');
await expect(tooltip, 'tooltip persists after CMD/CTRL+C').toBeVisible();
// test that Escape key dismisses the tooltip
await page.keyboard.press('Escape');
await expect(tooltip, 'tooltip closed on Escape key').toBeHidden();
// disable tooltips
await dashboardPage
.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Tooltip Tooltip mode'))

10
e2e-playwright/panels-suite/status-history.spec.ts
View file

@ -76,6 +76,16 @@ test.describe('Panels test: StatusHistory', { tag: ['@panels', '@status-history'
await dashboardPage.getByGrafanaSelector(selectors.components.Portal.container).getByLabel('Close').click();
await expect(tooltip, 'tooltip closed on "x" click').toBeHidden();
// test that CMD/CTRL+C doesn't dismiss the tooltip
await statusHistoryUplot.click({ position: { x: 100, y: 50 } });
await expect(tooltip, 'tooltip appears on click').toBeVisible();
await page.keyboard.press('Meta+C');
await expect(tooltip, 'tooltip persists after CMD/CTRL+C').toBeVisible();
// test that Escape key dismisses the tooltip
await page.keyboard.press('Escape');
await expect(tooltip, 'tooltip closed on Escape key').toBeHidden();
// disable tooltips
await dashboardPage
.getByGrafanaSelector(selectors.components.PanelEditor.OptionsPane.fieldLabel('Tooltip Tooltip mode'))

9
packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx
View file

@ -240,6 +240,15 @@ export const TooltipPlugin2 = ({
// in some ways this is similar to ClickOutsideWrapper.tsx
const downEventOutside = (e: Event) => {
if (e instanceof KeyboardEvent) {
if (e.key === 'Escape') {
e.preventDefault();
e.stopPropagation();
dismiss();
}
return;
}
// this tooltip is Portaled, but actions inside it create forms in Modals
const isModalOrPortaled = '[role="dialog"], #grafana-portal-container';