From 393830f946bd5b4046612666a5dcd923e44419e1 Mon Sep 17 00:00:00 2001
From: JeremyWuuuuu <591449570@qq.com>
Date: Tue, 21 Jul 2020 22:27:30 +0800
Subject: [PATCH 1/2] fix/typescripting-button-component - Adding type
 definition for button component

---
 src/components/button/src/index.vue | 30 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/components/button/src/index.vue b/src/components/button/src/index.vue
index 0b1336a4de..a8ec784e57 100644
--- a/src/components/button/src/index.vue
+++ b/src/components/button/src/index.vue
@@ -22,9 +22,19 @@
     <span v-if="$slots.default"><slot></slot></span>
   </button>
 </template>
-<script>
+<script lang='ts'>
 import { computed, inject } from 'vue'
-const ELEMENT = {}
+const ELEMENT: {
+  size?: number;
+} = {}
+// TODOS: replace these interface definition with actual ElForm interface
+interface ElForm {
+  disabled: boolean;  
+}
+interface ElFormItem {
+  elFormItemSize: number;
+}
+
 export default {
   name: 'ElButton',
 
@@ -49,27 +59,21 @@ export default {
       round: Boolean,
       circle: Boolean
     },
-
-    methods: {
-      handleClick(evt) {
-        this.$emit('click', evt);
-      }
-    },
     setup(props,ctx) {
       // inject
-      const elForm = inject('elForm', '')
-      const elFormItem = inject('elFormItem', '')
+      const elForm = inject<ElForm>('elForm')
+      const elFormItem = inject<ElFormItem>('elFormItem')
 
       // computed
       const _elFormItemSize = computed(() => {
-        return (elFormItem || {}).elFormItemSize
+        return elFormItem.elFormItemSize || undefined
       })
       const buttonSize = computed(() => {
         // todo ELEMENT
-        return props.size || _elFormItemSize.value || (ELEMENT || {}).size
+        return props.size || _elFormItemSize.value || ELEMENT.size || undefined
       })
       const buttonDisabled = computed(() => {
-        return props.disabled || (elForm || {}).disabled
+        return props.disabled || elForm.disabled
       })
 
       //methods

From e983ea1c4cfa5e3425cba0c14c361693fedc60e6 Mon Sep 17 00:00:00 2001
From: JeremyWuuuuu <591449570@qq.com>
Date: Tue, 21 Jul 2020 22:37:49 +0800
Subject: [PATCH 2/2] fix/typescripting-button-component - Add type definition
 for button component

---
 src/components/button/src/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/button/src/index.vue b/src/components/button/src/index.vue
index a8ec784e57..50e4025c7a 100644
--- a/src/components/button/src/index.vue
+++ b/src/components/button/src/index.vue
@@ -66,14 +66,14 @@ export default {
 
       // computed
       const _elFormItemSize = computed(() => {
-        return elFormItem.elFormItemSize || undefined
+        return (elFormItem || {}).elFormItemSize
       })
       const buttonSize = computed(() => {
         // todo ELEMENT
-        return props.size || _elFormItemSize.value || ELEMENT.size || undefined
+        return props.size || _elFormItemSize.value || (ELEMENT || {}).size
       })
       const buttonDisabled = computed(() => {
-        return props.disabled || elForm.disabled
+        return props.disabled || (elForm || {}).disabled
       })
 
       //methods