diff --git a/components/modal/ActionButton.tsx b/components/modal/ActionButton.tsx
index 05e27d624533..24116616cbac 100644
--- a/components/modal/ActionButton.tsx
+++ b/components/modal/ActionButton.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 import Button from '../button';
 import { LegacyButtonType, ButtonProps, convertLegacyProps } from '../button/button';
 
@@ -11,40 +10,34 @@ export interface ActionButtonProps {
   buttonProps?: ButtonProps;
 }
 
-export interface ActionButtonState {
-  loading: ButtonProps['loading'];
-}
-
-export default class ActionButton extends React.Component<ActionButtonProps, ActionButtonState> {
-  timeoutId: number;
-
-  clicked: boolean;
+const ActionButton: React.FC<ActionButtonProps> = props => {
+  const clickedRef = React.useRef<boolean>(false);
+  const ref = React.useRef<any>();
+  const [loading, setLoading] = React.useState<ButtonProps['loading']>(false);
 
-  state = {
-    loading: false,
-  };
-
-  componentDidMount() {
-    if (this.props.autoFocus) {
-      const $this = ReactDOM.findDOMNode(this) as HTMLInputElement;
-      this.timeoutId = setTimeout(() => $this.focus());
+  React.useEffect(() => {
+    let timeoutId: number;
+    if (props.autoFocus) {
+      const $this = ref.current as HTMLInputElement;
+      timeoutId = setTimeout(() => $this.focus());
     }
-  }
-
-  componentWillUnmount() {
-    clearTimeout(this.timeoutId);
-  }
+    return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    };
+  }, []);
 
-  handlePromiseOnOk(returnValueOfOnOk?: PromiseLike<any>) {
-    const { closeModal } = this.props;
+  const handlePromiseOnOk = (returnValueOfOnOk?: PromiseLike<any>) => {
+    const { closeModal } = props;
     if (!returnValueOfOnOk || !returnValueOfOnOk.then) {
       return;
     }
-    this.setState({ loading: true });
+    setLoading(true);
     returnValueOfOnOk.then(
       (...args: any[]) => {
         // It's unnecessary to set loading=false, for the Modal will be unmounted after close.
-        // this.setState({ loading: false });
+        // setState({ loading: false });
         closeModal(...args);
       },
       (e: Error) => {
@@ -52,18 +45,18 @@ export default class ActionButton extends React.Component<ActionButtonProps, Act
         // eslint-disable-next-line no-console
         console.error(e);
         // See: https://github.com/ant-design/ant-design/issues/6183
-        this.setState({ loading: false });
-        this.clicked = false;
+        setLoading(false);
+        clickedRef.current = false;
       },
     );
-  }
+  };
 
-  onClick = () => {
-    const { actionFn, closeModal } = this.props;
-    if (this.clicked) {
+  const onClick = () => {
+    const { actionFn, closeModal } = props;
+    if (clickedRef.current) {
       return;
     }
-    this.clicked = true;
+    clickedRef.current = true;
     if (!actionFn) {
       closeModal();
       return;
@@ -72,7 +65,7 @@ export default class ActionButton extends React.Component<ActionButtonProps, Act
     if (actionFn.length) {
       returnValueOfOnOk = actionFn(closeModal);
       // https://github.com/ant-design/ant-design/issues/23358
-      this.clicked = false;
+      clickedRef.current = false;
     } else {
       returnValueOfOnOk = actionFn();
       if (!returnValueOfOnOk) {
@@ -80,21 +73,21 @@ export default class ActionButton extends React.Component<ActionButtonProps, Act
         return;
       }
     }
-    this.handlePromiseOnOk(returnValueOfOnOk);
+    handlePromiseOnOk(returnValueOfOnOk);
   };
 
-  render() {
-    const { type, children, buttonProps } = this.props;
-    const { loading } = this.state;
-    return (
-      <Button
-        {...convertLegacyProps(type)}
-        onClick={this.onClick}
-        loading={loading}
-        {...buttonProps}
-      >
-        {children}
-      </Button>
-    );
-  }
-}
+  const { type, children, buttonProps } = props;
+  return (
+    <Button
+      {...convertLegacyProps(type)}
+      onClick={onClick}
+      loading={loading}
+      {...buttonProps}
+      ref={ref}
+    >
+      {children}
+    </Button>
+  );
+};
+
+export default ActionButton;
diff --git a/components/modal/Modal.tsx b/components/modal/Modal.tsx
index 9adebe5ab010..c62b5de63612 100644
--- a/components/modal/Modal.tsx
+++ b/components/modal/Modal.tsx
@@ -9,7 +9,7 @@ import { getConfirmLocale } from './locale';
 import Button from '../button';
 import { LegacyButtonType, ButtonProps, convertLegacyProps } from '../button/button';
 import LocaleReceiver from '../locale-provider/LocaleReceiver';
-import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
+import { ConfigContext } from '../config-provider';
 
 let mousePosition: { x: number; y: number } | null;
 export const destroyFns: Array<() => void> = [];
@@ -119,46 +119,41 @@ export interface ModalLocale {
   justOkText: string;
 }
 
-export default class Modal extends React.Component<ModalProps, {}> {
-  static destroyAll: () => void;
-
-  static useModal = useModal;
+interface ModalInterface extends React.FC<ModalProps> {
+  useModal: typeof useModal;
+}
 
-  static defaultProps = {
-    width: 520,
-    transitionName: 'zoom',
-    maskTransitionName: 'fade',
-    confirmLoading: false,
-    visible: false,
-    okType: 'primary' as LegacyButtonType,
-  };
+const Modal: ModalInterface = props => {
+  const { getPopupContainer: getContextPopupContainer, getPrefixCls, direction } = React.useContext(
+    ConfigContext,
+  );
 
-  handleCancel = (e: React.MouseEvent<HTMLButtonElement>) => {
-    const { onCancel } = this.props;
+  const handleCancel = (e: React.MouseEvent<HTMLButtonElement>) => {
+    const { onCancel } = props;
     if (onCancel) {
       onCancel(e);
     }
   };
 
-  handleOk = (e: React.MouseEvent<HTMLButtonElement>) => {
-    const { onOk } = this.props;
+  const handleOk = (e: React.MouseEvent<HTMLButtonElement>) => {
+    const { onOk } = props;
     if (onOk) {
       onOk(e);
     }
   };
 
-  renderFooter = (locale: ModalLocale) => {
-    const { okText, okType, cancelText, confirmLoading } = this.props;
+  const renderFooter = (locale: ModalLocale) => {
+    const { okText, okType, cancelText, confirmLoading } = props;
     return (
       <>
-        <Button onClick={this.handleCancel} {...this.props.cancelButtonProps}>
+        <Button onClick={handleCancel} {...props.cancelButtonProps}>
           {cancelText || locale.cancelText}
         </Button>
         <Button
           {...convertLegacyProps(okType)}
           loading={confirmLoading}
-          onClick={this.handleOk}
-          {...this.props.okButtonProps}
+          onClick={handleOk}
+          {...props.okButtonProps}
         >
           {okText || locale.okText}
         </Button>
@@ -166,54 +161,58 @@ export default class Modal extends React.Component<ModalProps, {}> {
     );
   };
 
-  renderModal = ({
-    getPopupContainer: getContextPopupContainer,
-    getPrefixCls,
-    direction,
-  }: ConfigConsumerProps) => {
-    const {
-      prefixCls: customizePrefixCls,
-      footer,
-      visible,
-      wrapClassName,
-      centered,
-      getContainer,
-      closeIcon,
-      ...restProps
-    } = this.props;
-
-    const prefixCls = getPrefixCls('modal', customizePrefixCls);
-    const defaultFooter = (
-      <LocaleReceiver componentName="Modal" defaultLocale={getConfirmLocale()}>
-        {this.renderFooter}
-      </LocaleReceiver>
-    );
+  const {
+    prefixCls: customizePrefixCls,
+    footer,
+    visible,
+    wrapClassName,
+    centered,
+    getContainer,
+    closeIcon,
+    ...restProps
+  } = props;
+
+  const prefixCls = getPrefixCls('modal', customizePrefixCls);
+  const defaultFooter = (
+    <LocaleReceiver componentName="Modal" defaultLocale={getConfirmLocale()}>
+      {renderFooter}
+    </LocaleReceiver>
+  );
+
+  const closeIconToRender = (
+    <span className={`${prefixCls}-close-x`}>
+      {closeIcon || <CloseOutlined className={`${prefixCls}-close-icon`} />}
+    </span>
+  );
+
+  const wrapClassNameExtended = classNames(wrapClassName, {
+    [`${prefixCls}-centered`]: !!centered,
+    [`${prefixCls}-wrap-rtl`]: direction === 'rtl',
+  });
+  return (
+    <Dialog
+      {...restProps}
+      getContainer={getContainer === undefined ? getContextPopupContainer : getContainer}
+      prefixCls={prefixCls}
+      wrapClassName={wrapClassNameExtended}
+      footer={footer === undefined ? defaultFooter : footer}
+      visible={visible}
+      mousePosition={mousePosition}
+      onClose={handleCancel}
+      closeIcon={closeIconToRender}
+    />
+  );
+};
 
-    const closeIconToRender = (
-      <span className={`${prefixCls}-close-x`}>
-        {closeIcon || <CloseOutlined className={`${prefixCls}-close-icon`} />}
-      </span>
-    );
-    const wrapClassNameExtended = classNames(wrapClassName, {
-      [`${prefixCls}-centered`]: !!centered,
-      [`${prefixCls}-wrap-rtl`]: direction === 'rtl',
-    });
-    return (
-      <Dialog
-        {...restProps}
-        getContainer={getContainer === undefined ? getContextPopupContainer : getContainer}
-        prefixCls={prefixCls}
-        wrapClassName={wrapClassNameExtended}
-        footer={footer === undefined ? defaultFooter : footer}
-        visible={visible}
-        mousePosition={mousePosition}
-        onClose={this.handleCancel}
-        closeIcon={closeIconToRender}
-      />
-    );
-  };
+Modal.useModal = useModal;
 
-  render() {
-    return <ConfigConsumer>{this.renderModal}</ConfigConsumer>;
-  }
-}
+Modal.defaultProps = {
+  width: 520,
+  transitionName: 'zoom',
+  maskTransitionName: 'fade',
+  confirmLoading: false,
+  visible: false,
+  okType: 'primary' as LegacyButtonType,
+};
+
+export default Modal;
diff --git a/components/modal/__tests__/Modal.test.js b/components/modal/__tests__/Modal.test.js
index 9ec5562fa667..9902c13dceeb 100644
--- a/components/modal/__tests__/Modal.test.js
+++ b/components/modal/__tests__/Modal.test.js
@@ -52,15 +52,15 @@ describe('Modal', () => {
 
   it('onCancel should be called', () => {
     const onCancel = jest.fn();
-    const wrapper = mount(<Modal onCancel={onCancel} />).instance();
-    wrapper.handleCancel();
+    const wrapper = mount(<Modal visible onCancel={onCancel} />);
+    wrapper.find('.ant-btn').first().simulate('click');
     expect(onCancel).toHaveBeenCalled();
   });
 
   it('onOk should be called', () => {
     const onOk = jest.fn();
-    const wrapper = mount(<Modal onOk={onOk} />).instance();
-    wrapper.handleOk();
+    const wrapper = mount(<Modal visible onOk={onOk} />);
+    wrapper.find('.ant-btn').last().simulate('click');
     expect(onOk).toHaveBeenCalled();
   });
 
diff --git a/components/modal/index.tsx b/components/modal/index.tsx
index abaef9cfe382..f6adae2ec379 100644
--- a/components/modal/index.tsx
+++ b/components/modal/index.tsx
@@ -15,7 +15,7 @@ function modalWarn(props: ModalFuncProps) {
   return confirm(withWarn(props));
 }
 
-type Modal = typeof OriginModal & ModalStaticFunctions;
+type Modal = typeof OriginModal & ModalStaticFunctions & { destroyAll: () => void };
 const Modal = OriginModal as Modal;
 
 Modal.info = function infoFn(props: ModalFuncProps) {