Skip to content

fix(tooltip): fix wrong initial and focus tooltip positions in followMouse mode #1278

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

Open
bmichalowski wants to merge 2 commits into
base: main
Choose a base branch
from
+29 −11
Open

fix(tooltip): fix wrong initial and focus tooltip positions in followMouse mode #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
707cb88
fix(tooltip): set initial position for follow mouse mode
bmichalowski Nov 20, 2025
c8849fc
Merge branch 'main' into bug/tooltip-wrong-initial-position
bmichalowski Feb 28, 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
22 changes: 19 additions & 3 deletions src/components/Tooltip/Tooltip.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ describe("Tooltip", () => {
expect(screen.queryByTestId("tooltip-portal")).not.toBeInTheDocument();
});

it("renders tooltip message on focus", async () => {
it("shows tooltip message on focus", async () => {
render(
<Tooltip message="tooltip text">
<button>open the tooltip</button>
Expand All @@ -177,8 +177,24 @@ describe("Tooltip", () => {
await act(async () => {
await userEventWithTimers.tab();
});
expect(screen.getByTestId("tooltip-portal")).toBeInTheDocument();
expect(screen.getByText("tooltip text")).toBeInTheDocument();
expect(screen.getByTestId("tooltip-portal")).toBeVisible();
expect(screen.getByText("tooltip text")).toBeVisible();
});

it("shows tooltip message on focus, with followMouse active", async () => {
render(
<Tooltip message="tooltip text" followMouse>
<button>open the tooltip</button>
</Tooltip>,
);

expect(screen.queryByTestId("tooltip-portal")).not.toBeInTheDocument();
expect(screen.queryByText("tooltip text")).not.toBeInTheDocument();
await act(async () => {
await userEventWithTimers.tab();
});
expect(screen.getByTestId("tooltip-portal")).toBeVisible();
expect(screen.getByText("tooltip text")).toBeVisible();
});

it("updates the tooltip to fit on the screen", async () => {
Expand Down
18 changes: 10 additions & 8 deletions src/components/Tooltip/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,7 @@ const Tooltip = ({
);

// Handle mouse events.
useListener(
wrapperRef.current,
mouseHandler,
"mousemove",
true,
followMouse && isOpen,
);
useListener(wrapperRef.current, mouseHandler, "mousemove", true, followMouse);

// Handle adjusting the position of the tooltip so that it remains on screen.
useWindowFitment(
Expand Down Expand Up @@ -334,6 +328,14 @@ const Tooltip = ({
openPortal();
};

const handleFocus = () => {
if (followMouse && wrapperRef.current) {
// set initial position for the tooltip
setPositionStyle(getPositionStyle(adjustedPosition, wrapperRef.current));
}
openPortal();
};

const delayedOpenPortal: MouseEventHandler = useCallback(() => {
if (isOpen) {
return;
Expand All @@ -352,7 +354,7 @@ const Tooltip = ({
className={className}
onBlur={handleBlur}
onClick={handleClick}
onFocus={openPortal}
onFocus={handleFocus}
onMouseOut={handleBlur}
onMouseOver={delayedOpenPortal}
>
Expand Down