From 32f02bef0b170997ec10416882fb80ebba7fdf83 Mon Sep 17 00:00:00 2001
From: bastarder <jie.qian@blockheaders.com>
Date: Tue, 11 Aug 2020 13:45:14 +0800
Subject: [PATCH] feat(collapse): add transition package

fix #108
---
 packages/collapse/package.json                    |  5 +++--
 packages/collapse/src/collapse-item.vue           | 10 +++++-----
 .../collapse-transition/index.vue}                |  2 +-
 packages/transition/package.json                  | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)
 rename packages/{transitions/collapse-transition.vue => transition/collapse-transition/index.vue} (97%)
 create mode 100644 packages/transition/package.json

diff --git a/packages/collapse/package.json b/packages/collapse/package.json
index b6f7522caf..fc53389dbc 100644
--- a/packages/collapse/package.json
+++ b/packages/collapse/package.json
@@ -4,7 +4,8 @@
   "main": "dist/index.js",
   "license": "MIT",
   "dependencies": {
-    "mitt": "^2.1.0"
+    "mitt": "^2.1.0",
+    "@element-plus/utils": "^0.0.0"
   },
   "peerDependencies": {
     "vue": "^3.0.0-rc.1"
@@ -12,4 +13,4 @@
   "devDependencies": {
     "@vue/test-utils": "^2.0.0-beta.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/collapse/src/collapse-item.vue b/packages/collapse/src/collapse-item.vue
index 711f99fde9..ced73683c0 100644
--- a/packages/collapse/src/collapse-item.vue
+++ b/packages/collapse/src/collapse-item.vue
@@ -13,7 +13,7 @@
         :id="`el-collapse-head-${id}`"
         class="el-collapse-item__header"
         role="button"
-        :tabindex="disabled ? undefined : 0"
+        :tabindex="disabled ? -1 : 0"
         :class="{
           'focusing': focusing,
           'is-active': isActive
@@ -50,8 +50,8 @@
 <script lang='ts'>
 import { defineComponent, PropType, inject, computed, ref } from 'vue'
 import { CollapseProvider } from './collapse.vue'
-import { generateId } from '../../utils/util'
-import ElCollapseTransition from '../../transitions/collapse-transition.vue'
+import { generateId } from '@element-plus/utils/util'
+import ElCollapseTransition from '@element-plus/transition/collapse-transition/index.vue'
 
 export default defineComponent({
   name: 'ElCollapseItem',
@@ -98,13 +98,13 @@ export default defineComponent({
 
     const handleHeaderClick = () => {
       if(props.disabled) return
-      collapseMitt && collapseMitt.emit('item-click', props.name)
+      collapseMitt?.emit('item-click', props.name)
       focusing.value = false
       isClick.value = true
     }
 
     const handleEnterClick = () => {
-      collapseMitt && collapseMitt.emit('item-click', props.name)
+      collapseMitt?.emit('item-click', props.name)
     }
 
     return {
diff --git a/packages/transitions/collapse-transition.vue b/packages/transition/collapse-transition/index.vue
similarity index 97%
rename from packages/transitions/collapse-transition.vue
rename to packages/transition/collapse-transition/index.vue
index f3d54657e8..790ad88d55 100644
--- a/packages/transitions/collapse-transition.vue
+++ b/packages/transition/collapse-transition/index.vue
@@ -5,7 +5,7 @@
   </transition>
 </template>
 <script lang='ts'>
-import { addClass, removeClass } from '../utils/dom'
+import { addClass, removeClass } from '@element-plus/utils/dom'
 
 export default {
   name: 'ElCollapseTransition',
diff --git a/packages/transition/package.json b/packages/transition/package.json
new file mode 100644
index 0000000000..3fdf422395
--- /dev/null
+++ b/packages/transition/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@element-plus/transition",
+  "version": "0.0.0",
+  "main": "dist/index.js",
+  "license": "MIT",
+  "dependencies": {
+    "@element-plus/utils": "^0.0.0"
+  },
+  "peerDependencies": {
+    "vue": "^3.0.0-rc.1"
+  },
+  "devDependencies": {
+    "@vue/test-utils": "^2.0.0-beta.0"
+  }
+}
\ No newline at end of file