From 9eae13a968ca8af577a98c06044064aea430a0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Wed, 20 Apr 2022 15:26:18 +0800
Subject: [PATCH 1/6] fix: breadcrumb shows the number (#35123)

---
 components/breadcrumb/style/index.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/breadcrumb/style/index.less b/components/breadcrumb/style/index.less
index f6a67aa2d8..7f569bb7f0 100644
--- a/components/breadcrumb/style/index.less
+++ b/components/breadcrumb/style/index.less
@@ -16,6 +16,7 @@
   ol {
     display: flex;
     flex-wrap: wrap;
+    list-style: none;
   }
 
   a {

From 4de07ad1021aeeabe4e1d5e8c5ed4bb99fd8a296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Wed, 20 Apr 2022 17:56:11 +0800
Subject: [PATCH 2/6] docs: Add deprecated usage (#35128)

---
 .../__snapshots__/demo-extend.test.ts.snap    | 225 ++++++++++++++++++
 .../__tests__/__snapshots__/demo.test.js.snap | 125 ++++++++++
 components/menu/demo/deprecated.md            |  40 ++++
 components/menu/demo/horizontal.md            |   2 +-
 4 files changed, 391 insertions(+), 1 deletion(-)
 create mode 100755 components/menu/demo/deprecated.md

diff --git a/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap
index d24b5b0288..9e33615e9b 100644
--- a/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -1,5 +1,230 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`renders ./components/menu/demo/deprecated.md extend context correctly 1`] = `
+Array [
+  <ul
+    class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-light"
+    data-menu-list="true"
+    role="menu"
+    tabindex="0"
+  >
+    <li
+      class="ant-menu-overflow-item ant-menu-item ant-menu-item-selected"
+      role="menuitem"
+      style="opacity:1;order:0"
+      tabindex="-1"
+    >
+      <span
+        aria-label="mail"
+        class="anticon anticon-mail ant-menu-item-icon"
+        role="img"
+      >
+        <svg
+          aria-hidden="true"
+          data-icon="mail"
+          fill="currentColor"
+          focusable="false"
+          height="1em"
+          viewBox="64 64 896 896"
+          width="1em"
+        >
+          <path
+            d="M928 160H96c-17.7 0-32 14.3-32 32v640c0 17.7 14.3 32 32 32h832c17.7 0 32-14.3 32-32V192c0-17.7-14.3-32-32-32zm-40 110.8V792H136V270.8l-27.6-21.5 39.3-50.5 42.8 33.3h643.1l42.8-33.3 39.3 50.5-27.7 21.5zM833.6 232L512 482 190.4 232l-42.8-33.3-39.3 50.5 27.6 21.5 341.6 265.6a55.99 55.99 0 0068.7 0L888 270.8l27.6-21.5-39.3-50.5-42.7 33.2z"
+          />
+        </svg>
+      </span>
+      <span
+        class="ant-menu-title-content"
+      >
+        Navigation One
+      </span>
+    </li>
+    <div>
+      <div
+        class="ant-tooltip ant-menu-inline-collapsed-tooltip"
+        style="opacity:0"
+      >
+        <div
+          class="ant-tooltip-content"
+        >
+          <div
+            class="ant-tooltip-arrow"
+          >
+            <span
+              class="ant-tooltip-arrow-content"
+            />
+          </div>
+          <div
+            class="ant-tooltip-inner"
+            role="tooltip"
+          />
+        </div>
+      </div>
+    </div>
+    <li
+      class="ant-menu-overflow-item ant-menu-submenu ant-menu-submenu-horizontal"
+      role="none"
+      style="opacity:1;order:1"
+    >
+      <div
+        aria-expanded="false"
+        aria-haspopup="true"
+        class="ant-menu-submenu-title"
+        role="menuitem"
+        tabindex="-1"
+      >
+        <span
+          aria-label="setting"
+          class="anticon anticon-setting ant-menu-item-icon"
+          role="img"
+        >
+          <svg
+            aria-hidden="true"
+            data-icon="setting"
+            fill="currentColor"
+            focusable="false"
+            height="1em"
+            viewBox="64 64 896 896"
+            width="1em"
+          >
+            <path
+              d="M924.8 625.7l-65.5-56c3.1-19 4.7-38.4 4.7-57.8s-1.6-38.8-4.7-57.8l65.5-56a32.03 32.03 0 009.3-35.2l-.9-2.6a443.74 443.74 0 00-79.7-137.9l-1.8-2.1a32.12 32.12 0 00-35.1-9.5l-81.3 28.9c-30-24.6-63.5-44-99.7-57.6l-15.7-85a32.05 32.05 0 00-25.8-25.7l-2.7-.5c-52.1-9.4-106.9-9.4-159 0l-2.7.5a32.05 32.05 0 00-25.8 25.7l-15.8 85.4a351.86 351.86 0 00-99 57.4l-81.9-29.1a32 32 0 00-35.1 9.5l-1.8 2.1a446.02 446.02 0 00-79.7 137.9l-.9 2.6c-4.5 12.5-.8 26.5 9.3 35.2l66.3 56.6c-3.1 18.8-4.6 38-4.6 57.1 0 19.2 1.5 38.4 4.6 57.1L99 625.5a32.03 32.03 0 00-9.3 35.2l.9 2.6c18.1 50.4 44.9 96.9 79.7 137.9l1.8 2.1a32.12 32.12 0 0035.1 9.5l81.9-29.1c29.8 24.5 63.1 43.9 99 57.4l15.8 85.4a32.05 32.05 0 0025.8 25.7l2.7.5a449.4 449.4 0 00159 0l2.7-.5a32.05 32.05 0 0025.8-25.7l15.7-85a350 350 0 0099.7-57.6l81.3 28.9a32 32 0 0035.1-9.5l1.8-2.1c34.8-41.1 61.6-87.5 79.7-137.9l.9-2.6c4.5-12.3.8-26.3-9.3-35zM788.3 465.9c2.5 15.1 3.8 30.6 3.8 46.1s-1.3 31-3.8 46.1l-6.6 40.1 74.7 63.9a370.03 370.03 0 01-42.6 73.6L721 702.8l-31.4 25.8c-23.9 19.6-50.5 35-79.3 45.8l-38.1 14.3-17.9 97a377.5 377.5 0 01-85 0l-17.9-97.2-37.8-14.5c-28.5-10.8-55-26.2-78.7-45.7l-31.4-25.9-93.4 33.2c-17-22.9-31.2-47.6-42.6-73.6l75.5-64.5-6.5-40c-2.4-14.9-3.7-30.3-3.7-45.5 0-15.3 1.2-30.6 3.7-45.5l6.5-40-75.5-64.5c11.3-26.1 25.6-50.7 42.6-73.6l93.4 33.2 31.4-25.9c23.7-19.5 50.2-34.9 78.7-45.7l37.9-14.3 17.9-97.2c28.1-3.2 56.8-3.2 85 0l17.9 97 38.1 14.3c28.7 10.8 55.4 26.2 79.3 45.8l31.4 25.8 92.8-32.9c17 22.9 31.2 47.6 42.6 73.6L781.8 426l6.5 39.9zM512 326c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zm79.2 255.2A111.6 111.6 0 01512 614c-29.9 0-58-11.7-79.2-32.8A111.6 111.6 0 01400 502c0-29.9 11.7-58 32.8-79.2C454 401.6 482.1 390 512 390c29.9 0 58 11.6 79.2 32.8A111.6 111.6 0 01624 502c0 29.9-11.7 58-32.8 79.2z"
+            />
+          </svg>
+        </span>
+        <span
+          class="ant-menu-title-content"
+        >
+          Navigation Three - Submenu
+        </span>
+        <i
+          class="ant-menu-submenu-arrow"
+        />
+      </div>
+    </li>
+    <li
+      aria-hidden="true"
+      class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
+      role="none"
+      style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
+    >
+      <div
+        aria-expanded="false"
+        aria-haspopup="true"
+        class="ant-menu-submenu-title"
+        role="menuitem"
+        tabindex="-1"
+      >
+        <span
+          aria-label="ellipsis"
+          class="anticon anticon-ellipsis"
+          role="img"
+        >
+          <svg
+            aria-hidden="true"
+            data-icon="ellipsis"
+            fill="currentColor"
+            focusable="false"
+            height="1em"
+            viewBox="64 64 896 896"
+            width="1em"
+          >
+            <path
+              d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
+            />
+          </svg>
+        </span>
+        <i
+          class="ant-menu-submenu-arrow"
+        />
+      </div>
+      <div>
+        <div
+          class="ant-menu-submenu ant-menu-submenu-popup ant-menu-light"
+          style="opacity:0"
+        >
+          <ul
+            class="ant-menu ant-menu-sub ant-menu-vertical"
+            data-menu-list="true"
+          />
+        </div>
+      </div>
+    </li>
+  </ul>,
+  <div
+    aria-hidden="true"
+    style="display:none"
+  >
+    <div>
+      <div
+        class="ant-tooltip ant-menu-inline-collapsed-tooltip"
+        style="opacity:0"
+      >
+        <div
+          class="ant-tooltip-content"
+        >
+          <div
+            class="ant-tooltip-arrow"
+          >
+            <span
+              class="ant-tooltip-arrow-content"
+            />
+          </div>
+          <div
+            class="ant-tooltip-inner"
+            role="tooltip"
+          />
+        </div>
+      </div>
+    </div>
+    <div>
+      <div
+        class="ant-tooltip ant-menu-inline-collapsed-tooltip"
+        style="opacity:0"
+      >
+        <div
+          class="ant-tooltip-content"
+        >
+          <div
+            class="ant-tooltip-arrow"
+          >
+            <span
+              class="ant-tooltip-arrow-content"
+            />
+          </div>
+          <div
+            class="ant-tooltip-inner"
+            role="tooltip"
+          />
+        </div>
+      </div>
+    </div>
+    <div>
+      <div
+        class="ant-tooltip ant-menu-inline-collapsed-tooltip"
+        style="opacity:0"
+      >
+        <div
+          class="ant-tooltip-content"
+        >
+          <div
+            class="ant-tooltip-arrow"
+          >
+            <span
+              class="ant-tooltip-arrow-content"
+            />
+          </div>
+          <div
+            class="ant-tooltip-inner"
+            role="tooltip"
+          />
+        </div>
+      </div>
+    </div>
+  </div>,
+]
+`;
+
 exports[`renders ./components/menu/demo/horizontal.md extend context correctly 1`] = `
 Array [
   <ul
diff --git a/components/menu/__tests__/__snapshots__/demo.test.js.snap b/components/menu/__tests__/__snapshots__/demo.test.js.snap
index d9e48159f6..aa65d66990 100644
--- a/components/menu/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/menu/__tests__/__snapshots__/demo.test.js.snap
@@ -1,5 +1,130 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`renders ./components/menu/demo/deprecated.md correctly 1`] = `
+Array [
+  <ul
+    class="ant-menu-overflow ant-menu ant-menu-root ant-menu-horizontal ant-menu-light"
+    data-menu-list="true"
+    role="menu"
+    tabindex="0"
+  >
+    <li
+      class="ant-menu-overflow-item ant-menu-item ant-menu-item-selected"
+      role="menuitem"
+      style="opacity:1;order:0"
+      tabindex="-1"
+    >
+      <span
+        aria-label="mail"
+        class="anticon anticon-mail ant-menu-item-icon"
+        role="img"
+      >
+        <svg
+          aria-hidden="true"
+          data-icon="mail"
+          fill="currentColor"
+          focusable="false"
+          height="1em"
+          viewBox="64 64 896 896"
+          width="1em"
+        >
+          <path
+            d="M928 160H96c-17.7 0-32 14.3-32 32v640c0 17.7 14.3 32 32 32h832c17.7 0 32-14.3 32-32V192c0-17.7-14.3-32-32-32zm-40 110.8V792H136V270.8l-27.6-21.5 39.3-50.5 42.8 33.3h643.1l42.8-33.3 39.3 50.5-27.7 21.5zM833.6 232L512 482 190.4 232l-42.8-33.3-39.3 50.5 27.6 21.5 341.6 265.6a55.99 55.99 0 0068.7 0L888 270.8l27.6-21.5-39.3-50.5-42.7 33.2z"
+          />
+        </svg>
+      </span>
+      <span
+        class="ant-menu-title-content"
+      >
+        Navigation One
+      </span>
+    </li>
+    <li
+      class="ant-menu-overflow-item ant-menu-submenu ant-menu-submenu-horizontal"
+      role="none"
+      style="opacity:1;order:1"
+    >
+      <div
+        aria-expanded="false"
+        aria-haspopup="true"
+        class="ant-menu-submenu-title"
+        role="menuitem"
+        tabindex="-1"
+      >
+        <span
+          aria-label="setting"
+          class="anticon anticon-setting ant-menu-item-icon"
+          role="img"
+        >
+          <svg
+            aria-hidden="true"
+            data-icon="setting"
+            fill="currentColor"
+            focusable="false"
+            height="1em"
+            viewBox="64 64 896 896"
+            width="1em"
+          >
+            <path
+              d="M924.8 625.7l-65.5-56c3.1-19 4.7-38.4 4.7-57.8s-1.6-38.8-4.7-57.8l65.5-56a32.03 32.03 0 009.3-35.2l-.9-2.6a443.74 443.74 0 00-79.7-137.9l-1.8-2.1a32.12 32.12 0 00-35.1-9.5l-81.3 28.9c-30-24.6-63.5-44-99.7-57.6l-15.7-85a32.05 32.05 0 00-25.8-25.7l-2.7-.5c-52.1-9.4-106.9-9.4-159 0l-2.7.5a32.05 32.05 0 00-25.8 25.7l-15.8 85.4a351.86 351.86 0 00-99 57.4l-81.9-29.1a32 32 0 00-35.1 9.5l-1.8 2.1a446.02 446.02 0 00-79.7 137.9l-.9 2.6c-4.5 12.5-.8 26.5 9.3 35.2l66.3 56.6c-3.1 18.8-4.6 38-4.6 57.1 0 19.2 1.5 38.4 4.6 57.1L99 625.5a32.03 32.03 0 00-9.3 35.2l.9 2.6c18.1 50.4 44.9 96.9 79.7 137.9l1.8 2.1a32.12 32.12 0 0035.1 9.5l81.9-29.1c29.8 24.5 63.1 43.9 99 57.4l15.8 85.4a32.05 32.05 0 0025.8 25.7l2.7.5a449.4 449.4 0 00159 0l2.7-.5a32.05 32.05 0 0025.8-25.7l15.7-85a350 350 0 0099.7-57.6l81.3 28.9a32 32 0 0035.1-9.5l1.8-2.1c34.8-41.1 61.6-87.5 79.7-137.9l.9-2.6c4.5-12.3.8-26.3-9.3-35zM788.3 465.9c2.5 15.1 3.8 30.6 3.8 46.1s-1.3 31-3.8 46.1l-6.6 40.1 74.7 63.9a370.03 370.03 0 01-42.6 73.6L721 702.8l-31.4 25.8c-23.9 19.6-50.5 35-79.3 45.8l-38.1 14.3-17.9 97a377.5 377.5 0 01-85 0l-17.9-97.2-37.8-14.5c-28.5-10.8-55-26.2-78.7-45.7l-31.4-25.9-93.4 33.2c-17-22.9-31.2-47.6-42.6-73.6l75.5-64.5-6.5-40c-2.4-14.9-3.7-30.3-3.7-45.5 0-15.3 1.2-30.6 3.7-45.5l6.5-40-75.5-64.5c11.3-26.1 25.6-50.7 42.6-73.6l93.4 33.2 31.4-25.9c23.7-19.5 50.2-34.9 78.7-45.7l37.9-14.3 17.9-97.2c28.1-3.2 56.8-3.2 85 0l17.9 97 38.1 14.3c28.7 10.8 55.4 26.2 79.3 45.8l31.4 25.8 92.8-32.9c17 22.9 31.2 47.6 42.6 73.6L781.8 426l6.5 39.9zM512 326c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176zm79.2 255.2A111.6 111.6 0 01512 614c-29.9 0-58-11.7-79.2-32.8A111.6 111.6 0 01400 502c0-29.9 11.7-58 32.8-79.2C454 401.6 482.1 390 512 390c29.9 0 58 11.6 79.2 32.8A111.6 111.6 0 01624 502c0 29.9-11.7 58-32.8 79.2z"
+            />
+          </svg>
+        </span>
+        <span
+          class="ant-menu-title-content"
+        >
+          Navigation Three - Submenu
+        </span>
+        <i
+          class="ant-menu-submenu-arrow"
+        />
+      </div>
+    </li>
+    <li
+      aria-hidden="true"
+      class="ant-menu-overflow-item ant-menu-overflow-item-rest ant-menu-submenu ant-menu-submenu-horizontal"
+      role="none"
+      style="opacity:0;height:0;overflow-y:hidden;order:9007199254740991;pointer-events:none;position:absolute"
+    >
+      <div
+        aria-expanded="false"
+        aria-haspopup="true"
+        class="ant-menu-submenu-title"
+        role="menuitem"
+        tabindex="-1"
+      >
+        <span
+          aria-label="ellipsis"
+          class="anticon anticon-ellipsis"
+          role="img"
+        >
+          <svg
+            aria-hidden="true"
+            data-icon="ellipsis"
+            fill="currentColor"
+            focusable="false"
+            height="1em"
+            viewBox="64 64 896 896"
+            width="1em"
+          >
+            <path
+              d="M176 511a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0zm280 0a56 56 0 10112 0 56 56 0 10-112 0z"
+            />
+          </svg>
+        </span>
+        <i
+          class="ant-menu-submenu-arrow"
+        />
+      </div>
+    </li>
+  </ul>,
+  <div
+    aria-hidden="true"
+    style="display:none"
+  />,
+]
+`;
+
 exports[`renders ./components/menu/demo/horizontal.md correctly 1`] = `
 Array [
   <ul
diff --git a/components/menu/demo/deprecated.md b/components/menu/demo/deprecated.md
new file mode 100755
index 0000000000..848aa6dc6a
--- /dev/null
+++ b/components/menu/demo/deprecated.md
@@ -0,0 +1,40 @@
+---
+order: 0
+title:
+  zh-CN: 语法糖（废弃）
+  en-US: syntactic sugar (deprecated)
+version: < 4.20.0
+---
+
+## zh-CN
+
+通过语法糖的方式组织菜单目录树，在 `4.20.0` 之后推荐通过 `items` 属性实现。在下个大版本中语法糖用法将被移除从而让 Menu 可以获得更好的性能优化。
+
+## en-US
+
+Use the syntax sugar to organize the menu directory tree. We recommend to use `items` after `4.20.0`. In the next major version, the syntax sugar will be removed to make performance improvement be possible.
+
+```tsx
+import { Menu } from 'antd';
+import { MailOutlined, AppstoreOutlined, SettingOutlined } from '@ant-design/icons';
+
+const App = () => (
+  <Menu mode="horizontal" defaultSelectedKeys={['mail']}>
+    <Menu.Item key="mail" icon={<MailOutlined />}>
+      Navigation One
+    </Menu.Item>
+    <Menu.SubMenu key="SubMenu" title="Navigation Three - Submenu" icon={<SettingOutlined />}>
+      <Menu.ItemGroup title="Item 1">
+        <Menu.Item key="app" icon={<AppstoreOutlined />}>
+          Navigation Two
+        </Menu.Item>
+        <Menu.Item key="disabled" disabled>
+          Navigation Three
+        </Menu.Item>
+      </Menu.ItemGroup>
+    </Menu.SubMenu>
+  </Menu>
+);
+
+export default App;
+```
diff --git a/components/menu/demo/horizontal.md b/components/menu/demo/horizontal.md
index e51f768fa9..344e1b7895 100755
--- a/components/menu/demo/horizontal.md
+++ b/components/menu/demo/horizontal.md
@@ -1,5 +1,5 @@
 ---
-order: 0
+order: 0.5
 title:
   zh-CN: 顶部导航
   en-US: Top Navigation

From 566632efa3620fdafe8758db52b4998bb9f85ea7 Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Wed, 20 Apr 2022 19:03:39 +0800
Subject: [PATCH 3/6] docs: Update Menu demo sample

---
 components/menu/demo/submenu-theme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/menu/demo/submenu-theme.md b/components/menu/demo/submenu-theme.md
index abffac8f7f..5a3623b337 100755
--- a/components/menu/demo/submenu-theme.md
+++ b/components/menu/demo/submenu-theme.md
@@ -7,11 +7,11 @@ title:
 
 ## zh-CN
 
-内建了两套主题 `light` 和 `dark`，默认 `light`。
+你可以通过 `theme` 属性来设置 SubMenu 的主题从而达到不同目录树下不同主题色的效果。该例子默认为根目录深色，子目录浅色效果。
 
 ## en-US
 
-The Sub-menu will inherit the theme of `Menu`, but you can override this at the `SubMenu` level via the `theme` prop.
+You can config SubMenu theme with `theme` prop to enable different theme color effect. This sample is dark for root and light for SubMenu.
 
 ```tsx
 import { Menu, Switch, MenuProps } from 'antd';

From 255bfddc3faef9ab42fdfaf0213ee336fc386e6c Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 20 Apr 2022 22:31:21 +0800
Subject: [PATCH 4/6] docs: improve menu usage for items (#35131)

* docs: improve menu usage for items

* test: update snapshot

* docs: update menu title
---
 .../__snapshots__/demo-extend.test.ts.snap    | 46 ++++++++++++++++++-
 .../__tests__/__snapshots__/demo.test.js.snap |  2 +-
 components/menu/demo/deprecated.md            | 22 +++++----
 components/menu/index.en-US.md                | 28 +++++++++--
 components/menu/index.zh-CN.md                | 25 ++++++++--
 5 files changed, 104 insertions(+), 19 deletions(-)

diff --git a/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap
index 9e33615e9b..b4c8116823 100644
--- a/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/menu/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -95,7 +95,7 @@ Array [
         <span
           class="ant-menu-title-content"
         >
-          Navigation Three - Submenu
+          Navigation Two - Submenu
         </span>
         <i
           class="ant-menu-submenu-arrow"
@@ -221,6 +221,50 @@ Array [
         </div>
       </div>
     </div>
+    <div>
+      <div
+        class="ant-tooltip ant-menu-inline-collapsed-tooltip"
+        style="opacity:0"
+      >
+        <div
+          class="ant-tooltip-content"
+        >
+          <div
+            class="ant-tooltip-arrow"
+          >
+            <span
+              class="ant-tooltip-arrow-content"
+            />
+          </div>
+          <div
+            class="ant-tooltip-inner"
+            role="tooltip"
+          />
+        </div>
+      </div>
+    </div>
+    <div>
+      <div
+        class="ant-tooltip ant-menu-inline-collapsed-tooltip"
+        style="opacity:0"
+      >
+        <div
+          class="ant-tooltip-content"
+        >
+          <div
+            class="ant-tooltip-arrow"
+          >
+            <span
+              class="ant-tooltip-arrow-content"
+            />
+          </div>
+          <div
+            class="ant-tooltip-inner"
+            role="tooltip"
+          />
+        </div>
+      </div>
+    </div>
   </div>,
 ]
 `;
diff --git a/components/menu/__tests__/__snapshots__/demo.test.js.snap b/components/menu/__tests__/__snapshots__/demo.test.js.snap
index aa65d66990..0e1d46e885 100644
--- a/components/menu/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/menu/__tests__/__snapshots__/demo.test.js.snap
@@ -73,7 +73,7 @@ Array [
         <span
           class="ant-menu-title-content"
         >
-          Navigation Three - Submenu
+          Navigation Two - Submenu
         </span>
         <i
           class="ant-menu-submenu-arrow"
diff --git a/components/menu/demo/deprecated.md b/components/menu/demo/deprecated.md
index 848aa6dc6a..7143928b9a 100755
--- a/components/menu/demo/deprecated.md
+++ b/components/menu/demo/deprecated.md
@@ -1,8 +1,8 @@
 ---
 order: 0
 title:
-  zh-CN: 语法糖（废弃）
-  en-US: syntactic sugar (deprecated)
+  zh-CN: 基础用法（废弃的语法糖）
+  en-US: Basic usage (deprecated syntactic sugar)
 version: < 4.20.0
 ---
 
@@ -23,13 +23,19 @@ const App = () => (
     <Menu.Item key="mail" icon={<MailOutlined />}>
       Navigation One
     </Menu.Item>
-    <Menu.SubMenu key="SubMenu" title="Navigation Three - Submenu" icon={<SettingOutlined />}>
-      <Menu.ItemGroup title="Item 1">
-        <Menu.Item key="app" icon={<AppstoreOutlined />}>
-          Navigation Two
+    <Menu.SubMenu key="SubMenu" title="Navigation Two - Submenu" icon={<SettingOutlined />}>
+      <Menu.Item key="two" icon={<AppstoreOutlined />}>
+        Navigation Two
+      </Menu.Item>
+      <Menu.Item key="three" icon={<AppstoreOutlined />}>
+        Navigation Three
+      </Menu.Item>
+      <Menu.ItemGroup title="Item Group">
+        <Menu.Item key="four" icon={<AppstoreOutlined />}>
+          Navigation Four
         </Menu.Item>
-        <Menu.Item key="disabled" disabled>
-          Navigation Three
+        <Menu.Item key="five" icon={<AppstoreOutlined />}>
+          Navigation Five
         </Menu.Item>
       </Menu.ItemGroup>
     </Menu.SubMenu>
diff --git a/components/menu/index.en-US.md b/components/menu/index.en-US.md
index dc9d218600..1f90f6d04b 100644
--- a/components/menu/index.en-US.md
+++ b/components/menu/index.en-US.md
@@ -19,19 +19,37 @@ More layouts with navigation: [Layout](/components/layout).
 - Menu is rendered as a `ul` element, so it only supports [`li` and `script-supporting` elements](https://html.spec.whatwg.org/multipage/grouping-content.html#the-ul-element) as children nodes。Your customized node should be wrapped by `Menu.Item`.
 - Menu needs to collect its node structure, so its children should be `Menu.*` or encapsulated HOCs.
 
-## API
+### Usage upgrade after 4.20.0
+
+```__react
+import Alert from '../alert';
+ReactDOM.render(<Alert message="After version 4.20.0, we provide a simpler usage <Menu items={[...]} /> with better perfermance and potential of writing simpler code style in your applications. Meanwhile, we deprecated the old usage in browser console, we will remove it in antd 5.0." />, mountNode);
+```
 
 ```jsx
+// works when >=4.20.0, recommended ✅
 const items = [
-  { label: 'Menu' },
+  { label: 'item 1' },
+  { label: 'item 2' },
   {
-    label: 'SubMenu',
-    children: [{ label: 'SubMenuItem' }],
+    label: 'sub menu',
+    children: [{ label: 'item 3' }],
   },
 ];
-<Menu items={items} />;
+return <Menu items={items} />;
+
+// works when <4.20.0, deprecated when >=4.20.0 🙅🏻‍♀️
+<Menu>
+  <Menu.Item>item 1</Menu.Item>
+  <Menu.Item>item 2</Menu.Item>
+  <Menu.SubMenu title="sub menu">
+    <Menu.Item>item 3</Menu.Item>
+  </Menu.SubMenu>
+</Menu>;
 ```
 
+## API
+
 ### Menu
 
 | Param | Description | Type | Default value | Version |
diff --git a/components/menu/index.zh-CN.md b/components/menu/index.zh-CN.md
index c85ad0a519..717fb2fb18 100644
--- a/components/menu/index.zh-CN.md
+++ b/components/menu/index.zh-CN.md
@@ -20,20 +20,37 @@ cover: https://gw.alipayobjects.com/zos/alicdn/3XZcjGpvK/Menu.svg
 - Menu 元素为 `ul`，因而仅支持 [`li` 以及 `script-supporting` 子元素](https://html.spec.whatwg.org/multipage/grouping-content.html#the-ul-element)。因而你的子节点元素应该都在 `Menu.Item` 内使用。
 - Menu 需要计算节点结构，因而其子元素仅支持 `Menu.*` 以及对此进行封装的 HOC 组件。
 
-## API
+### 4.20.0 用法升级
+
+```__react
+import Alert from '../alert';
+ReactDOM.render(<Alert message="在 4.20.0 版本后，我们提供了 <Menu items={[...]} /> 的简写方式，有更好的性能和更方便的数据组织方式，开发者不再需要自行拼接 JSX。同时我们废弃了原先的写法，你还是可以在 4.x 继续使用，但会在控制台看到警告，并会在 5.0 后移除。" />, mountNode);
+```
 
 ```jsx
+// >=4.20.0 可用，推荐的写法 ✅
 const items = [
-  { label: '菜单项' },
+  { label: '菜单项一' },
+  { label: '菜单项二' },
   {
     label: '子菜单',
     children: [{ label: '子菜单项' }],
   },
 ];
+return <Menu items={items} />;
 
-<Menu items={items} />;
+// <4.20.0 可用，>=4.20.0 时不推荐 🙅🏻‍♀️
+<Menu>
+  <Menu.Item>菜单项一</Menu.Item>
+  <Menu.Item>菜单项二</Menu.Item>
+  <Menu.SubMenu title="子菜单">
+    <Menu.Item>子菜单项</Menu.Item>
+  </Menu.SubMenu>
+</Menu>;
 ```
 
+## API
+
 ### Menu
 
 | 参数 | 说明 | 类型 | 默认值 | 版本 |
@@ -75,7 +92,7 @@ const items = [
 | disabled | 是否禁用                 | boolean   | false  |      |
 | icon     | 菜单图标                 | ReactNode | -      |      |
 | key      | item 的唯一标志          | string    | -      |      |
-| label    | 菜单项标题               | ReactNode    | -      |      |
+| label    | 菜单项标题               | ReactNode | -      |      |
 | title    | 设置收缩时展示的悬浮标题 | string    | -      |      |
 
 > 注意：`icon` 是 `4.2.0` 新增的属性，之前的版本请使用下面的方式定义图标。

From cbd4f1b66de68b305ad647261f3dc56c510ae212 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 20 Apr 2022 23:14:32 +0800
Subject: [PATCH 5/6] docs: update getContainer of Modal and Drawer (#35141)

close https://github.com/ant-design/ant-design/issues/35124
---
 components/drawer/index.en-US.md | 2 +-
 components/drawer/index.zh-CN.md | 2 +-
 components/modal/index.en-US.md  | 2 +-
 components/modal/index.zh-CN.md  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/drawer/index.en-US.md b/components/drawer/index.en-US.md
index e11cc959bc..ff4dcbb725 100644
--- a/components/drawer/index.en-US.md
+++ b/components/drawer/index.en-US.md
@@ -33,7 +33,7 @@ A Drawer is a panel that is typically overlaid on top of a page and slides in fr
 | footer | The footer for Drawer | ReactNode | - |  |
 | footerStyle | Style of the drawer footer part | CSSProperties | - |  |
 | forceRender | Prerender Drawer component forcely | boolean | false |  |
-| getContainer | Return the mounted node for Drawer | HTMLElement \| () => HTMLElement \| Selectors \| false | body |  |
+| getContainer | mounted node and display window for Drawer | HTMLElement \| () => HTMLElement \| Selectors \| false | body |  |
 | headerStyle | Style of the drawer header part | CSSProperties | - |  |
 | height | Placement is `top` or `bottom`, height of the Drawer dialog | string \| number | 378 |  |
 | keyboard | Whether support press esc to close | boolean | true |  |
diff --git a/components/drawer/index.zh-CN.md b/components/drawer/index.zh-CN.md
index 21767b9321..1ea466c69a 100644
--- a/components/drawer/index.zh-CN.md
+++ b/components/drawer/index.zh-CN.md
@@ -32,7 +32,7 @@ cover: https://img.alicdn.com/imgextra/i4/O1CN019djdZP1OHwXSRGCOW_!!600000000168
 | footer | 抽屉的页脚 | ReactNode | - |  |
 | footerStyle | 抽屉页脚部件的样式 | CSSProperties | - |  |
 | forceRender | 预渲染 Drawer 内元素 | boolean | false |  |
-| getContainer | 指定 Drawer 挂载的 HTML 节点, false 为挂载在当前 dom | HTMLElement \| () => HTMLElement \| Selectors \| false | body |  |
+| getContainer | 指定 Drawer 挂载的节点，**并在容器内展现**，`false` 为挂载在当前位置 | HTMLElement \| () => HTMLElement \| Selectors \| false | body |  |
 | headerStyle | 用于设置 Drawer 头部的样式 | CSSProperties | - |  |
 | height | 高度, 在 `placement` 为 `top` 或 `bottom` 时使用 | string \| number | 378 |  |
 | keyboard | 是否支持键盘 esc 关闭 | boolean | true |  |
diff --git a/components/modal/index.en-US.md b/components/modal/index.en-US.md
index e1497346d8..2479edbc99 100644
--- a/components/modal/index.en-US.md
+++ b/components/modal/index.en-US.md
@@ -27,7 +27,7 @@ When requiring users to interact with the application, but without jumping to a
 | focusTriggerAfterClose | Whether need to focus trigger element after dialog is closed | boolean | true | 4.9.0 |
 | footer | Footer content, set as `footer={null}` when you don't need default buttons | ReactNode | (OK and Cancel buttons) |  |
 | forceRender | Force render Modal | boolean | false |  |
-| getContainer | Return the mount node for Modal | HTMLElement \| () => HTMLElement \| Selectors \| false | document.body |  |
+| getContainer | The mounted node for Modal but still display at fullscreen | HTMLElement \| () => HTMLElement \| Selectors \| false | document.body |  |
 | keyboard | Whether support press esc to close | boolean | true |  |
 | mask | Whether show mask or not | boolean | true |  |
 | maskClosable | Whether to close the modal dialog when the mask (area outside the modal) is clicked | boolean | true |  |
diff --git a/components/modal/index.zh-CN.md b/components/modal/index.zh-CN.md
index 6a064a260c..7074a69970 100644
--- a/components/modal/index.zh-CN.md
+++ b/components/modal/index.zh-CN.md
@@ -30,7 +30,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/3StSdUlSH/Modal.svg
 | focusTriggerAfterClose | 对话框关闭后是否需要聚焦触发元素 | boolean | true | 4.9.0 |
 | footer | 底部内容，当不需要默认底部按钮时，可以设为 `footer={null}` | ReactNode | (确定取消按钮) |  |
 | forceRender | 强制渲染 Modal | boolean | false |  |
-| getContainer | 指定 Modal 挂载的 HTML 节点, false 为挂载在当前 dom | HTMLElement \| () => HTMLElement \| Selectors \| false | document.body |  |
+| getContainer | 指定 Modal 挂载的节点，但依旧为全局展示，`false` 为挂载在当前位置 | HTMLElement \| () => HTMLElement \| Selectors \| false | document.body |  |
 | keyboard | 是否支持键盘 esc 关闭 | boolean | true |  |
 | mask | 是否展示遮罩 | boolean | true |  |
 | maskClosable | 点击蒙层是否允许关闭 | boolean | true |  |

From 1525ac47fb1274802cb9136d1067633ced72c741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Thu, 21 Apr 2022 17:10:06 +0800
Subject: [PATCH 6/6] chore: bump dropdown with inject mark (#35153)

---
 .../__snapshots__/demo-extend.test.ts.snap    |  1 +
 .../__snapshots__/demo-extend.test.ts.snap    |  1 +
 .../__snapshots__/demo-extend.test.ts.snap    |  2 ++
 .../__snapshots__/demo-extend.test.ts.snap    | 35 +++++++++++++++++++
 .../__snapshots__/demo-extend.test.ts.snap    |  2 ++
 .../__snapshots__/demo-extend.test.ts.snap    |  2 ++
 .../Table.rowSelection.test.js.snap           |  2 ++
 .../__snapshots__/demo-extend.test.ts.snap    |  1 +
 .../__snapshots__/demo-extend.test.ts.snap    | 18 ++++++++++
 .../__snapshots__/demo-extend.test.ts.snap    | 20 +++++++++++
 package.json                                  |  4 +--
 11 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/components/breadcrumb/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/breadcrumb/__tests__/__snapshots__/demo-extend.test.ts.snap
index c5710ef962..94b3e71de7 100644
--- a/components/breadcrumb/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/breadcrumb/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -138,6 +138,7 @@ exports[`renders ./components/breadcrumb/demo/overlay.md extend context correctl
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
diff --git a/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
index 510d1ba813..cb90130528 100644
--- a/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -1643,6 +1643,7 @@ Array [
       >
         <ul
           class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+          data-dropdown-inject="true"
           data-menu-list="true"
           role="menu"
           tabindex="0"
diff --git a/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap
index 12c2e0bbb5..8d514e5d1e 100644
--- a/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -917,6 +917,7 @@ Array [
                 <ul
                   aria-label="expanded dropdown"
                   class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+                  data-dropdown-inject="true"
                   data-menu-list="true"
                   id="null-more-popup"
                   role="listbox"
@@ -1070,6 +1071,7 @@ Array [
                 <ul
                   aria-label="expanded dropdown"
                   class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+                  data-dropdown-inject="true"
                   data-menu-list="true"
                   id="null-more-popup"
                   role="listbox"
diff --git a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
index 022257e9e1..8e9d6331a3 100644
--- a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -20,6 +20,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -233,6 +234,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -446,6 +448,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -660,6 +663,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -873,6 +877,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -1086,6 +1091,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -1304,6 +1310,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -1517,6 +1524,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -1730,6 +1738,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -1944,6 +1953,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -2157,6 +2167,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -2370,6 +2381,7 @@ Array [
       />
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -2601,6 +2613,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -2888,6 +2901,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -3119,6 +3133,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -3401,6 +3416,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -3685,6 +3701,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -3995,6 +4012,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -4269,6 +4287,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
       >
         <ul
           class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+          data-dropdown-inject="true"
           data-menu-list="true"
           role="menu"
           tabindex="0"
@@ -4540,6 +4559,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -4753,6 +4773,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -5021,6 +5042,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -5159,6 +5181,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -5274,6 +5297,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -5388,6 +5412,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -5493,6 +5518,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -6622,6 +6648,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -6833,6 +6860,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -7048,6 +7076,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -7263,6 +7292,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -7487,6 +7517,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -7702,6 +7733,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -7917,6 +7949,7 @@ exports[`renders ./components/dropdown/demo/placement.md extend context correctl
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -8151,6 +8184,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
@@ -8649,6 +8683,7 @@ Array [
     >
       <ul
         class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+        data-dropdown-inject="true"
         data-menu-list="true"
         role="menu"
         tabindex="0"
diff --git a/components/empty/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/empty/__tests__/__snapshots__/demo-extend.test.ts.snap
index c7ddd5ccb3..ba19000713 100644
--- a/components/empty/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/empty/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -523,6 +523,7 @@ exports[`renders ./components/empty/demo/config-provider.md extend context corre
             >
               <ul
                 class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 role="menu"
                 tabindex="0"
@@ -810,6 +811,7 @@ exports[`renders ./components/empty/demo/config-provider.md extend context corre
             >
               <ul
                 class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 role="menu"
                 tabindex="0"
diff --git a/components/page-header/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/page-header/__tests__/__snapshots__/demo-extend.test.ts.snap
index 6b97d77467..7c88f42f7e 100644
--- a/components/page-header/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/page-header/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -737,6 +737,7 @@ exports[`renders ./components/page-header/demo/content.md extend context correct
             >
               <ul
                 class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 role="menu"
                 tabindex="0"
@@ -1612,6 +1613,7 @@ exports[`renders ./components/page-header/demo/responsive.md extend context corr
               <ul
                 aria-label="expanded dropdown"
                 class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 id="null-more-popup"
                 role="listbox"
diff --git a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
index 2fb7edc9d6..c7c696204c 100644
--- a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
+++ b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap
@@ -1067,6 +1067,7 @@ exports[`Table.rowSelection should support getPopupContainer 1`] = `
                           >
                             <ul
                               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                              data-dropdown-inject="true"
                               data-menu-list="true"
                               role="menu"
                               tabindex="0"
@@ -1423,6 +1424,7 @@ exports[`Table.rowSelection should support getPopupContainer from ConfigProvider
                           >
                             <ul
                               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                              data-dropdown-inject="true"
                               data-menu-list="true"
                               role="menu"
                               tabindex="0"
diff --git a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap
index af0d062257..c1ba5775b6 100644
--- a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -19755,6 +19755,7 @@ exports[`renders ./components/table/demo/row-selection-custom.md extend context
                           >
                             <ul
                               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                              data-dropdown-inject="true"
                               data-menu-list="true"
                               role="menu"
                               tabindex="0"
diff --git a/components/tabs/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/tabs/__tests__/__snapshots__/demo-extend.test.ts.snap
index 047fe26c39..3d4c0f48fb 100644
--- a/components/tabs/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/tabs/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -98,6 +98,7 @@ exports[`renders ./components/tabs/demo/basic.md extend context correctly 1`] =
           <ul
             aria-label="expanded dropdown"
             class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+            data-dropdown-inject="true"
             data-menu-list="true"
             id="null-more-popup"
             role="listbox"
@@ -242,6 +243,7 @@ exports[`renders ./components/tabs/demo/card.md extend context correctly 1`] = `
           <ul
             aria-label="expanded dropdown"
             class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+            data-dropdown-inject="true"
             data-menu-list="true"
             id="null-more-popup"
             role="listbox"
@@ -389,6 +391,7 @@ exports[`renders ./components/tabs/demo/card-top.md extend context correctly 1`]
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -542,6 +545,7 @@ exports[`renders ./components/tabs/demo/centered.md extend context correctly 1`]
           <ul
             aria-label="expanded dropdown"
             class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+            data-dropdown-inject="true"
             data-menu-list="true"
             id="null-more-popup"
             role="listbox"
@@ -739,6 +743,7 @@ exports[`renders ./components/tabs/demo/custom-add-trigger.md extend context cor
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -880,6 +885,7 @@ exports[`renders ./components/tabs/demo/custom-tab-bar.md extend context correct
               <ul
                 aria-label="expanded dropdown"
                 class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 id="null-more-popup"
                 role="listbox"
@@ -1039,6 +1045,7 @@ exports[`renders ./components/tabs/demo/custom-tab-bar-node.md extend context co
           <ul
             aria-label="expanded dropdown"
             class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+            data-dropdown-inject="true"
             data-menu-list="true"
             id="null-more-popup"
             role="listbox"
@@ -1183,6 +1190,7 @@ exports[`renders ./components/tabs/demo/disabled.md extend context correctly 1`]
           <ul
             aria-label="expanded dropdown"
             class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+            data-dropdown-inject="true"
             data-menu-list="true"
             id="null-more-popup"
             role="listbox"
@@ -1408,6 +1416,7 @@ exports[`renders ./components/tabs/demo/editable-card.md extend context correctl
           <ul
             aria-label="expanded dropdown"
             class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+            data-dropdown-inject="true"
             data-menu-list="true"
             id="null-more-popup"
             role="listbox"
@@ -1582,6 +1591,7 @@ Array [
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -1803,6 +1813,7 @@ Array [
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -1990,6 +2001,7 @@ exports[`renders ./components/tabs/demo/icon.md extend context correctly 1`] = `
           <ul
             aria-label="expanded dropdown"
             class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+            data-dropdown-inject="true"
             data-menu-list="true"
             id="null-more-popup"
             role="listbox"
@@ -2762,6 +2774,7 @@ exports[`renders ./components/tabs/demo/nest.md extend context correctly 1`] = `
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -3089,6 +3102,7 @@ exports[`renders ./components/tabs/demo/nest.md extend context correctly 1`] = `
                     <ul
                       aria-label="expanded dropdown"
                       class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+                      data-dropdown-inject="true"
                       data-menu-list="true"
                       id="null-more-popup"
                       role="listbox"
@@ -3461,6 +3475,7 @@ Array [
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -3671,6 +3686,7 @@ exports[`renders ./components/tabs/demo/size.md extend context correctly 1`] = `
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -3812,6 +3828,7 @@ exports[`renders ./components/tabs/demo/size.md extend context correctly 1`] = `
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
@@ -4356,6 +4373,7 @@ exports[`renders ./components/tabs/demo/slide.md extend context correctly 1`] =
             <ul
               aria-label="expanded dropdown"
               class="ant-tabs-dropdown-menu ant-tabs-dropdown-menu-root ant-tabs-dropdown-menu-vertical"
+              data-dropdown-inject="true"
               data-menu-list="true"
               id="null-more-popup"
               role="listbox"
diff --git a/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap
index 3744fc7172..26e1151813 100644
--- a/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -52,6 +52,7 @@ exports[`renders ./components/transfer/demo/advanced.md extend context correctly
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -425,6 +426,7 @@ exports[`renders ./components/transfer/demo/advanced.md extend context correctly
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -744,6 +746,7 @@ exports[`renders ./components/transfer/demo/basic.md extend context correctly 1`
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -1262,6 +1265,7 @@ exports[`renders ./components/transfer/demo/basic.md extend context correctly 1`
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -1684,6 +1688,7 @@ exports[`renders ./components/transfer/demo/custom-item.md extend context correc
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -1972,6 +1977,7 @@ exports[`renders ./components/transfer/demo/custom-item.md extend context correc
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -2212,6 +2218,7 @@ exports[`renders ./components/transfer/demo/custom-select-all-labels.md extend c
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -2628,6 +2635,7 @@ exports[`renders ./components/transfer/demo/custom-select-all-labels.md extend c
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -2883,6 +2891,7 @@ Array [
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -3210,6 +3219,7 @@ Array [
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -3524,6 +3534,7 @@ Array [
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -4084,6 +4095,7 @@ Array [
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -4463,6 +4475,7 @@ exports[`renders ./components/transfer/demo/search.md extend context correctly 1
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -4816,6 +4829,7 @@ exports[`renders ./components/transfer/demo/search.md extend context correctly 1
         >
           <ul
             class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+            data-dropdown-inject="true"
             data-menu-list="true"
             role="menu"
             tabindex="0"
@@ -5129,6 +5143,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
             >
               <ul
                 class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 role="menu"
                 tabindex="0"
@@ -5416,6 +5431,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
             >
               <ul
                 class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 role="menu"
                 tabindex="0"
@@ -5657,6 +5673,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
             >
               <ul
                 class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 role="menu"
                 tabindex="0"
@@ -6010,6 +6027,7 @@ exports[`renders ./components/transfer/demo/status.md extend context correctly 1
             >
               <ul
                 class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+                data-dropdown-inject="true"
                 data-menu-list="true"
                 role="menu"
                 tabindex="0"
@@ -6319,6 +6337,7 @@ Array [
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
@@ -7165,6 +7184,7 @@ Array [
           >
             <ul
               class="ant-dropdown-menu ant-dropdown-menu-root ant-dropdown-menu-vertical ant-dropdown-menu-light"
+              data-dropdown-inject="true"
               data-menu-list="true"
               role="menu"
               tabindex="0"
diff --git a/package.json b/package.json
index 77a177e92f..ecc57315a2 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "rc-collapse": "~3.1.0",
     "rc-dialog": "~8.8.1",
     "rc-drawer": "~4.4.2",
-    "rc-dropdown": "~3.4.0",
+    "rc-dropdown": "~3.5.0",
     "rc-field-form": "~1.26.1",
     "rc-image": "~5.6.0",
     "rc-input": "~0.0.1-alpha.5",
@@ -148,7 +148,7 @@
     "rc-steps": "~4.1.0",
     "rc-switch": "~3.2.0",
     "rc-table": "~7.24.0",
-    "rc-tabs": "~11.12.0",
+    "rc-tabs": "~11.13.0",
     "rc-textarea": "~0.3.0",
     "rc-tooltip": "~5.1.1",
     "rc-tree": "~5.5.0",