Skip to content

Commit eac4b9b

Browse files
committed
refactor: Remove deprecated props and related code
1 parent a53c077 commit eac4b9b

File tree

2 files changed

+1
-77
lines changed

2 files changed

+1
-77
lines changed

src/index.tsx

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ export interface TriggerProps {
7272
forceRender?: boolean;
7373
autoDestroy?: boolean;
7474

75-
/** @deprecated Please use `autoDestroy` instead */
76-
destroyPopupOnHide?: boolean;
77-
7875
// ==================== Mask =====================
7976
mask?: boolean;
8077
maskClosable?: boolean;
@@ -123,10 +120,6 @@ export interface TriggerProps {
123120
// ==================== Arrow ====================
124121
arrow?: boolean | ArrowTypeOuter;
125122

126-
// ================= Deprecated ==================
127-
/** @deprecated Add `className` on `children`. Please add `className` directly instead. */
128-
className?: string;
129-
130123
// =================== Private ===================
131124
/**
132125
* @private Get trigger DOM node.
@@ -174,7 +167,6 @@ export function generateTrigger(
174167
getPopupContainer,
175168
forceRender,
176169
autoDestroy,
177-
destroyPopupOnHide,
178170

179171
// Popup
180172
popup,
@@ -205,16 +197,13 @@ export function generateTrigger(
205197
maskTransitionName,
206198
maskAnimation,
207199

208-
// Deprecated
209-
className,
210-
211200
// Private
212201
getTriggerDOMNode,
213202

214203
...restProps
215204
} = props;
216205

217-
const mergedAutoDestroy = autoDestroy || destroyPopupOnHide || false;
206+
const mergedAutoDestroy = autoDestroy || false;
218207

219208
// =========================== Mobile ===========================
220209
const [mobile, setMobile] = React.useState(false);
@@ -639,11 +628,6 @@ export function generateTrigger(
639628
};
640629
}
641630

642-
// ========================= ClassName ==========================
643-
if (className) {
644-
cloneProps.className = classNames(originChildProps.className, className);
645-
}
646-
647631
// =========================== Render ===========================
648632
const mergedChildrenProps = {
649633
...originChildProps,

tests/basic.test.jsx

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -384,25 +384,6 @@ describe('Trigger.Basic', () => {
384384
trigger(container, '.target');
385385
expect(document.querySelector('.rc-trigger-popup-hidden')).toBeTruthy();
386386
});
387-
388-
it('set true will destroy tooltip on hide', () => {
389-
const { container } = render(
390-
<Trigger
391-
action={['click']}
392-
destroyPopupOnHide
393-
popupAlign={placementAlignMap.topRight}
394-
popup={<strong>trigger</strong>}
395-
>
396-
<div className="target">click</div>
397-
</Trigger>,
398-
);
399-
400-
trigger(container, '.target');
401-
expect(document.querySelector('.rc-trigger-popup')).toBeTruthy();
402-
403-
trigger(container, '.target');
404-
expect(document.querySelector('.rc-trigger-popup')).toBeFalsy();
405-
});
406387
});
407388

408389
describe('support autoDestroy', () => {
@@ -603,47 +584,6 @@ describe('Trigger.Basic', () => {
603584
expect(container.querySelector('div')).not.toHaveAttribute('class');
604585
});
605586

606-
it('support className', () => {
607-
const { container } = render(
608-
<Trigger
609-
action={['click']}
610-
popupAlign={placementAlignMap.left}
611-
popup={<strong className="x-content">tooltip2</strong>}
612-
className="className-in-trigger"
613-
>
614-
<div className="target">click</div>
615-
</Trigger>,
616-
);
617-
618-
expect(container.querySelector('div')).toHaveClass(
619-
'target className-in-trigger',
620-
);
621-
});
622-
623-
it('support className in nested Trigger', () => {
624-
const { container } = render(
625-
<Trigger
626-
action={['click']}
627-
popupAlign={placementAlignMap.left}
628-
popup={<strong className="x-content">tooltip2</strong>}
629-
className="className-in-trigger-2"
630-
>
631-
<Trigger
632-
action={['click']}
633-
popupAlign={placementAlignMap.left}
634-
popup={<strong className="x-content">tooltip2</strong>}
635-
className="className-in-trigger-1"
636-
>
637-
<div className="target">click</div>
638-
</Trigger>
639-
</Trigger>,
640-
);
641-
642-
expect(container.querySelector('div').className).toBe(
643-
'target className-in-trigger-1 className-in-trigger-2',
644-
);
645-
});
646-
647587
it('support function component', () => {
648588
const NoRef = React.forwardRef((props, ref) => {
649589
React.useImperativeHandle(ref, () => null);

0 commit comments

Comments
 (0)