should not call afterClose when change visible from false to true

ashearer · Jan 10, 2019 · 13ee0ad · 13ee0ad
1 parent 41e2103
commit 13ee0ad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/components/tag/__tests__/index.test.js b/components/tag/__tests__/index.test.js
@@ -35,6 +35,18 @@ describe('Tag', () => {
     expect(wrapper.find('div.ant-tag:not(.ant-tag-hidden)').length).toBe(1);
   });
 
+  it('should not call afterClose when change visible from false to true', () => {
+    const handleAfterClose = jest.fn();
+    const wrapper = mount(<Tag visible afterClose={handleAfterClose} />);
+    wrapper.setProps({ visible: false });
+    jest.runAllTimers();
+    expect(handleAfterClose).toHaveBeenCalled();
+    handleAfterClose.mockRestore();
+    wrapper.setProps({ visible: true });
+    jest.runAllTimers();
+    expect(handleAfterClose).not.toHaveBeenCalled();
+  });
+
   describe('visibility', () => {
     it('can be controlled by visible with visible as initial value', () => {
       const wrapper = mount(<Tag visible />);

diff --git a/components/tag/index.tsx b/components/tag/index.tsx
@@ -70,10 +70,12 @@ class Tag extends React.Component<TagProps, TagState> {
     this.setVisible(false, e);
   };
 
-  animationEnd = () => {
-    const { afterClose } = this.props;
-    if (afterClose) {
-      afterClose();
+  animationEnd = (_: string, existed: boolean) => {
+    if (!existed) {
+      const { afterClose } = this.props;
+      if (afterClose) {
+        afterClose();
+      }
     }
   };