From 13f7a5d57f54f16ce3c7f8cef0b145a80d22b37f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 13 Jul 2018 15:40:23 +0800
Subject: [PATCH] [bugfix] Stepper: integer in android (#1482)

---
 packages/stepper/index.vue          | 17 +++++++----------
 packages/stepper/test/index.spec.js | 14 ++++----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/packages/stepper/index.vue b/packages/stepper/index.vue
index 4ac89e22a..969fd02aa 100644
--- a/packages/stepper/index.vue
+++ b/packages/stepper/index.vue
@@ -10,7 +10,6 @@
       :value="currentValue"
       :disabled="disabled || disableInput"
       @input="onInput"
-      @keypress="onKeypress"
       @blur="onBlur"
     >
     <button
@@ -91,9 +90,13 @@ export default create({
 
   methods: {
     correctValue(value) {
-      return isNaN(value)
-        ? this.min
-        : Math.max(this.min, Math.min(this.max, value));
+      if (isNaN(value)) {
+        return this.min;
+      }
+
+      value = Math.max(this.min, Math.min(this.max, value));
+
+      return this.integer ? Math.floor(value) : value;
     },
 
     onInput(event) {
@@ -116,12 +119,6 @@ export default create({
       this.$emit(type);
     },
 
-    onKeypress(event) {
-      if (this.integer && event.keyCode === 46) {
-        event.preventDefault();
-      }
-    },
-
     onBlur(event) {
       if (!this.value) {
         this.currentValue = +this.min;
diff --git a/packages/stepper/test/index.spec.js b/packages/stepper/test/index.spec.js
index 94de6407a..5379bc94a 100644
--- a/packages/stepper/test/index.spec.js
+++ b/packages/stepper/test/index.spec.js
@@ -80,17 +80,11 @@ test('only allow interger', () => {
     }
   });
 
-  const fn = jest.fn();
-  wrapper.vm.onKeypress({
-    keyCode: 46,
-    preventDefault: fn
-  });
-  wrapper.vm.onKeypress({
-    keyCode: 45,
-    preventDefault: fn
-  });
+  const input = wrapper.find('input');
+  input.element.value = '1.2';
+  input.trigger('input');
 
-  expect(fn.mock.calls.length).toEqual(1);
+  expect(wrapper.emitted('input')).toEqual([[1]]);
 });
 
 test('stepper blur', () => {