Merge a2ab585 into 646efc7

Author: acyza

src/Dialog/index.tsx

@@ -48,6 +48,7 @@ export default function Dialog(props: IDialogPropTypes) {
   const contentRef = useRef<ContentRef>();
 
   const [animatedVisible, setAnimatedVisible] = React.useState(visible);
+  const [originFocusEl, setOriginFocusEl] = React.useState<HTMLElement>();
 
   // ========================== Init ==========================
   const ariaId = useId();
@@ -59,7 +60,11 @@ export default function Dialog(props: IDialogPropTypes) {
   }
 
   function focusDialogContent() {
-    if (!contains(wrapperRef.current, document.activeElement)) {
+    if (originFocusEl) {
+      originFocusEl.focus();
+    } else if (contains(wrapperRef.current, document.activeElement)) {
+      setOriginFocusEl(document.activeElement as HTMLElement);
+    } else {
       contentRef.current?.focus();
     }
   }

src/DialogWrap.tsx

@@ -1,7 +1,8 @@
-import * as React from 'react';
 import Portal from '@rc-component/portal';
+import * as React from 'react';
 import Dialog from './Dialog';
 import type { IDialogPropTypes } from './IDialogPropTypes';
+import { isNil } from './util';
 
 // fix issue #10656
 /*
@@ -41,7 +42,7 @@ const DialogWrap: React.FC<IDialogPropTypes> = (props: IDialogPropTypes) => {
     <Portal
       open={visible || forceRender || animatedVisible}
       autoDestroy={false}
-      getContainer={getContainer}
+      getContainer={isNil(getContainer) ? 'body' : getContainer}
       autoLock={visible || animatedVisible}
     >
       <Dialog

src/util.ts

@@ -37,3 +37,7 @@ export function offset(el: Element) {
   pos.top += getScroll(w, true);
   return pos;
 }
+
+export function isNil(val: any) {
+  return val === undefined || val === null;
+}

tests/index.spec.tsx

@@ -222,8 +222,7 @@ describe('dialog', () => {
     expect(wrapper.find('.rc-dialog-footer').text()).toBe('test');
   });
 
-  // 失效了，需要修复
-  it.skip('support input autoFocus', () => {
+  it('support input autoFocus', () => {
     render(
       <Dialog visible>
         <input autoFocus />