Merge pull request #2364 from tugcekucukoglu/tooltip

Fixed #2363 - Tooltip | Escape encode enhancement
primefaces · Mar 28, 2022 · 6f48ac5 · 6f48ac5
2 parents 0124a70 + a3226ba
commit 6f48ac5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/components/tooltip/Tooltip.js b/src/components/tooltip/Tooltip.js
@@ -1,4 +1,4 @@
-import {UniqueComponentId,DomHandler,ConnectedOverlayScrollHandler,ZIndexUtils} from 'primevue/utils';
+import {UniqueComponentId,DomHandler,ConnectedOverlayScrollHandler,ZIndexUtils,ObjectUtils} from 'primevue/utils';
 
 function bindEvents(el) {
     const modifiers = el.$_ptooltipModifiers;
@@ -105,7 +105,9 @@ function create(el) {
 
     let tooltipText = document.createElement('div');
     tooltipText.className = 'p-tooltip-text';
-    tooltipText.innerHTML = el.$_ptooltipValue;
+
+    let tooltipLabel = ObjectUtils.htmlEncode(el.$_ptooltipValue);
+    tooltipText.innerHTML = tooltipLabel;
 
     container.appendChild(tooltipText);
     document.body.appendChild(container);

diff --git a/src/components/utils/ObjectUtils.js b/src/components/utils/ObjectUtils.js
@@ -204,6 +204,16 @@ export default {
         return null;
     },
 
+    htmlEncode(str){
+        if (str) {
+            return str.replace(/[^\w. ]/gi, function(c){
+                return '&#'+c.charCodeAt(0)+';';
+            });
+        }
+
+        return null;
+    },
+
     isEmpty(value) {
         return (
             value === null || value === undefined || value === '' ||