From a98f513a24da088fe2786d034ec51485a7134c16 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 4 Mar 2020 17:37:53 +0800
Subject: [PATCH] feat: update mentions

---
 build/config.js                                        |  2 +-
 components/input/Input.jsx                             |  5 -----
 components/input/ResizableTextArea.jsx                 |  5 +++++
 .../mentions/__test__/__snapshots__/demo.test.js.snap  | 10 +++++-----
 components/mentions/demo/basic.md                      |  7 ++++++-
 components/vc-mentions/src/DropdownMenu.jsx            |  5 +++--
 components/vc-mentions/src/Mentions.jsx                |  5 +++--
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/build/config.js b/build/config.js
index fbee0138a..922896706 100644
--- a/build/config.js
+++ b/build/config.js
@@ -1,5 +1,5 @@
 module.exports = {
   dev: {
-    componentName: 'upload', // dev components
+    componentName: 'mentions', // dev components
   },
 };
diff --git a/components/input/Input.jsx b/components/input/Input.jsx
index 72e3c5ade..4b82589a1 100644
--- a/components/input/Input.jsx
+++ b/components/input/Input.jsx
@@ -192,11 +192,6 @@ export default {
           keydown: this.handleKeyDown,
           change: noop,
         },
-        directives: [
-          {
-            name: 'ant-input',
-          },
-        ],
       };
       return <TextArea {...textareaProps} ref="input" />;
     }
diff --git a/components/input/ResizableTextArea.jsx b/components/input/ResizableTextArea.jsx
index ba5b8e860..e4d094e3c 100644
--- a/components/input/ResizableTextArea.jsx
+++ b/components/input/ResizableTextArea.jsx
@@ -97,6 +97,11 @@ const ResizableTextArea = {
         style,
         class: cls,
         on: omit(getListeners(this), 'pressEnter'),
+        directives: [
+          {
+            name: 'ant-input',
+          },
+        ],
       };
       return (
         <ResizeObserver onResize={this.resizeOnNextFrame} disabled={!(autoSize || autosize)}>
diff --git a/components/mentions/__test__/__snapshots__/demo.test.js.snap b/components/mentions/__test__/__snapshots__/demo.test.js.snap
index f34248c65..f13128dd3 100644
--- a/components/mentions/__test__/__snapshots__/demo.test.js.snap
+++ b/components/mentions/__test__/__snapshots__/demo.test.js.snap
@@ -7,23 +7,23 @@ exports[`renders ./components/mentions/demo/basic.md correctly 1`] = `<div class
 exports[`renders ./components/mentions/demo/form.md correctly 1`] = `
 <form class="ant-form ant-form-horizontal">
   <div class="ant-row ant-form-item">
-    <div class="ant-col-5 ant-form-item-label"><label for="mentions_coders" title="Top coders" class="">Top coders</label></div>
-    <div class="ant-col-12 ant-form-item-control-wrapper">
+    <div class="ant-col ant-col-5 ant-form-item-label"><label for="mentions_coders" title="Top coders" class="">Top coders</label></div>
+    <div class="ant-col ant-col-12 ant-form-item-control-wrapper">
       <div class="ant-form-item-control"><span class="ant-form-item-children"><div class="ant-mentions"><textarea rows="1" data-__meta="[object Object]" data-__field="[object Object]" id="mentions_coders"></textarea></div></span>
         <!---->
       </div>
     </div>
   </div>
   <div class="ant-row ant-form-item">
-    <div class="ant-col-5 ant-form-item-label"><label for="mentions_bio" title="Bio" class="ant-form-item-required">Bio</label></div>
-    <div class="ant-col-12 ant-form-item-control-wrapper">
+    <div class="ant-col ant-col-5 ant-form-item-label"><label for="mentions_bio" title="Bio" class="ant-form-item-required">Bio</label></div>
+    <div class="ant-col ant-col-12 ant-form-item-control-wrapper">
       <div class="ant-form-item-control"><span class="ant-form-item-children"><div class="ant-mentions"><textarea rows="3" placeholder="You can use @ to ref user here" data-__meta="[object Object]" data-__field="[object Object]" id="mentions_bio"></textarea></div></span>
         <!---->
       </div>
     </div>
   </div>
   <div class="ant-row ant-form-item">
-    <div class="ant-col-12 ant-col-offset-5 ant-form-item-control-wrapper">
+    <div class="ant-col ant-col-12 ant-col-offset-5 ant-form-item-control-wrapper">
       <div class="ant-form-item-control"><span class="ant-form-item-children"><button type="button" class="ant-btn ant-btn-primary"><span>Submit</span></button><button type="button" class="ant-btn" style="margin-left: 8px;"><span>Reset</span></button></span>
         <!---->
       </div>
diff --git a/components/mentions/demo/basic.md b/components/mentions/demo/basic.md
index 607a23157..321f667ac 100644
--- a/components/mentions/demo/basic.md
+++ b/components/mentions/demo/basic.md
@@ -11,7 +11,7 @@ Basic usage.
 ```tpl
 <template>
   <a-mentions
-    defaultValue="@afc163"
+    v-model="value"
     @change="onChange"
     @select="onSelect"
   >
@@ -22,6 +22,11 @@ Basic usage.
 </template>
 <script>
 export default {
+  data() {
+    return {
+      value: '@afc163',
+    }
+  },
   methods: {
     onSelect(option) {
       console.log('select', option);
diff --git a/components/vc-mentions/src/DropdownMenu.jsx b/components/vc-mentions/src/DropdownMenu.jsx
index 0bab955f2..3b0eaac7c 100644
--- a/components/vc-mentions/src/DropdownMenu.jsx
+++ b/components/vc-mentions/src/DropdownMenu.jsx
@@ -2,6 +2,7 @@ import Menu, { MenuItem } from '../../vc-menu';
 import PropTypes from '../../_util/vue-types';
 import { OptionProps } from './Option';
 
+function noop() {}
 export default {
   name: 'DropdownMenu',
   props: {
@@ -18,8 +19,8 @@ export default {
       activeIndex,
       setActiveIndex,
       selectOption,
-      onFocus,
-      onBlur,
+      onFocus = noop,
+      onBlur = noop,
     } = this.mentionsContext;
     const { prefixCls, options } = this.$props;
     const activeOption = options[activeIndex] || {};
diff --git a/components/vc-mentions/src/Mentions.jsx b/components/vc-mentions/src/Mentions.jsx
index 1c0b6c4c1..77ceab856 100644
--- a/components/vc-mentions/src/Mentions.jsx
+++ b/components/vc-mentions/src/Mentions.jsx
@@ -2,7 +2,6 @@ import omit from 'omit.js';
 import KeyCode from '../../_util/KeyCode';
 import BaseMixin from '../../_util/BaseMixin';
 import {
-  getStyle,
   getSlots,
   hasProp,
   getOptionProps,
@@ -73,7 +72,8 @@ const Mentions = {
       }
       this.$emit('change', value);
     },
-    onChange({ target: { value } }) {
+    onChange({ target: { value, composing } }) {
+      if (composing) return;
       this.triggerChange(value);
     },
     onKeyDown(event) {
@@ -283,6 +283,7 @@ const Mentions = {
         <textarea
           ref="textarea"
           {...{
+            directives: [{ name: 'ant-input' }],
             attrs: { ...inputProps, ...this.$attrs },
             domProps: {
               value,