From 0bba7293d516ec008912fc516cd78fe8ca8c563c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 26 Feb 2019 21:09:07 +0800
Subject: [PATCH] [new feature] Stepper: add focus event (#1347)

---
 packages/stepper/README.md  |  1 +
 packages/stepper/index.ts   | 24 ++++++++++++++----------
 packages/stepper/index.wxml |  3 ++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/stepper/README.md b/packages/stepper/README.md
index ba6a3ff9..6d3fb316 100644
--- a/packages/stepper/README.md
+++ b/packages/stepper/README.md
@@ -62,6 +62,7 @@
 | bind:overlimit | 点击不可用的按钮时触发 | - |
 | bind:plus | 点击增加按钮时触发 | - |
 | bind:minus | 点击减少按钮时触发 | - |
+| bind:focus | 输入框聚焦时触发 | - |
 | bind:blur | 输入框失焦时触发 | - |
 
 ### 外部样式类
diff --git a/packages/stepper/index.ts b/packages/stepper/index.ts
index 96fa7cff..40b1d0dd 100644
--- a/packages/stepper/index.ts
+++ b/packages/stepper/index.ts
@@ -64,10 +64,20 @@ VantComponent({
   },
 
   methods: {
-    onFocus() {
-      this.setData({
-        focus: true
-      });
+    onClickWrapper() {
+      if (!this.data.focus) {
+        this.setData({ focus: true });
+      }
+    },
+
+    onFocus(event: Weapp.Event) {
+      this.$emit('focus', event.detail);
+    },
+
+    onBlur(event: Weapp.Event) {
+      const value = this.range(this.data.value);
+      this.triggerInput(value);
+      this.$emit('blur', event.detail);
     },
 
     // limit value range
@@ -92,12 +102,6 @@ VantComponent({
       this.$emit(type);
     },
 
-    onBlur(event: Weapp.Event) {
-      const value = this.range(this.data.value);
-      this.triggerInput(value);
-      this.$emit('blur', event);
-    },
-
     onMinus() {
       this.onChange('minus');
     },
diff --git a/packages/stepper/index.wxml b/packages/stepper/index.wxml
index a98f9e25..b14e1fc4 100644
--- a/packages/stepper/index.wxml
+++ b/packages/stepper/index.wxml
@@ -5,7 +5,7 @@
     hover-stay-time="70"
     bind:tap="onMinus"
   />
-  <view class="input-class van-stepper__input-wrapper {{ disabled || disableInput ? 'van-stepper__input-wrapper--disabled' : '' }}" bindtap="onFocus">
+  <view class="input-class van-stepper__input-wrapper {{ disabled || disableInput ? 'van-stepper__input-wrapper--disabled' : '' }}" bindtap="onClickWrapper">
     <input
       type="{{ integer ? 'number' : 'digit' }}"
       class="van-stepper__input"
@@ -13,6 +13,7 @@
       focus="{{ focus }}"
       disabled="{{ disabled || disableInput }}"
       bindinput="onInput"
+      bind:focus="onFocus"
       bind:blur="onBlur"
     />
   </view>