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
>
+);
+
+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
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';
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(, 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' }],
},
];
-;
+return ;
+
+// works when <4.20.0, deprecated when >=4.20.0 🙅🏻♀️
+;
```
+## 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 073e2852a2..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(, mountNode);
+```
```jsx
+// >=4.20.0 可用，推荐的写法 ✅
const items = [
- { label: '菜单项' },
+ { label: '菜单项一' },
+ { label: '菜单项二' },
{
label: '子菜单',
children: [{ label: '子菜单项' }],
},
];
+return ;
-;
+// <4.20.0 可用，>=4.20.0 时不推荐 🙅🏻♀️
+;
```
+## API
+
### Menu
| 参数 | 说明 | 类型 | 默认值 | 版本 |
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 | |
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
>