From 527f3bdbe94e4bd8f48c52b05deb6b597b76f235 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Thu, 20 Jul 2017 18:39:12 +0800
Subject: [PATCH] Menu: compensate for Vue regression

---
 packages/menu/src/menu-mixin.js | 11 ++++++++++-
 packages/menu/src/menu.vue      |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/menu/src/menu-mixin.js b/packages/menu/src/menu-mixin.js
index 9556d5556..56479bbbb 100644
--- a/packages/menu/src/menu-mixin.js
+++ b/packages/menu/src/menu-mixin.js
@@ -1,5 +1,4 @@
 export default {
-  inject: ['rootMenu'],
   computed: {
     indexPath() {
       var path = [this.index];
@@ -12,6 +11,16 @@ export default {
       }
       return path;
     },
+    rootMenu() {
+      var parent = this.$parent;
+      while (
+        parent &&
+        parent.$options.componentName !== 'ElMenu'
+      ) {
+        parent = parent.$parent;
+      }
+      return parent;
+    },
     parentMenu() {
       let parent = this.$parent;
       while (
diff --git a/packages/menu/src/menu.vue b/packages/menu/src/menu.vue
index c79249f61..d1ba47729 100644
--- a/packages/menu/src/menu.vue
+++ b/packages/menu/src/menu.vue
@@ -1,7 +1,7 @@
 <template>
   <el-menu-collapse-transition>
     <ul class="el-menu"
-      :key="collapse"
+      :key="+collapse"
       :class="{
         'el-menu--horizontal': mode === 'horizontal',
         'el-menu--dark': theme === 'dark',