fix(VDialog/VMenu): enable pointer-events for disabled menu/dialog ac…

…tivator fixes #5472
vuetifyjs · Nov 19, 2018 · 7fd37bf · 7fd37bf
1 parent 3242321
commit 7fd37bf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/packages/vuetify/src/components/VDialog/VDialog.js b/packages/vuetify/src/components/VDialog/VDialog.js
@@ -203,10 +203,10 @@ export default {
         'class': {
           'v-dialog__activator--disabled': this.disabled
         },
-        on: {
+        on: this.disabled ? {} : {
           click: e => {
             e.stopPropagation()
-            if (!this.disabled) this.isActive = !this.isActive
+            this.isActive = !this.isActive
           }
         }
       }, [this.$slots.activator]))

diff --git a/packages/vuetify/src/components/VMenu/mixins/menu-generators.js b/packages/vuetify/src/components/VMenu/mixins/menu-generators.js
@@ -14,11 +14,13 @@ export default {
         on: {}
       }
 
-      if (this.openOnHover) {
-        options.on['mouseenter'] = this.mouseEnterHandler
-        options.on['mouseleave'] = this.mouseLeaveHandler
-      } else if (this.openOnClick) {
-        options.on['click'] = this.activatorClickHandler
+      if (!this.disabled) {
+        if (this.openOnHover) {
+          options.on['mouseenter'] = this.mouseEnterHandler
+          options.on['mouseleave'] = this.mouseLeaveHandler
+        } else if (this.openOnClick) {
+          options.on['click'] = this.activatorClickHandler
+        }
       }
 
       return this.$createElement('div', options, this.$slots.activator)

diff --git a/packages/vuetify/src/stylus/components/_dialogs.styl b/packages/vuetify/src/stylus/components/_dialogs.styl
@@ -33,9 +33,6 @@
     *
       cursor: pointer
 
-    &--disabled
-      pointer-events: none
-
   &__container
     display: inline-block
     vertical-align: middle

diff --git a/packages/vuetify/src/stylus/components/_menus.styl b/packages/vuetify/src/stylus/components/_menus.styl
@@ -17,9 +17,6 @@
     *
       cursor: pointer
 
-    &--disabled
-      pointer-events: none
-
   &__content
     position: absolute
     display: inline-block