From 5669073d83864db10ac3dd138be53957620917dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kiner-tang=EF=BC=88=E6=98=9F=E6=B2=B3=EF=BC=89?=
<1127031143@qq.com>
Date: Mon, 13 Jan 2025 17:55:05 +0800
Subject: [PATCH] feat: [v6] Retire deprecated api for slider (#52369)
* feat: [v6] Retire deprecated api for slider
* feat: [v6] Retire deprecated api for slider
---
components/slider/__tests__/index.test.tsx | 61 ----------------------
components/slider/index.tsx | 45 ++++------------
2 files changed, 9 insertions(+), 97 deletions(-)
diff --git a/components/slider/__tests__/index.test.tsx b/components/slider/__tests__/index.test.tsx
index 58f9ed07487b..9b231c4c4f03 100644
--- a/components/slider/__tests__/index.test.tsx
+++ b/components/slider/__tests__/index.test.tsx
@@ -1,7 +1,6 @@
import React from 'react';
import Slider from '..';
-import { resetWarned } from '../../_util/warning';
import focusTest from '../../../tests/shared/focusTest';
import mountTest from '../../../tests/shared/mountTest';
import rtlTest from '../../../tests/shared/rtlTest';
@@ -164,67 +163,7 @@ describe('Slider', () => {
render();
});
});
- it('deprecated warning', () => {
- resetWarned();
- const TSSlider = Slider as any;
-
- const errSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
-
- const { container, rerender } = render();
- expect(errSpy).toHaveBeenCalledWith(
- 'Warning: [antd: Slider] `tooltipPrefixCls` is deprecated. Please use `tooltip.prefixCls` instead.',
- );
-
- rerender( document.body} />);
- expect(errSpy).toHaveBeenCalledWith(
- 'Warning: [antd: Slider] `getTooltipPopupContainer` is deprecated. Please use `tooltip.getPopupContainer` instead.',
- );
-
- rerender( v} />);
- expect(errSpy).toHaveBeenCalledWith(
- 'Warning: [antd: Slider] `tipFormatter` is deprecated. Please use `tooltip.formatter` instead.',
- );
-
- rerender();
- expect(errSpy).toHaveBeenCalledWith(
- 'Warning: [antd: Slider] `tooltipVisible` is deprecated. Please use `tooltip.open` instead.',
- );
-
- rerender();
- expect(errSpy).toHaveBeenCalledWith(
- 'Warning: [antd: Slider] `tooltipPlacement` is deprecated. Please use `tooltip.placement` instead.',
- );
-
- // All should work
- const holder = document.createElement('div');
- holder.id = 'holder';
- document.body.appendChild(holder);
-
- const getTooltipPopupContainer = jest.fn(() => container);
-
- rerender(
- 'little'}
- tooltipPlacement="bottom"
- tooltipVisible
- />,
- );
-
- act(() => {
- jest.runAllTimers();
- });
-
- expect(getTooltipPopupContainer).toHaveBeenCalled();
- expect(container.querySelector('.bamboo')).toBeTruthy();
- expect(container.querySelector('.bamboo-inner')!.textContent).toEqual('little');
-
- holder.parentNode?.removeChild(holder);
-
- errSpy.mockRestore();
- });
it('should apply custom styles to Descriptions', () => {
const customClassNames = {
root: 'custom-root',
diff --git a/components/slider/index.tsx b/components/slider/index.tsx
index da1048524a9e..2c994c55b887 100644
--- a/components/slider/index.tsx
+++ b/components/slider/index.tsx
@@ -71,21 +71,6 @@ export interface SliderBaseProps {
classNames?: SliderProps['classNames'];
onFocus?: React.FocusEventHandler;
onBlur?: React.FocusEventHandler;
-
- // Deprecated
- /** @deprecated `tooltipPrefixCls` is deprecated. Please use `tooltip.prefixCls` instead. */
- tooltipPrefixCls?: string;
- /** @deprecated `tipFormatter` is deprecated. Please use `tooltip.formatter` instead. */
- tipFormatter?: Formatter;
- /** @deprecated `tooltipVisible` is deprecated. Please use `tooltip.open` instead. */
- tooltipVisible?: boolean;
- /**
- * @deprecated `getTooltipPopupContainer` is deprecated. Please use `tooltip.getPopupContainer`
- * instead.
- */
- getTooltipPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;
- /** @deprecated `tooltipPlacement` is deprecated. Please use `tooltip.placement` instead. */
- tooltipPlacement?: TooltipPlacement;
}
export interface SliderSingleProps extends SliderBaseProps {
@@ -124,13 +109,10 @@ type SliderRange = Exclude, boolean>;
export type Opens = { [index: number]: boolean };
-function getTipFormatter(tipFormatter?: Formatter, legacyTipFormatter?: Formatter) {
+function getTipFormatter(tipFormatter?: Formatter) {
if (tipFormatter || tipFormatter === null) {
return tipFormatter;
}
- if (legacyTipFormatter || legacyTipFormatter === null) {
- return legacyTipFormatter;
- }
return (val?: number) => (typeof val === 'number' ? val.toString() : '');
}
@@ -143,11 +125,6 @@ const Slider = React.forwardRef
style,
disabled,
// Deprecated Props
- tooltipPrefixCls: legacyTooltipPrefixCls,
- tipFormatter: legacyTipFormatter,
- tooltipVisible: legacyTooltipVisible,
- getTooltipPopupContainer: legacyGetTooltipPopupContainer,
- tooltipPlacement: legacyTooltipPlacement,
tooltip = {},
onChangeComplete,
classNames: sliderClassNames,
@@ -188,10 +165,10 @@ const Slider = React.forwardRef
formatter: tipFormatter,
} = tooltipProps;
- const lockOpen = tooltipOpen ?? legacyTooltipVisible;
+ const lockOpen = tooltipOpen;
const activeOpen = (hoverOpen || focusOpen) && lockOpen !== false;
- const mergedTipFormatter = getTipFormatter(tipFormatter, legacyTipFormatter);
+ const mergedTipFormatter = getTipFormatter(tipFormatter);
// ============================= Change ==============================
const [dragging, setDragging] = useRafLock();
@@ -326,15 +303,13 @@ const Slider = React.forwardRef
return (
{cloneNode}
@@ -357,15 +332,13 @@ const Slider = React.forwardRef
return (
{cloneNode}