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

Jump to bottom

[v10.0.x] Grafana UI: Fix behaviour regression on Tooltip component #70742

Merged
merged 1 commit into from
Jun 27, 2023
Merged

[v10.0.x] Grafana UI: Fix behaviour regression on Tooltip component #70742

Show file tree
Hide file tree
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
32 changes: 32 additions & 0 deletions packages/grafana-ui/src/components/Tooltip/Tooltip.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import React, { MutableRefObject } from 'react';

import { Tooltip } from './Tooltip';
Expand Down Expand Up @@ -38,4 +39,35 @@ describe('Tooltip', () => {

expect(refObj.current).not.toBeNull();
});
it('to be shown on hover and be dismissable by pressing Esc key when show is undefined', async () => {
render(
<Tooltip content="Tooltip content">
<span>On the page</span>
</Tooltip>
);
await userEvent.hover(screen.getByText('On the page'));
expect(await screen.findByText('Tooltip content')).toBeInTheDocument();
await userEvent.keyboard('{Escape}');
expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument();
});
it('is always visible when show prop is true', async () => {
render(
<Tooltip content="Tooltip content" show={true}>
<span>On the page</span>
</Tooltip>
);
await userEvent.hover(screen.getByText('On the page'));
expect(screen.getByText('Tooltip content')).toBeInTheDocument();
await userEvent.unhover(screen.getByText('On the page'));
expect(screen.getByText('Tooltip content')).toBeInTheDocument();
});
it('is never visible when show prop is false', async () => {
render(
<Tooltip content="Tooltip content" show={false}>
<span>On the page</span>
</Tooltip>
);
await userEvent.hover(screen.getByText('On the page'));
expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument();
});
});
2 changes: 1 addition & 1 deletion packages/grafana-ui/src/components/Tooltip/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const Tooltip = React.forwardRef<HTMLElement, TooltipProps>(
}, [controlledVisible]);

const { getArrowProps, getTooltipProps, setTooltipRef, setTriggerRef, visible, update } = usePopperTooltip({
visible: controlledVisible,
visible: show ?? controlledVisible,
placement: placement,
interactive: interactive,
delayHide: interactive ? 100 : 0,
Expand Down