diff --git a/components/collapse/Collapse.tsx b/components/collapse/Collapse.tsx
index 9ad5c24594..141391504a 100644
--- a/components/collapse/Collapse.tsx
+++ b/components/collapse/Collapse.tsx
@@ -62,11 +62,13 @@ const Collapse: CollapseInterface = props => {
 
   const renderExpandIcon = (panelProps: PanelProps = {}) => {
     const { expandIcon } = props;
-    const icon = (expandIcon ? (
-      expandIcon(panelProps)
-    ) : (
-      <RightOutlined rotate={panelProps.isActive ? 90 : undefined} />
-    )) as React.ReactNode;
+    const icon = (
+      expandIcon ? (
+        expandIcon(panelProps)
+      ) : (
+        <RightOutlined rotate={panelProps.isActive ? 90 : undefined} />
+      )
+    ) as React.ReactNode;
 
     return cloneElement(icon, () => ({
       className: classNames((icon as any).props.className, `${prefixCls}-arrow`),
@@ -110,7 +112,6 @@ const Collapse: CollapseInterface = props => {
     <RcCollapse
       openMotion={openMotion}
       {...props}
-      bordered={bordered}
       expandIcon={renderExpandIcon}
       prefixCls={prefixCls}
       className={collapseClassName}
diff --git a/components/modal/Modal.tsx b/components/modal/Modal.tsx
index 4492b6c793..896890e207 100644
--- a/components/modal/Modal.tsx
+++ b/components/modal/Modal.tsx
@@ -72,7 +72,7 @@ export interface ModalProps {
   maskTransitionName?: string;
   transitionName?: string;
   className?: string;
-  getContainer?: string | HTMLElement | getContainerFunc | false | null;
+  getContainer?: string | HTMLElement | getContainerFunc | false;
   zIndex?: number;
   bodyStyle?: React.CSSProperties;
   maskStyle?: React.CSSProperties;
@@ -114,7 +114,7 @@ export interface ModalFuncProps {
   maskStyle?: React.CSSProperties;
   type?: 'info' | 'success' | 'error' | 'warn' | 'warning' | 'confirm';
   keyboard?: boolean;
-  getContainer?: string | HTMLElement | getContainerFunc | false | null;
+  getContainer?: string | HTMLElement | getContainerFunc | false;
   autoFocusButton?: null | 'ok' | 'cancel';
   transitionName?: string;
   maskTransitionName?: string;
@@ -136,9 +136,11 @@ interface ModalInterface extends React.FC<ModalProps> {
 }
 
 const Modal: ModalInterface = props => {
-  const { getPopupContainer: getContextPopupContainer, getPrefixCls, direction } = React.useContext(
-    ConfigContext,
-  );
+  const {
+    getPopupContainer: getContextPopupContainer,
+    getPrefixCls,
+    direction,
+  } = React.useContext(ConfigContext);
 
   const handleCancel = (e: React.MouseEvent<HTMLButtonElement>) => {
     const { onCancel } = props;
@@ -203,7 +205,9 @@ const Modal: ModalInterface = props => {
   return (
     <Dialog
       {...restProps}
-      getContainer={getContainer === undefined ? getContextPopupContainer : getContainer}
+      getContainer={
+        getContainer === undefined ? (getContextPopupContainer as getContainerFunc) : getContainer
+      }
       prefixCls={prefixCls}
       wrapClassName={wrapClassNameExtended}
       footer={footer === undefined ? defaultFooter : footer}
diff --git a/components/steps/index.tsx b/components/steps/index.tsx
index cbf7a0c49b..9e803cde13 100644
--- a/components/steps/index.tsx
+++ b/components/steps/index.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import omit from 'rc-util/lib/omit';
 import RcSteps from 'rc-steps';
+import type { ProgressDotRender } from 'rc-steps/lib/Steps';
 import CheckOutlined from '@ant-design/icons/CheckOutlined';
 import CloseOutlined from '@ant-design/icons/CloseOutlined';
 import classNames from 'classnames';
@@ -17,7 +18,7 @@ export interface StepsProps {
   initial?: number;
   labelPlacement?: 'horizontal' | 'vertical';
   prefixCls?: string;
-  progressDot?: boolean | Function;
+  progressDot?: boolean | ProgressDotRender;
   responsive?: boolean;
   size?: 'default' | 'small';
   status?: 'wait' | 'process' | 'finish' | 'error';
@@ -39,7 +40,7 @@ export interface StepProps {
 }
 
 interface StepsType extends React.FC<StepsProps> {
-  Step: React.ClassicComponentClass<StepProps>;
+  Step: typeof RcSteps.Step;
 }
 
 const Steps: StepsType = props => {
@@ -47,10 +48,10 @@ const Steps: StepsType = props => {
   const { xs } = useBreakpoint();
   const { getPrefixCls, direction: rtlDirection } = React.useContext(ConfigContext);
 
-  const getDirection = React.useCallback(() => (responsive && xs ? 'vertical' : direction), [
-    xs,
-    direction,
-  ]);
+  const getDirection = React.useCallback(
+    () => (responsive && xs ? 'vertical' : direction),
+    [xs, direction],
+  );
 
   const prefixCls = getPrefixCls('steps', props.prefixCls);
   const iconPrefix = getPrefixCls('', props.iconPrefix);
diff --git a/components/tree/DirectoryTree.tsx b/components/tree/DirectoryTree.tsx
index 3ec9b6ff46..0c053cc2b1 100644
--- a/components/tree/DirectoryTree.tsx
+++ b/components/tree/DirectoryTree.tsx
@@ -59,7 +59,7 @@ const DirectoryTree: React.ForwardRefRenderFunction<RcTree, DirectoryTreeProps>
       initExpandedKeys = Object.keys(keyEntities);
     } else if (defaultExpandParent) {
       initExpandedKeys = conductExpandParent(
-        props.expandedKeys || defaultExpandedKeys,
+        props.expandedKeys || defaultExpandedKeys || [],
         keyEntities,
       );
     } else {
diff --git a/package.json b/package.json
index 2fbfa348de..02013d85f4 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "rc-cascader": "~1.4.0",
     "rc-checkbox": "~2.3.0",
     "rc-collapse": "~3.1.0",
-    "rc-dialog": "~8.5.1",
+    "rc-dialog": "~8.6.0",
     "rc-drawer": "~4.3.0",
     "rc-dropdown": "~3.2.0",
     "rc-field-form": "~1.20.0",
@@ -236,8 +236,6 @@
     "pretty-quick": "^3.0.0",
     "querystring": "^0.2.0",
     "rc-footer": "^0.6.6",
-    "rc-queue-anim": "^1.6.12",
-    "rc-scroll-anim": "^2.5.8",
     "rc-tween-one": "^2.4.1",
     "rc-virtual-list": "^3.2.4",
     "react": "^17.0.1",
diff --git a/typings/custom-typings.d.ts b/typings/custom-typings.d.ts
index 6a204cd51b..d586d4e7b0 100644
--- a/typings/custom-typings.d.ts
+++ b/typings/custom-typings.d.ts
@@ -18,32 +18,12 @@ declare module 'jsonml.js/*';
 
 declare module 'rc-pagination/*';
 
-declare module 'rc-animate*';
-
 declare module 'rc-util*';
 
-declare module '@ant-design/css-animation*';
-
 declare module 'rc-checkbox';
 
-declare module 'rc-radio';
-
-declare module 'rc-editor-mention';
-
-declare module 'rc-tabs*';
-
-declare module 'rc-tree/lib/util';
-
-declare module 'rc-collapse';
-
-declare module 'rc-dialog';
-
 declare module 'rc-rate';
 
-declare module 'rc-queue-anim';
-
-declare module 'rc-steps';
-
 declare module 'rc-switch';
 
 declare module '*.json' {