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

fix: Slider show empty tooltip when tooltip.formatter is falsy #48673

Merged
merged 2 commits into from Apr 29, 2024
Merged

fix: Slider show empty tooltip when tooltip.formatter is falsy #48673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e630dd1
fix: slider tooltip is cant hide
wanpan11 Apr 27, 2024
383ea8d
fix: update case description
wanpan11 Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions components/slider/__tests__/tooltip.test.tsx
View file
Open in desktop
Expand Up @@ -53,4 +53,25 @@ describe('Slider.Tooltip', () => {
await waitFakeTimer();
expect(tooltipProps().open).toBeFalsy();
});

it('not show tooltip', async () => {
wanpan11 marked this conversation as resolved.
Show resolved Hide resolved
const { container } = render(<Slider defaultValue={30} tooltip={{ formatter: null }} />);

const handleEle = container.querySelector('.ant-slider-handle')!;

// Enter
fireEvent.mouseEnter(handleEle);
await waitFakeTimer();
expect(tooltipProps().open).toBeFalsy();

// Down
fireEvent.mouseDown(handleEle);
await waitFakeTimer();
expect(tooltipProps().open).toBeFalsy();

// Move(Leave)
fireEvent.mouseLeave(handleEle);
await waitFakeTimer();
expect(tooltipProps().open).toBeFalsy();
});
});
6 changes: 4 additions & 2 deletions components/slider/index.tsx
View file
Open in desktop
Expand Up @@ -291,14 +291,16 @@ const Slider = React.forwardRef<SliderRef, SliderSingleProps | SliderRangeProps>

const cloneNode = React.cloneElement(node, passedProps);

const open = (!!lockOpen || activeOpen) && mergedTipFormatter !== null;
afc163 marked this conversation as resolved.
Show resolved Hide resolved

// Wrap on handle with Tooltip when is single mode or multiple with all show tooltip
if (!useActiveTooltipHandle) {
return (
<SliderTooltip
{...tooltipProps}
prefixCls={getPrefixCls('tooltip', customizeTooltipPrefixCls ?? legacyTooltipPrefixCls)}
title={mergedTipFormatter ? mergedTipFormatter(info.value) : ''}
open={!!lockOpen || activeOpen}
open={open}
placement={getTooltipPlacement(tooltipPlacement ?? legacyTooltipPlacement, vertical)}
key={index}
overlayClassName={`${prefixCls}-tooltip`}
Expand Down Expand Up @@ -329,7 +331,7 @@ const Slider = React.forwardRef<SliderRef, SliderSingleProps | SliderRangeProps>
{...tooltipProps}
prefixCls={getPrefixCls('tooltip', customizeTooltipPrefixCls ?? legacyTooltipPrefixCls)}
title={mergedTipFormatter ? mergedTipFormatter(info.value) : ''}
open={activeOpen}
open={mergedTipFormatter !== null && activeOpen}
placement={getTooltipPlacement(tooltipPlacement ?? legacyTooltipPlacement, vertical)}
key="tooltip"
overlayClassName={`${prefixCls}-tooltip`}
Expand Down