From 119d525400caedec8fc59d66099fd74349519b6b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 5 Mar 2021 21:02:28 +0800
Subject: [PATCH] fix: afterClose unexpected call when mount dialog (#244)

close https://github.com/ant-design/ant-design/issues/29009
---
 src/Dialog/index.tsx |  9 ++++---
 tests/index.spec.tsx | 61 +++++++++++++++++++++++++++++++-------------
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/Dialog/index.tsx b/src/Dialog/index.tsx
index 8e23b1c0..738661f3 100644
--- a/src/Dialog/index.tsx
+++ b/src/Dialog/index.tsx
@@ -15,7 +15,7 @@ export type IDialogChildProps = {
   // TODO: refactor to remove this.
   getOpenCount: () => number;
   scrollLocker?: ScollLocker;
-} & IDialogPropTypes
+} & IDialogPropTypes;
 
 export default function Dialog(props: IDialogChildProps) {
   const {
@@ -81,7 +81,10 @@ export default function Dialog(props: IDialogChildProps) {
         lastOutSideActiveElementRef.current = null;
       }
 
-      afterClose?.();
+      // Trigger afterClose only when change visible from true to false
+      if (animatedVisible) {
+        afterClose?.();
+      }
     }
   }
 
@@ -91,7 +94,7 @@ export default function Dialog(props: IDialogChildProps) {
 
   // >>> Content
   const contentClickRef = useRef(false);
-  const contentTimeoutRef = useRef<number>();
+  const contentTimeoutRef = useRef<NodeJS.Timeout>();
 
   // We need record content click incase content popup out of dialog
   const onContentMouseDown: React.MouseEventHandler = () => {
diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx
index 099d0091..2f1c3d5b 100644
--- a/tests/index.spec.tsx
+++ b/tests/index.spec.tsx
@@ -1,10 +1,12 @@
 /* eslint-disable react/no-render-return-value, max-classes-per-file, func-names, no-console */
 import React, { cloneElement } from 'react';
 import { act } from 'react-dom/test-utils';
-import { mount, ReactWrapper } from 'enzyme';
+import type { ReactWrapper } from 'enzyme';
+import { mount } from 'enzyme';
 import Portal from 'rc-util/lib/Portal';
 import KeyCode from 'rc-util/lib/KeyCode';
-import Dialog, { DialogProps } from '../src';
+import type { DialogProps } from '../src';
+import Dialog from '../src';
 
 describe('dialog', () => {
   beforeEach(() => {
@@ -250,10 +252,7 @@ describe('dialog', () => {
     });
 
     expect(
-      (wrapper
-        .find('.rc-dialog')
-        .at(0)
-        .getDOMNode() as HTMLDivElement).style['transform-origin'],
+      (wrapper.find('.rc-dialog').at(0).getDOMNode() as HTMLDivElement).style['transform-origin'],
     ).toBeTruthy();
   });
 
@@ -295,18 +294,6 @@ describe('dialog', () => {
     expect(onClose).not.toHaveBeenCalled();
   });
 
-  it('afterClose', () => {
-    const afterClose = jest.fn();
-
-    const wrapper = mount(<Dialog afterClose={afterClose} visible />);
-    jest.runAllTimers();
-
-    wrapper.setProps({ visible: false });
-    jest.runAllTimers();
-
-    expect(afterClose).toHaveBeenCalledTimes(1);
-  });
-
   it('zIndex', () => {
     const wrapper = mount(<Dialog visible zIndex={903} />);
     expect(wrapper.find('.rc-dialog-wrap').props().style.zIndex).toBe(903);
@@ -397,4 +384,42 @@ describe('dialog', () => {
       expect(getRenderTimes()).toEqual(2);
     });
   });
+
+  describe('afterClose', () => {
+    it('should trigger afterClose when set visible to false', () => {
+      const afterClose = jest.fn();
+
+      const wrapper = mount(<Dialog afterClose={afterClose} visible />);
+      jest.runAllTimers();
+
+      wrapper.setProps({ visible: false });
+      jest.runAllTimers();
+
+      expect(afterClose).toHaveBeenCalledTimes(1);
+    });
+
+    it('should not trigger afterClose when mount dialog of getContainer={false}', () => {
+      const afterClose = jest.fn();
+
+      const wrapper = mount(<Dialog afterClose={afterClose} getContainer={false} />);
+      jest.runAllTimers();
+
+      wrapper.setProps({ visible: false });
+      jest.runAllTimers();
+
+      expect(afterClose).toHaveBeenCalledTimes(0);
+    });
+
+    it('should not trigger afterClose when mount dialog of forceRender={true}', () => {
+      const afterClose = jest.fn();
+
+      const wrapper = mount(<Dialog afterClose={afterClose} forceRender />);
+      jest.runAllTimers();
+
+      wrapper.setProps({ visible: false });
+      jest.runAllTimers();
+
+      expect(afterClose).toHaveBeenCalledTimes(0);
+    });
+  });
 });