fix(MdMenuItem): fix router (#1474)

fix #1471
vuematerial · Feb 5, 2018 · eb6c8df · eb6c8df
1 parent 1286120
commit eb6c8df
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/src/components/MdList/MdListItem/MdListItem.vue b/src/components/MdList/MdListItem/MdListItem.vue
@@ -44,6 +44,10 @@
       return MdListItemExpand
     }
 
+    if (props.disabled) {
+      return MdListItemButton
+    }
+
     if (isRouterLink(parent, props)) {
       MdListItemRouter.props = MdRouterLinkProps(parent, {
         target: String

diff --git a/src/components/MdMenu/MdMenuItem.vue b/src/components/MdMenu/MdMenuItem.vue
@@ -26,21 +26,31 @@
         }
       }
     },
+    methods: {
+      closeMenu () {
+        this.MdMenu.active = false
+
+        if (this.MdMenu.eventObserver) {
+          this.MdMenu.eventObserver.destroy()
+        }
+      },
+
+      triggerCloseMenu () {
+        if (!this.disabled) {
+          this.closeMenu()
+        }
+      }
+    },
     created () {
       if (this.MdMenu.closeOnSelect) {
         let listenerNames = Object.keys(this.$listeners)
-        let hasInteraction = false
 
         listenerNames.forEach(listener => {
           if (MdInteractionEvents.includes(listener)) {
             this.listeners[listener] = $event => {
               if (!this.disabled) {
                 this.$listeners[listener]($event)
-                this.MdMenu.active = false
-
-                if (this.MdMenu.eventObserver) {
-                  this.MdMenu.eventObserver.destroy()
-                }
+                this.closeMenu()
               }
             }
           } else {
@@ -50,6 +60,19 @@
       } else {
         this.listeners = this.$listeners
       }
+    },
+    mounted () {
+      if (this.$el.children && this.$el.children[0]) {
+        let listItem = this.$el.children[0]
+
+        if (listItem.tagName.toUpperCase() === 'A') {
+          this.$el.addEventListener('click', this.triggerCloseMenu)
+        }
+      }
+    },
+
+    beforeDestroy () {
+      this.$el.removeEventListener('click', this.triggerCloseMenu)
     }
   })
 </script>