From c7d3de95b01432efea5c9611b9e947a19f089143 Mon Sep 17 00:00:00 2001
From: "wacky6.AriesMBP" <416707889@qq.com>
Date: Wed, 15 Nov 2017 14:12:41 +1100
Subject: [PATCH] input: fix focus

---
 packages/input/src/input.vue        |  8 +++++---
 test/unit/specs/message-box.spec.js | 21 ++++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index 10891e385..f530f06d0 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -77,7 +77,6 @@
 </template>
 <script>
   import emitter from 'element-ui/src/mixins/emitter';
-  import Focus from 'element-ui/src/mixins/focus';
   import Migrating from 'element-ui/src/mixins/migrating';
   import calcTextareaHeight from './calcTextareaHeight';
   import merge from 'element-ui/src/utils/merge';
@@ -87,7 +86,7 @@
 
     componentName: 'ElInput',
 
-    mixins: [emitter, Focus('input'), Migrating],
+    mixins: [emitter, Migrating],
 
     inject: {
       elForm: {
@@ -183,6 +182,9 @@
     },
 
     methods: {
+      focus() {
+        (this.$refs.input || this.$refs.textarea).focus();
+      },
       getMigratingConfig() {
         return {
           props: {
@@ -201,7 +203,7 @@
         }
       },
       inputSelect() {
-        this.$refs.input.select();
+        (this.$refs.input || this.$refs.textarea).select();
       },
       resizeTextarea() {
         if (this.$isServer) return;
diff --git a/test/unit/specs/message-box.spec.js b/test/unit/specs/message-box.spec.js
index b7e41bf8e..079164f40 100644
--- a/test/unit/specs/message-box.spec.js
+++ b/test/unit/specs/message-box.spec.js
@@ -99,15 +99,30 @@ describe('MessageBox', () => {
       inputErrorMessage: 'validation failed'
     });
     setTimeout(() => {
-      expect(document.querySelector('.el-message-box__input')).to.exist;
       const messageBox = document.querySelector('.el-message-box__wrapper').__vue__.$parent;
+      expect(messageBox.$el.querySelector('.el-message-box__input')).to.exist;
+      const haveFocus = messageBox.$el.querySelector('input').isSameNode(document.activeElement);
+      expect(haveFocus).to.true;
       messageBox.inputValue = 'no';
       setTimeout(() => {
-        expect(document.querySelector('.el-message-box__errormsg')
+        expect(messageBox.$el.querySelector('.el-message-box__errormsg')
           .textContent).to.equal('validation failed');
         done();
       }, 100);
-    }, 200);
+    }, 700);
+  });
+
+  it('prompt: focus on textarea', done => {
+    MessageBox.prompt('这是一段内容', {
+      inputType: 'textarea',
+      title: '标题名称'
+    });
+    setTimeout(() => {
+      const messageBox = document.querySelector('.el-message-box__wrapper').__vue__.$parent;
+      const haveFocus = messageBox.$el.querySelector('textarea').isSameNode(document.activeElement);
+      expect(haveFocus).to.true;
+      done();
+    }, 700);
   });
 
   describe('custom validator', () => {