From 706f04790989e229127a655f7f3b886c8e760354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 29 Apr 2019 14:49:30 +0800
Subject: [PATCH] =?UTF-8?q?[breaking=20change]=20Field:=20renaming=20icon?=
 =?UTF-8?q?=20props=E3=80=81events?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/markdown/v2-progress-tracking.md             |  8 ++++++--
 packages/field/index.js                           |  8 ++------
 .../field/test/__snapshots__/index.spec.js.snap   | 11 -----------
 packages/field/test/index.spec.js                 | 15 +--------------
 4 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/docs/markdown/v2-progress-tracking.md b/docs/markdown/v2-progress-tracking.md
index 900465b07..14bfa00da 100644
--- a/docs/markdown/v2-progress-tracking.md
+++ b/docs/markdown/v2-progress-tracking.md
@@ -14,8 +14,12 @@
 
 ### Field
 
-- [ ] icon 属性重命名为 right-icon
-- [ ] icon 插槽重命名为 right-icon
+- [x] 移除 onIconClick 属性
+- [x] icon 属性重命名为 right-icon
+- [x] icon 插槽重命名为 right-icon
+- [x] click-icon 事件重命名为 click-right-icon
+
+改动原因：规范命名，onIconClick 属性可以被 click-right-icon 代替
 
 ### GoodsAction
 
diff --git a/packages/field/index.js b/packages/field/index.js
index e017fa5f2..cb82fc55a 100644
--- a/packages/field/index.js
+++ b/packages/field/index.js
@@ -20,7 +20,6 @@ export default sfc({
     labelWidth: [String, Number],
     labelAlign: String,
     inputAlign: String,
-    onIconClick: Function,
     autosize: [Boolean, Object],
     errorMessage: String,
     errorMessageAlign: String,
@@ -130,10 +129,7 @@ export default sfc({
     },
 
     onClickRightIcon() {
-      // compatible old version
-      this.$emit('click-icon');
       this.$emit('click-right-icon');
-      this.onIconClick && this.onIconClick();
     },
 
     onClear(event) {
@@ -220,11 +216,11 @@ export default sfc({
 
     renderRightIcon() {
       const { slots } = this;
-      const showRightIcon = slots('right-icon') || slots('icon') || this.rightIcon || this.icon;
+      const showRightIcon = slots('right-icon') || this.rightIcon;
       if (showRightIcon) {
         return (
           <div class={bem('right-icon')} onClick={this.onClickRightIcon}>
-            {slots('right-icon') || slots('icon') || <Icon name={this.rightIcon || this.icon} />}
+            {slots('right-icon') || <Icon name={this.rightIcon} />}
           </div>
         );
       }
diff --git a/packages/field/test/__snapshots__/index.spec.js.snap b/packages/field/test/__snapshots__/index.spec.js.snap
index 7a9c49cd7..d7de2096e 100644
--- a/packages/field/test/__snapshots__/index.spec.js.snap
+++ b/packages/field/test/__snapshots__/index.spec.js.snap
@@ -44,17 +44,6 @@ exports[`render label slot 1`] = `
 </div>
 `;
 
-exports[`render right icon with icon prop for old version 1`] = `
-<div class="van-cell van-field">
-  <div class="van-cell__value van-cell__value--alone">
-    <div class="van-field__body"><input type="text" class="van-field__control">
-      <div class="van-field__right-icon"><i class="van-icon van-icon-success">
-          <!----></i></div>
-    </div>
-  </div>
-</div>
-`;
-
 exports[`render textarea 1`] = `
 <div class="van-cell van-field">
   <div class="van-cell__value van-cell__value--alone">
diff --git a/packages/field/test/index.spec.js b/packages/field/test/index.spec.js
index 073aa83e5..bb9965d73 100644
--- a/packages/field/test/index.spec.js
+++ b/packages/field/test/index.spec.js
@@ -11,22 +11,18 @@ test('input event', () => {
 });
 
 test('click icon event', () => {
-  const onIconClick = jest.fn();
   const wrapper = mount(Field, {
     propsData: {
       value: 'a',
       leftIcon: 'contact',
-      rightIcon: 'search',
-      onIconClick
+      rightIcon: 'search'
     }
   });
 
   wrapper.find('.van-field__left-icon').trigger('click');
   wrapper.find('.van-field__right-icon').trigger('click');
-  expect(wrapper.emitted('click-icon')).toBeTruthy();
   expect(wrapper.emitted('click-left-icon')).toBeTruthy();
   expect(wrapper.emitted('click-right-icon')).toBeTruthy();
-  expect(onIconClick).toHaveBeenCalled();
 });
 
 test('keypress event', () => {
@@ -179,15 +175,6 @@ test('render label slot', () => {
   expect(wrapper).toMatchSnapshot();
 });
 
-test('render right icon with icon prop for old version', () => {
-  const wrapper = mount(Field, {
-    propsData: {
-      icon: 'success'
-    }
-  });
-  expect(wrapper).toMatchSnapshot();
-});
-
 test('size prop', () => {
   const wrapper = mount(Field, {
     propsData: {