refactor: Remove deprecated motion-related utility functions and props

Author: aojunhao123

src/index.tsx

@@ -20,13 +20,11 @@ import useWinClick from './hooks/useWinClick';
 import type {
   ActionType,
   AlignType,
-  AnimationType,
   ArrowPos,
   ArrowTypeOuter,
   BuildInPlacements,
-  TransitionNameType,
 } from './interface';
-import { getAlignPopupClassName, getMotion } from './util';
+import { getAlignPopupClassName } from './util';
 
 export type {
   ActionType,
@@ -82,15 +80,6 @@ export interface TriggerProps {
   /** Set mask motion. You can ref `rc-motion` for more info. */
   maskMotion?: CSSMotionProps;
 
-  /** @deprecated Please us `popupMotion` instead. */
-  popupTransitionName?: TransitionNameType;
-  /** @deprecated Please us `popupMotion` instead. */
-  popupAnimation?: AnimationType;
-  /** @deprecated Please us `maskMotion` instead. */
-  maskTransitionName?: TransitionNameType;
-  /** @deprecated Please us `maskMotion` instead. */
-  maskAnimation?: AnimationType;
-
   // ==================== Delay ====================
   mouseEnterDelay?: number;
   mouseLeaveDelay?: number;
@@ -192,10 +181,6 @@ export function generateTrigger(
       // Motion
       popupMotion,
       maskMotion,
-      popupTransitionName,
-      popupAnimation,
-      maskTransitionName,
-      maskAnimation,
 
       // Private
       getTriggerDOMNode,
@@ -278,21 +263,6 @@ export function generateTrigger(
       );
     });
 
-    // =========================== Motion ===========================
-    const mergePopupMotion = getMotion(
-      prefixCls,
-      popupMotion,
-      popupAnimation,
-      popupTransitionName,
-    );
-
-    const mergeMaskMotion = getMotion(
-      prefixCls,
-      maskMotion,
-      maskAnimation,
-      maskTransitionName,
-    );
-
     // ============================ Open ============================
     const [internalOpen, setInternalOpen] = React.useState(
       defaultPopupVisible || false,
@@ -710,8 +680,8 @@ export function generateTrigger(
             // Mask
             mask={mask}
             // Motion
-            motion={mergePopupMotion}
-            maskMotion={mergeMaskMotion}
+            motion={popupMotion}
+            maskMotion={maskMotion}
             onVisibleChanged={onVisibleChanged}
             onPrepare={onPrepare}
             // Portal

src/util.ts

@@ -39,32 +39,6 @@ export function getAlignPopupClassName(
   return '';
 }
 
-/** @deprecated We should not use this if we can refactor all deps */
-export function getMotion(
-  prefixCls: string,
-  motion: CSSMotionProps,
-  animation: AnimationType,
-  transitionName: TransitionNameType,
-): CSSMotionProps {
-  if (motion) {
-    return motion;
-  }
-
-  if (animation) {
-    return {
-      motionName: `${prefixCls}-${animation}`,
-    };
-  }
-
-  if (transitionName) {
-    return {
-      motionName: transitionName,
-    };
-  }
-
-  return null;
-}
-
 export function getWin(ele: HTMLElement) {
   return ele.ownerDocument.defaultView;
 }

tests/mask.test.jsx

@@ -21,7 +21,9 @@ describe('Trigger.Mask', () => {
         popupAlign={placementAlignMap.left}
         popup={<strong className="x-content" />}
         mask
-        maskTransitionName="bamboo"
+        maskMotion={{
+          motionName: 'bamboo',
+        }}
       >
         <div className="target">click</div>
       </Trigger>,