From b57d306107a14e01ed3afbc14799d62086ad23b6 Mon Sep 17 00:00:00 2001
From: Kermit Xuan <kermitlx@outlook.com>
Date: Fri, 22 May 2020 00:20:01 +0800
Subject: [PATCH] feat: optmize tooptip destroyTooltipOnHide (#19536) (#24362)

---
 .../__tests__/__snapshots__/demo.test.js.snap |  6 +++++
 .../tooltip/demo/destroy-tooltip-on-hide.md   | 25 +++++++++++++++++++
 components/tooltip/index.en-US.md             |  1 +
 components/tooltip/index.zh-CN.md             |  1 +
 package.json                                  |  2 +-
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 components/tooltip/demo/destroy-tooltip-on-hide.md

diff --git a/components/tooltip/__tests__/__snapshots__/demo.test.js.snap b/components/tooltip/__tests__/__snapshots__/demo.test.js.snap
index 0799957aa8..35906b3e41 100644
--- a/components/tooltip/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tooltip/__tests__/__snapshots__/demo.test.js.snap
@@ -51,6 +51,12 @@ exports[`renders ./components/tooltip/demo/basic.md correctly 1`] = `
 </span>
 `;
 
+exports[`renders ./components/tooltip/demo/destroy-tooltip-on-hide.md correctly 1`] = `
+<span>
+  Tooltip will destroy when hidden.
+</span>
+`;
+
 exports[`renders ./components/tooltip/demo/placement.md correctly 1`] = `
 <div
   class="demo"
diff --git a/components/tooltip/demo/destroy-tooltip-on-hide.md b/components/tooltip/demo/destroy-tooltip-on-hide.md
new file mode 100644
index 0000000000..9104ca3db4
--- /dev/null
+++ b/components/tooltip/demo/destroy-tooltip-on-hide.md
@@ -0,0 +1,25 @@
+---
+order: 4
+title:
+  zh-CN: 隐藏后销毁
+  en-US: Destroy tooltip when hidden
+---
+
+## zh-CN
+
+通过 `destroyTooltipOnHide` 控制提示关闭时是否销毁 dom 节点。
+
+## en-US
+
+Setting `destroyTooltipOnHide` to control whether destroy dom node of tooltip when hidden.
+
+```jsx
+import { Tooltip } from 'antd';
+
+ReactDOM.render(
+  <Tooltip destroyTooltipOnHide={{ keepParent: false }} title="prompt text">
+    <span>Tooltip will destroy when hidden.</span>
+  </Tooltip>,
+  mountNode,
+);
+```
diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
index e3704113a8..de37de7ba7 100644
--- a/components/tooltip/index.en-US.md
+++ b/components/tooltip/index.en-US.md
@@ -36,6 +36,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 | visible | Whether the floating tooltip card is visible or not | boolean | `false` |  |
 | onVisibleChange | Callback executed when visibility of the tooltip card is changed | (visible) => void | - |  |
 | align | this value will be merged into placement's config, please refer to the settings [rc-tooltip](https://github.com/react-component/tooltip) | Object | - |  |
+| destroyTooltipOnHide | whether destroy tooltip when hidden, parent container of tooltip will be destroyed when `keepParent` is `false` | boolean \| { keepParent?: boolean } | false |  |
 
 ## Note
 
diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
index ff67b89b72..371e64dbe2 100644
--- a/components/tooltip/index.zh-CN.md
+++ b/components/tooltip/index.zh-CN.md
@@ -38,6 +38,7 @@ title: Tooltip
 | visible | 用于手动控制浮层显隐 | boolean | false |  |
 | onVisibleChange | 显示隐藏的回调 | (visible) => void | 无 |  |
 | align | 该值将合并到 placement 的配置中，设置参考 [rc-tooltip](https://github.com/react-component/tooltip) | Object | 无 |  |
+| destroyTooltipOnHide | 关闭后是否销毁 Tooltip，当 `keepParent` 为 `false` 时销毁父容器 | boolean \| { keepParent?: boolean } | false |  |
 
 ## 注意
 
diff --git a/package.json b/package.json
index 57879f5b15..a4c6e259ce 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "rc-switch": "~3.1.0",
     "rc-table": "~7.7.0",
     "rc-tabs": "~10.1.1",
-    "rc-tooltip": "~4.0.2",
+    "rc-tooltip": "~4.1.0",
     "rc-tree": "~3.2.0",
     "rc-tree-select": "~3.1.0",
     "rc-trigger": "~4.1.0",