Skip to content

Fix tooltip skipDelayDuration with disableHoverableContent #3562

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix tooltip skipDelayDuration with disableHoverableContent #3562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aff748
Fix tooltip skipDelayDuration with disableHoverableContent
jamiebuilds May 23, 2025
0ec21a3
Always reset isOpenDelayedRef in case skipDelayDuration changes
jamiebuilds May 23, 2025
a1ef3b2
Fix cleanup skipDelayTimerRef
jamiebuilds May 23, 2025
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
8 changes: 4 additions & 4 deletions apps/storybook/stories/tooltip.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ export const CustomDurations = () => (
</div>

<h2>Custom (0ms to move from one to another tooltip = never skip)</h2>
<div style={{ display: 'flex', gap: 50 }}>
<div style={{ display: 'flex', gap: 0 }}>
<Tooltip.Provider skipDelayDuration={0}>
<Tooltip.Root>
<Tooltip.Root disableHoverableContent>
<Tooltip.Trigger className={styles.trigger}>Hover me</Tooltip.Trigger>
<Tooltip.Portal>
<Tooltip.Content className={styles.content} sideOffset={5}>
Expand All @@ -185,7 +185,7 @@ export const CustomDurations = () => (
</Tooltip.Content>
</Tooltip.Portal>
</Tooltip.Root>
<Tooltip.Root>
<Tooltip.Root disableHoverableContent>
<Tooltip.Trigger className={styles.trigger}>Hover me</Tooltip.Trigger>
<Tooltip.Portal>
<Tooltip.Content className={styles.content} sideOffset={5}>
Expand All @@ -194,7 +194,7 @@ export const CustomDurations = () => (
</Tooltip.Content>
</Tooltip.Portal>
</Tooltip.Root>
<Tooltip.Root>
<Tooltip.Root disableHoverableContent>
<Tooltip.Trigger className={styles.trigger}>Hover me</Tooltip.Trigger>
<Tooltip.Portal>
<Tooltip.Content className={styles.content} sideOffset={5}>
Expand Down
25 changes: 15 additions & 10 deletions packages/react/tooltip/src/tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ const TooltipProvider: React.FC<TooltipProviderProps> = (
const skipDelayTimerRef = React.useRef(0);

React.useEffect(() => {
const skipDelayTimer = skipDelayTimerRef.current;
return () => window.clearTimeout(skipDelayTimer);
return () => window.clearTimeout(skipDelayTimerRef.current);
}, []);

return (
Expand All @@ -86,15 +85,21 @@ const TooltipProvider: React.FC<TooltipProviderProps> = (
isOpenDelayedRef={isOpenDelayedRef}
delayDuration={delayDuration}
onOpen={React.useCallback(() => {
window.clearTimeout(skipDelayTimerRef.current);
isOpenDelayedRef.current = false;
}, [])}
if (skipDelayDuration > 0) {
window.clearTimeout(skipDelayTimerRef.current);
isOpenDelayedRef.current = false;
}
}, [skipDelayDuration])}
onClose={React.useCallback(() => {
window.clearTimeout(skipDelayTimerRef.current);
skipDelayTimerRef.current = window.setTimeout(
() => (isOpenDelayedRef.current = true),
skipDelayDuration
);
if (skipDelayDuration > 0) {
window.clearTimeout(skipDelayTimerRef.current);
skipDelayTimerRef.current = window.setTimeout(
() => (isOpenDelayedRef.current = true),
skipDelayDuration
);
} else {
isOpenDelayedRef.current = true;
}
}, [skipDelayDuration])}
isPointerInTransitRef={isPointerInTransitRef}
onPointerInTransitChange={React.useCallback((inTransit: boolean) => {
Expand Down