Fixed #1414 - value and disabled props for Tooltip component

primefaces · Aug 6, 2021 · 9cf6404 · 9cf6404
1 parent a5acd78
commit 9cf6404
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/src/components/tooltip/Tooltip.js b/src/components/tooltip/Tooltip.js
@@ -65,7 +65,7 @@ function onClick(event) {
 }
 
 function show(el) {
-    if (!el.$_ptooltipValue) {
+    if (el.$_ptooltipDisabled) {
         return;
     }
 
@@ -75,7 +75,9 @@ function show(el) {
     tooltipElement.style.zIndex = ++DomHandler.zindex;
 
     window.addEventListener('resize', function onWindowResize() {
-        hide(el);
+        if (!DomHandler.isAndroid()) {
+            hide(el);
+        }
         this.removeEventListener('resize', onWindowResize);
     });
 
@@ -237,9 +239,16 @@ function isOutOfBounds(el) {
 }
 
 const Tooltip = {
-    bind(el, options) {
+    bind(el, options) {console.log(options)
         el.$_ptooltipModifiers = options.modifiers;
-        el.$_ptooltipValue = options.value;
+        if (typeof options.value === 'string') {
+            el.$_ptooltipValue = options.value;
+            el.$_ptooltipDisabled = false;
+        }
+        else {
+            el.$_ptooltipValue = options.value.value;
+            el.$_ptooltipDisabled = options.value.disabled || false;
+        }
         bindEvents(el);
     },
     unbind(el) {
@@ -253,7 +262,15 @@ const Tooltip = {
     },
     update(el, options) {
         el.$_ptooltipModifiers = options.modifiers;
-        el.$_ptooltipValue = options.value;
+
+        if (typeof options.value === 'string') {
+            el.$_ptooltipValue = options.value;
+            el.$_ptooltipDisabled = false;
+        }
+        else {
+            el.$_ptooltipValue = options.value.value;
+            el.$_ptooltipDisabled = options.value.disabled;
+        }
     }
 };
 

diff --git a/src/views/tooltip/TooltipDoc.vue b/src/views/tooltip/TooltipDoc.vue
@@ -22,6 +22,13 @@ directives: {
 <template v-pre>
 &lt;InputText type="text" v-tooltip="'Enter your username'" /&gt;
 </template>
+</CodeHighlight>
+
+                <p>Also, more than one value can be used.</p>
+<CodeHighlight>
+<template v-pre>
+&lt;InputText type="text" v-tooltip="{ value: 'Enter your username', disabled: true }" /&gt;
+</template>
 </CodeHighlight>
 
 				<h5>Positions</h5>