fix(detachable): check for non-scoped activator slot first

vuetifyjs · Jan 31, 2019 · 4fe2d02 · 4fe2d02
1 parent 9856ed6
commit 4fe2d02
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/packages/vuetify/src/components/VDialog/VDialog.js b/packages/vuetify/src/components/VDialog/VDialog.js
@@ -192,7 +192,7 @@ export default {
         }
       }
 
-      if (this.$scopedSlots.activator) {
+      if (this.$scopedSlots.activator && !this.$slots.activator) {
         const activator = this.$scopedSlots.activator({ on: listeners })
         this.activatorNode = activator
         return activator

diff --git a/packages/vuetify/src/components/VMenu/mixins/menu-generators.js b/packages/vuetify/src/components/VMenu/mixins/menu-generators.js
@@ -15,12 +15,6 @@ export default {
         }
       }
 
-      if (this.$scopedSlots.activator) {
-        const activator = this.$scopedSlots.activator({ on: listeners })
-        this.activatorNode = activator
-        return activator
-      }
-
       if (this.$slots.activator) {
         const options = {
           staticClass: 'v-menu__activator',
@@ -33,6 +27,10 @@ export default {
         }
 
         return this.$createElement('div', options, this.$slots.activator)
+      } else if (this.$scopedSlots.activator) {
+        const activator = this.$scopedSlots.activator({ on: listeners })
+        this.activatorNode = activator
+        return activator
       }
     },
 

diff --git a/packages/vuetify/src/components/VTooltip/VTooltip.js b/packages/vuetify/src/components/VTooltip/VTooltip.js
@@ -163,16 +163,15 @@ export default {
         }
       }
 
-      if (this.$scopedSlots.activator) {
-        const activator = this.$scopedSlots.activator({ on: listeners })
-        this.activatorNode = activator
-        return activator
-      }
       if (this.$slots.activator) {
         return this.$createElement('span', {
           on: listeners,
           ref: 'activator'
         }, this.$slots.activator)
+      } else if (this.$scopedSlots.activator) {
+        const activator = this.$scopedSlots.activator({ on: listeners })
+        this.activatorNode = activator
+        return activator
       }
     }
   },