From 8e34408d6ebe0f74aa092c4d3fb34cb38ac8719d Mon Sep 17 00:00:00 2001
From: kingwl <805037171@163.com>
Date: Thu, 16 Feb 2017 02:53:33 -0600
Subject: [PATCH] Input: fix invalid resize prop (#2838)

---
 packages/input/src/calcTextareaHeight.js |  7 ++-----
 packages/input/src/input.vue             | 11 ++++++-----
 test/unit/specs/input.spec.js            | 22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/packages/input/src/calcTextareaHeight.js b/packages/input/src/calcTextareaHeight.js
index b3ea4edcd..61ea97749 100644
--- a/packages/input/src/calcTextareaHeight.js
+++ b/packages/input/src/calcTextareaHeight.js
@@ -1,5 +1,3 @@
-import merge from 'element-ui/src/utils/merge';
-
 let hiddenTextarea;
 
 const HIDDEN_STYLE = `
@@ -55,8 +53,7 @@ function calculateNodeStyling(node) {
 export default function calcTextareaHeight(
   targetNode,
   minRows = null,
-  maxRows = null,
-  options = null
+  maxRows = null
 ) {
   if (!hiddenTextarea) {
     hiddenTextarea = document.createElement('textarea');
@@ -99,5 +96,5 @@ export default function calcTextareaHeight(
     height = Math.min(maxHeight, height);
   }
 
-  return merge({ height: height + 'px'}, options);
+  return { height: height + 'px'};
 };
diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index 9f7d83afa..4bb926a5f 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -76,6 +76,7 @@
 <script>
   import emitter from 'element-ui/src/mixins/emitter';
   import calcTextareaHeight from './calcTextareaHeight';
+  import merge from 'element-ui/src/utils/merge';
 
   export default {
     name: 'ElInput',
@@ -87,7 +88,7 @@
     data() {
       return {
         currentValue: this.value,
-        textareaStyle: {}
+        textareaCalcStyle: {}
       };
     },
 
@@ -132,6 +133,9 @@
     computed: {
       validating() {
         return this.$parent.validateState === 'validating';
+      },
+      textareaStyle() {
+        return merge({}, this.textareaCalcStyle, { resize: this.resize });
       }
     },
 
@@ -158,10 +162,7 @@
         const minRows = autosize.minRows;
         const maxRows = autosize.maxRows;
 
-        const options = {
-          resize: this.resize
-        };
-        this.textareaStyle = calcTextareaHeight(this.$refs.textarea, minRows, maxRows, options);
+        this.textareaCalcStyle = calcTextareaHeight(this.$refs.textarea, minRows, maxRows);
       },
       handleFocus(event) {
         this.$emit('focus', event);
diff --git a/test/unit/specs/input.spec.js b/test/unit/specs/input.spec.js
index 728dcb376..f638a7dcb 100644
--- a/test/unit/specs/input.spec.js
+++ b/test/unit/specs/input.spec.js
@@ -105,6 +105,28 @@ describe('Input', () => {
     expect(vm.$el.querySelector('.el-textarea__inner').getAttribute('rows')).to.be.equal('3');
   });
 
+  // Github issue #2836
+  it('resize', done => {
+    vm = createVue({
+      template: `
+        <div>
+          <el-input type="textarea" :resize="resize"></el-input>
+        </div>
+      `,
+      data: {
+        resize: 'none'
+      }
+    }, true);
+    vm.$nextTick(() => {
+      expect(vm.$el.querySelector('.el-textarea__inner').style.resize).to.be.equal(vm.resize);
+      vm.resize = 'horizontal';
+      vm.$nextTick(() => {
+        expect(vm.$el.querySelector('.el-textarea__inner').style.resize).to.be.equal(vm.resize);
+        done();
+      });
+    });
+  });
+
   it('autosize', done => {
     vm = createVue({
       template: `