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

[Tooltip] Fix Provider delay=0 not being respected #1416

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Tooltip] Fix Provider delay=0 not being respected #1416

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
28 changes: 26 additions & 2 deletions packages/react/src/tooltip/provider/TooltipProvider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('<Tooltip.Provider />', () => {
</Tooltip.Provider>,
);

const trigger = document.querySelector('button')!;
const trigger = screen.getByRole('button');

fireEvent.mouseEnter(trigger);
fireEvent.mouseMove(trigger);
Expand All @@ -42,6 +42,30 @@ describe('<Tooltip.Provider />', () => {

expect(screen.queryByText('Content')).not.to.equal(null);
});

it('respects delay=0', async () => {
await render(
<Tooltip.Provider delay={0}>
<Tooltip.Root>
<Tooltip.Trigger />
<Tooltip.Portal>
<Tooltip.Positioner>
<Tooltip.Popup>Content</Tooltip.Popup>
</Tooltip.Positioner>
</Tooltip.Portal>
</Tooltip.Root>
</Tooltip.Provider>,
);

const trigger = screen.getByRole('button');

fireEvent.mouseEnter(trigger);
fireEvent.mouseMove(trigger);

clock.tick(0);

expect(screen.queryByText('Content')).not.to.equal(null);
});
});

describe('prop: closeDelay', () => {
Expand All @@ -61,7 +85,7 @@ describe('<Tooltip.Provider />', () => {
</Tooltip.Provider>,
);

const trigger = document.querySelector('button')!;
const trigger = screen.getByRole('button');

fireEvent.mouseEnter(trigger);
fireEvent.mouseMove(trigger);
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/tooltip/provider/TooltipProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { FloatingDelayGroup } from '@floating-ui/react';
const TooltipProvider: React.FC<TooltipProvider.Props> = function TooltipProvider(props) {
const { delay, closeDelay, timeout = 400 } = props;
return (
<FloatingDelayGroup delay={{ open: delay ?? 0, close: closeDelay ?? 0 }} timeoutMs={timeout}>
<FloatingDelayGroup delay={{ open: delay, close: closeDelay }} timeoutMs={timeout}>
{props.children}
</FloatingDelayGroup>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/tooltip/root/TooltipRoot.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ describe('<Tooltip.Root />', () => {
describe('prop: delay', () => {
clock.withFakeTimers();

it('should open after delay with rest type by default', async () => {
it('should open after rest delay', async () => {
await render(
<Root delay={100}>
<Tooltip.Trigger />
Expand Down
8 changes: 5 additions & 3 deletions packages/react/src/tooltip/root/useTooltipRoot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,17 @@ export function useTooltipRoot(params: useTooltipRoot.Parameters): useTooltipRoo
});

const { delay: groupDelay, isInstantPhase, currentId } = useDelayGroup(context);
const openGroupDelay = typeof groupDelay === 'object' ? groupDelay.open : groupDelay;
const closeGroupDelay = typeof groupDelay === 'object' ? groupDelay.close : groupDelay;
// We only pass an object to `FloatingDelayGroup`. A number means the Provider is not
// present, so we should ignore the value by using `undefined`.
const openGroupDelay = typeof groupDelay === 'object' ? groupDelay.open : undefined;
const closeGroupDelay = typeof groupDelay === 'object' ? groupDelay.close : undefined;

let instantType = isInstantPhase ? ('delay' as const) : instantTypeState;
if (!open && context.floatingId === currentId) {
instantType = instantTypeState;
}

const computedRestMs = openGroupDelay || delayWithDefault;
const computedRestMs = openGroupDelay ?? delayWithDefault;
let computedCloseDelay: number | undefined = closeDelayWithDefault;

// A provider is present and the close delay is not set.
Expand Down