fix: Trigger popupMotion leavedClassName order (#219)

* fix: Order * fix: Trigger leaved motion name order
react-component · Nov 9, 2020 · caf84b4 · caf84b4
1 parent 512e8c4
commit caf84b4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Popup/PopupInner.tsx b/src/Popup/PopupInner.tsx
@@ -134,7 +134,7 @@ const PopupInner = React.forwardRef<PopupInnerRef, PopupInnerProps>(
 
     // ======================== Motion ========================
     const motion = { ...getMotion(props) };
-    ['onAppearEnd', 'onEnterEnd', 'onLeaveEnd'].forEach((eventName) => {
+    ['onAppearEnd', 'onEnterEnd', 'onLeaveEnd'].forEach(eventName => {
       const originHandler: MotionEndEventHandler = motion[eventName];
       motion[eventName] = (element, event) => {
         goNextStatus();
@@ -143,7 +143,7 @@ const PopupInner = React.forwardRef<PopupInnerRef, PopupInnerProps>(
     });
 
     function onShowPrepare() {
-      return new Promise((resolve) => {
+      return new Promise(resolve => {
         prepareResolveRef.current = resolve;
       });
     }
@@ -188,11 +188,11 @@ const PopupInner = React.forwardRef<PopupInnerRef, PopupInnerProps>(
       <CSSMotion
         visible={visible}
         ref={elementRef}
+        leavedClassName={`${prefixCls}-hidden`}
         {...motion}
         onAppearPrepare={onShowPrepare}
         onEnterPrepare={onShowPrepare}
         removeOnLeave={destroyPopupOnHide}
-        leavedClassName={`${prefixCls}-hidden`}
       >
         {({ className: motionClassName, style: motionStyle }, motionRef) => {
           const mergedClassName = classNames(

diff --git a/tests/motion.test.jsx b/tests/motion.test.jsx
@@ -28,5 +28,29 @@ describe('Trigger.Motion', () => {
 
     wrapper.trigger();
     expect(wrapper.getPopupInner().hasClass('bamboo-appear')).toBeTruthy();
+
+    wrapper.unmount();
+  });
+
+  it('use correct leave motion', () => {
+    const wrapper = mount(
+      <Trigger
+        action={['click']}
+        popupAlign={placementAlignMap.left}
+        popup={<strong className="x-content" />}
+        popupMotion={{
+          motionName: 'bamboo',
+          leavedClassName: 'light',
+        }}
+      >
+        <div className="target">click</div>
+      </Trigger>,
+    );
+
+    wrapper.trigger();
+
+    expect(wrapper.find('CSSMotion').props().leavedClassName).toEqual('light');
+
+    wrapper.unmount();
   });
 });