From ecf5cb7bcc80c1bac247a80d53e2ba6bf90421ee Mon Sep 17 00:00:00 2001
From: Vi Pro <VdustR@gmail.com>
Date: Thu, 29 Mar 2018 00:31:11 +0800
Subject: [PATCH] feat(MdMenu): new props mdCloseOnClick (#1630)

* feat(MdMenu): new props mdCloseOnClick

option for auto close after any click event

* docs(Menu): fix AutoClose component name

* fix(MdMenu): change mdCloseOnClick default to false
---
 docs/app/pages/Components/Menu/Menu.vue       | 14 ++++++
 .../Components/Menu/examples/AutoClose.vue    | 41 +++++++++++++++++
 src/components/MdMenu/MdMenu.vue              | 11 +++++
 src/components/MdMenu/MdMenuContent.vue       |  3 +-
 src/components/MdMenu/MdMenuItem.vue          | 46 ++++++++++---------
 5 files changed, 93 insertions(+), 22 deletions(-)
 create mode 100644 docs/app/pages/Components/Menu/examples/AutoClose.vue

diff --git a/docs/app/pages/Components/Menu/Menu.vue b/docs/app/pages/Components/Menu/Menu.vue
index c2435dec5..2896c4cde 100644
--- a/docs/app/pages/Components/Menu/Menu.vue
+++ b/docs/app/pages/Components/Menu/Menu.vue
@@ -1,6 +1,7 @@
 <example src="./examples/Directions.vue" />
 <example src="./examples/Sizes.vue" />
 <example src="./examples/MenuAlignments.vue" />
+<example src="./examples/AutoClose.vue" />
 <example src="./examples/MultipleContent.vue" />
 
 <template>
@@ -33,6 +34,13 @@
       <note-block>The max-width of a menu is 280px.</note-block>
     </div>
 
+    <div class="page-container-section">
+      <h2>AutoClose</h2>
+
+      <p><code>md-menu</code> can be auto closed on click or select:</p>
+      <code-example title="Auto close menu on events" :component="examples['auto-close']" />
+    </div>
+
     <div class="page-container-section">
       <h2>Rich Content and Icon Alignment</h2>
 
@@ -71,6 +79,12 @@
             description: 'Used to show/hide a menu programatically.',
             defaults: 'false'
           },
+          {
+            name: 'md-close-on-click',
+            type: 'Boolean',
+            description: 'When this options is true, the menu will be closed after any click event.',
+            defaults: 'false'
+          },
           {
             name: 'md-close-on-select',
             type: 'Boolean',
diff --git a/docs/app/pages/Components/Menu/examples/AutoClose.vue b/docs/app/pages/Components/Menu/examples/AutoClose.vue
new file mode 100644
index 000000000..1c4e94422
--- /dev/null
+++ b/docs/app/pages/Components/Menu/examples/AutoClose.vue
@@ -0,0 +1,41 @@
+<template>
+  <div>
+    <div>
+      <md-checkbox :value="true" v-model="closeOnClick">closeOnClick</md-checkbox>
+      <md-checkbox :value="true" v-model="closeOnSelect">closeOnSelect</md-checkbox>
+    </div>
+    <div>
+      <md-menu md-direction="bottom-end" :mdCloseOnClick="closeOnClick" :mdCloseOnSelect="closeOnSelect">
+        <md-button md-menu-trigger>Bottom End</md-button>
+
+        <md-menu-content>
+          <md-menu-item disabled @click="data = 'click disabled'">Disabled</md-menu-item>
+          <md-menu-item @click="data = 'click 1'">Click Event 1</md-menu-item>
+          <md-menu-item @click="data = 'click 2'">Click Event 2</md-menu-item>
+          <md-menu-item>Plain text</md-menu-item>
+        </md-menu-content>
+      </md-menu>
+    </div>
+    <div>{{data}}</div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'AutoClose',
+
+    data () {
+      return {
+        data: '',
+        closeOnClick: false,
+        closeOnSelect: true
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .md-menu {
+    margin: 24px;
+  }
+</style>
diff --git a/src/components/MdMenu/MdMenu.vue b/src/components/MdMenu/MdMenu.vue
index 897876f75..f908e8104 100644
--- a/src/components/MdMenu/MdMenu.vue
+++ b/src/components/MdMenu/MdMenu.vue
@@ -30,6 +30,10 @@
         type: Boolean,
         default: true
       },
+      mdCloseOnClick: {
+        type: Boolean,
+        default: false
+      },
       mdSize: {
         type: String,
         default: 'small',
@@ -56,6 +60,7 @@
           fullWidth: this.mdFullWidth,
           dense: this.mdDense,
           closeOnSelect: this.mdCloseOnSelect,
+          closeOnClick: this.mdCloseOnClick,
           bodyClickObserver: null,
           windowResizeObserver: null,
           $el: this.$el
@@ -102,6 +107,12 @@
         } else {
           this.$emit('md-opened')
         }
+      },
+      mdCloseOnSelect () {
+        this.MdMenu.closeOnSelect  = this.mdCloseOnSelect
+      },
+      mdCloseOnClick () {
+        this.MdMenu.closeOnClick  = this.mdCloseOnClick
       }
     },
     methods: {
diff --git a/src/components/MdMenu/MdMenuContent.vue b/src/components/MdMenu/MdMenuContent.vue
index 954132dfb..c90e8b983 100644
--- a/src/components/MdMenu/MdMenuContent.vue
+++ b/src/components/MdMenu/MdMenuContent.vue
@@ -199,7 +199,8 @@
             $event.stopPropagation()
             let isMdMenu = this.MdMenu.$el ? this.MdMenu.$el.contains($event.target) : false
             let isMenuContentEl = this.$refs.menu ? this.$refs.menu.contains($event.target) : false
-            if (!this.$el.contains($event.target) && !isMdMenu && !isMenuContentEl) {
+            let onBackdropExpectMenu = !this.$el.contains($event.target) && !isMenuContentEl
+            if (!isMdMenu && (this.MdMenu.closeOnClick || onBackdropExpectMenu)) {
               this.MdMenu.active = false
               this.MdMenu.bodyClickObserver.destroy()
               this.MdMenu.windowResizeObserver.destroy()
diff --git a/src/components/MdMenu/MdMenuItem.vue b/src/components/MdMenu/MdMenuItem.vue
index 1c8993ff4..0e3e3f7ba 100644
--- a/src/components/MdMenu/MdMenuItem.vue
+++ b/src/components/MdMenu/MdMenuItem.vue
@@ -16,7 +16,6 @@
     },
     inject: ['MdMenu'],
     data: () => ({
-      listeners: {},
       highlighted: false
     }),
     computed: {
@@ -24,6 +23,31 @@
         return {
           'md-highlight': this.highlighted
         }
+      },
+      listeners () {
+        if (this.disabled) {
+          return {}
+        }
+
+        if (!this.MdMenu.closeOnSelect) {
+          return this.$listeners
+        }
+
+        let listeners = {}
+        let listenerNames = Object.keys(this.$listeners)
+
+        listenerNames.forEach(listener => {
+          if (MdInteractionEvents.includes(listener)) {
+            listeners[listener] = $event => {
+              this.$listeners[listener]($event)
+              this.closeMenu()
+            }
+          } else {
+            listeners[listener] = this.$listeners[listener]
+          }
+        })
+
+        return listeners
       }
     },
     methods: {
@@ -41,26 +65,6 @@
         }
       }
     },
-    created () {
-      if (this.MdMenu.closeOnSelect) {
-        let listenerNames = Object.keys(this.$listeners)
-
-        listenerNames.forEach(listener => {
-          if (MdInteractionEvents.includes(listener)) {
-            this.listeners[listener] = $event => {
-              if (!this.disabled) {
-                this.$listeners[listener]($event)
-                this.closeMenu()
-              }
-            }
-          } else {
-            this.listeners[listener] = this.$listeners[listener]
-          }
-        })
-      } else {
-        this.listeners = this.$listeners
-      }
-    },
     mounted () {
       if (this.$el.children && this.$el.children[0]) {
         let listItem = this.$el.children[0]