fix(VTooltip): allow disabling openOnClick/openOnFocus

fixes #14444
vuetifyjs · Dec 27, 2021 · 28a64c4 · 28a64c4
1 parent 79cd41d
commit 28a64c4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/packages/vuetify/src/components/VMenu/VMenu.ts b/packages/vuetify/src/components/VMenu/VMenu.ts
@@ -75,10 +75,6 @@ export default baseMixins.extend({
     },
     offsetX: Boolean,
     offsetY: Boolean,
-    openOnClick: {
-      type: Boolean,
-      default: true,
-    },
     openOnHover: Boolean,
     origin: {
       type: String,

diff --git a/packages/vuetify/src/components/VTooltip/VTooltip.ts b/packages/vuetify/src/components/VTooltip/VTooltip.ts
@@ -34,6 +34,10 @@ export default mixins(Colorable, Delayable, Dependent, Menuable, Toggleable).ext
       type: Boolean,
       default: true,
     },
+    openOnFocus: {
+      type: Boolean,
+      default: true,
+    },
     tag: {
       type: String,
       default: 'span',
@@ -157,14 +161,17 @@ export default mixins(Colorable, Delayable, Dependent, Menuable, Toggleable).ext
     genActivatorListeners () {
       const listeners = Activatable.options.methods.genActivatorListeners.call(this)
 
-      listeners.focus = (e: Event) => {
-        this.getActivator(e)
-        this.runDelay('open')
-      }
-      listeners.blur = (e: Event) => {
-        this.getActivator(e)
-        this.runDelay('close')
+      if (this.openOnFocus) {
+        listeners.focus = (e: Event) => {
+          this.getActivator(e)
+          this.runDelay('open')
+        }
+        listeners.blur = (e: Event) => {
+          this.getActivator(e)
+          this.runDelay('close')
+        }
       }
+
       listeners.keydown = (e: KeyboardEvent) => {
         if (e.keyCode === keyCodes.esc) {
           this.getActivator(e)

diff --git a/packages/vuetify/src/mixins/activatable/index.ts b/packages/vuetify/src/mixins/activatable/index.ts
@@ -30,6 +30,10 @@ export default baseMixins.extend({
     },
     disabled: Boolean,
     internalActivator: Boolean,
+    openOnClick: {
+      type: Boolean,
+      default: true,
+    },
     openOnHover: Boolean,
     openOnFocus: Boolean,
   },
@@ -108,7 +112,7 @@ export default baseMixins.extend({
           this.getActivator(e)
           this.runDelay('close')
         }
-      } else {
+      } else if (this.openOnClick) {
         listeners.click = (e: MouseEvent) => {
           const activator = this.getActivator(e)
           if (activator) activator.focus()

diff --git a/packages/vuetify/src/mixins/menuable/index.ts b/packages/vuetify/src/mixins/menuable/index.ts
@@ -78,7 +78,6 @@ export default baseMixins.extend<options>().extend({
       default: 0,
     },
     offsetOverflow: Boolean,
-    openOnClick: Boolean,
     positionX: {
       type: Number,
       default: null,