fix: page scroll position will jump after dialog is closed (#202)

close ant-design/ant-design#26528

Author: afc163

src/Dialog.tsx

@@ -106,7 +106,8 @@ export default class Dialog extends React.Component<IDialogChildProps, any> {
   }
 
   componentDidUpdate(prevProps: IDialogPropTypes) {
-    const { visible, mask, focusTriggerAfterClose, mousePosition } = this.props;
+    const { visible, mousePosition } = this.props;
+
     if (visible) {
       // first show
       if (!prevProps.visible) {
@@ -127,14 +128,6 @@ export default class Dialog extends React.Component<IDialogChildProps, any> {
       }
     } else if (prevProps.visible) {
       this.inTransition = true;
-      if (mask && this.lastOutSideFocusNode && focusTriggerAfterClose) {
-        try {
-          this.lastOutSideFocusNode.focus();
-        } catch (e) {
-          this.lastOutSideFocusNode = null;
-        }
-        this.lastOutSideFocusNode = null;
-      }
     }
   }
 
@@ -154,7 +147,7 @@ export default class Dialog extends React.Component<IDialogChildProps, any> {
   }
 
   onAnimateLeave = () => {
-    const { afterClose, getOpenCount } = this.props;
+    const { afterClose, getOpenCount, focusTriggerAfterClose, mask } = this.props;
     // need demo?
     // https://github.com/react-component/dialog/pull/28
     if (this.wrap) {
@@ -166,6 +159,14 @@ export default class Dialog extends React.Component<IDialogChildProps, any> {
     if (!getOpenCount()) {
       this.switchScrollingEffect();
     }
+    if (mask && this.lastOutSideFocusNode && focusTriggerAfterClose) {
+      try {
+        this.lastOutSideFocusNode.focus();
+      } catch (e) {
+        this.lastOutSideFocusNode = null;
+      }
+      this.lastOutSideFocusNode = null;
+    }
     if (afterClose) {
       afterClose();
     }