From 137e7549ee3d39c4e00105e1e4668e1c42c843d7 Mon Sep 17 00:00:00 2001
From: Kermit <kermitlx@outlook.com>
Date: Fri, 12 Jun 2020 20:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20upgrade=20mentions@1.3.0,?=
 =?UTF-8?q?=20support=20autoSize(#17746)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__tests__/__snapshots__/demo.test.js.snap |  1 +
 .../__tests__/__snapshots__/demo.test.js.snap | 20 +++++++++++++
 .../__snapshots__/index.test.js.snap          |  1 +
 components/mentions/demo/autoSize.md          | 29 +++++++++++++++++++
 components/mentions/demo/basic.md             |  2 +-
 components/mentions/index.en-US.md            |  2 ++
 components/mentions/index.zh-CN.md            |  2 ++
 package.json                                  |  2 +-
 8 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 components/mentions/demo/autoSize.md

diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap
index ac72a1299f05..2cdd38030312 100644
--- a/components/input/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/input/__tests__/__snapshots__/demo.test.js.snap
@@ -252,6 +252,7 @@ Array [
     style="width:100px"
   >
     <textarea
+      class="rc-textarea"
       rows="1"
     />
   </div>,
diff --git a/components/mentions/__tests__/__snapshots__/demo.test.js.snap b/components/mentions/__tests__/__snapshots__/demo.test.js.snap
index e8c2a8e4b91c..d2d8fe297ae1 100644
--- a/components/mentions/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/mentions/__tests__/__snapshots__/demo.test.js.snap
@@ -6,6 +6,19 @@ exports[`renders ./components/mentions/demo/async.md correctly 1`] = `
   style="width:100%"
 >
   <textarea
+    class="rc-textarea"
+    rows="1"
+  />
+</div>
+`;
+
+exports[`renders ./components/mentions/demo/autoSize.md correctly 1`] = `
+<div
+  class="ant-mentions"
+  style="width:100%"
+>
+  <textarea
+    class="rc-textarea"
     rows="1"
   />
 </div>
@@ -17,6 +30,7 @@ exports[`renders ./components/mentions/demo/basic.md correctly 1`] = `
   style="width:100%"
 >
   <textarea
+    class="rc-textarea"
     rows="1"
   >
     @afc163
@@ -55,6 +69,7 @@ exports[`renders ./components/mentions/demo/form.md correctly 1`] = `
             class="ant-mentions"
           >
             <textarea
+              class="rc-textarea"
               id="coders"
               rows="1"
             />
@@ -90,6 +105,7 @@ exports[`renders ./components/mentions/demo/form.md correctly 1`] = `
             class="ant-mentions"
           >
             <textarea
+              class="rc-textarea"
               id="bio"
               placeholder="You can use @ to ref user here"
               rows="3"
@@ -141,6 +157,7 @@ exports[`renders ./components/mentions/demo/placement.md correctly 1`] = `
   style="width:100%"
 >
   <textarea
+    class="rc-textarea"
     rows="1"
   />
 </div>
@@ -152,6 +169,7 @@ exports[`renders ./components/mentions/demo/prefix.md correctly 1`] = `
   style="width:100%"
 >
   <textarea
+    class="rc-textarea"
     placeholder="input @ to mention people, # to mention tag"
     rows="1"
   />
@@ -168,6 +186,7 @@ exports[`renders ./components/mentions/demo/readonly.md correctly 1`] = `
       style="width:100%"
     >
       <textarea
+        class="rc-textarea rc-textarea-disabled"
         disabled=""
         placeholder="this is disabled Mentions"
         rows="1"
@@ -179,6 +198,7 @@ exports[`renders ./components/mentions/demo/readonly.md correctly 1`] = `
     style="width:100%"
   >
     <textarea
+      class="rc-textarea"
       placeholder="this is readOnly Mentions"
       readonly=""
       rows="1"
diff --git a/components/mentions/__tests__/__snapshots__/index.test.js.snap b/components/mentions/__tests__/__snapshots__/index.test.js.snap
index 71885ad54ed7..049726c0334b 100644
--- a/components/mentions/__tests__/__snapshots__/index.test.js.snap
+++ b/components/mentions/__tests__/__snapshots__/index.test.js.snap
@@ -5,6 +5,7 @@ exports[`Mentions rtl render component should be rendered correctly in RTL direc
   class="ant-mentions ant-mentions-rtl"
 >
   <textarea
+    class="rc-textarea"
     rows="1"
   />
 </div>
diff --git a/components/mentions/demo/autoSize.md b/components/mentions/demo/autoSize.md
new file mode 100644
index 000000000000..8d332ed444a6
--- /dev/null
+++ b/components/mentions/demo/autoSize.md
@@ -0,0 +1,29 @@
+---
+order: 6
+title:
+  zh-CN: 自动大小
+  en-US: autoSize
+---
+
+## zh-CN
+
+自适应内容高度。
+
+## en-US
+
+Height autoSize.
+
+```jsx
+import { Mentions } from 'antd';
+
+const { Option } = Mentions;
+
+ReactDOM.render(
+  <Mentions autoSize style={{ width: '100%' }}>
+    <Option value="afc163">afc163</Option>
+    <Option value="zombieJ">zombieJ</Option>
+    <Option value="yesmeck">yesmeck</Option>
+  </Mentions>,
+  mountNode,
+);
+```
diff --git a/components/mentions/demo/basic.md b/components/mentions/demo/basic.md
index ee9762c691b3..1939e41387aa 100644
--- a/components/mentions/demo/basic.md
+++ b/components/mentions/demo/basic.md
@@ -7,7 +7,7 @@ title:
 
 ## zh-CN
 
-基本使用
+基本使用。
 
 ## en-US
 
diff --git a/components/mentions/index.en-US.md b/components/mentions/index.en-US.md
index 6600b4bdef7a..f17c9630539c 100644
--- a/components/mentions/index.en-US.md
+++ b/components/mentions/index.en-US.md
@@ -38,6 +38,8 @@ When need to mention someone or something.
 | onFocus | Trigger when mentions get focus | () => void |  |
 | onBlur | Trigger when mentions lose focus | () => void |  |
 | getPopupContainer | Set the mount HTML node for suggestions | () => HTMLElement |  |
+| autoSize | Textarea height autosize feature, can be set to `true\|false` or an object `{ minRows: 2, maxRows: 6 }` | boolean \| object | false |
+| onResize | The callback function that is triggered when textarea resize | function({ width, height }) |  |
 
 ### Mention methods
 
diff --git a/components/mentions/index.zh-CN.md b/components/mentions/index.zh-CN.md
index 906674c713ab..5536d1a36ea9 100644
--- a/components/mentions/index.zh-CN.md
+++ b/components/mentions/index.zh-CN.md
@@ -39,6 +39,8 @@ cover: https://gw.alipayobjects.com/zos/alicdn/jPE-itMFM/Mentions.svg
 | onFocus | 获得焦点时触发 | () => void |  |
 | onBlur | 失去焦点时触发 | () => void |  |
 | getPopupContainer | 指定建议框挂载的 HTML 节点 | () => HTMLElement |  |
+| autoSize | 自适应内容高度，可设置为 `true|false` 或对象：`{ minRows: 2, maxRows: 6 }`。 | boolean\|object | false |
+| onResize | resize 回调 | function({ width, height }) |  |
 
 ### Mentions 方法
 
diff --git a/package.json b/package.json
index 977f5cbb6679..19ff1211ee74 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "rc-dropdown": "~3.1.2",
     "rc-field-form": "~1.4.1",
     "rc-input-number": "~5.0.0",
-    "rc-mentions": "~1.2.0",
+    "rc-mentions": "~1.3.0",
     "rc-menu": "~8.3.0",
     "rc-notification": "~4.4.0",
     "rc-pagination": "~2.2.5",