diff --git a/src/components/tooltip/Tooltip.js b/src/components/tooltip/Tooltip.js index 43feeeafb..8f139b3ec 100755 --- a/src/components/tooltip/Tooltip.js +++ b/src/components/tooltip/Tooltip.js @@ -299,12 +299,15 @@ const Tooltip = { target.$_ptooltipClass = null; target.$_ptooltipFitContent = true; } - else { - target.$_ptooltipValue = options.value.value; - target.$_ptooltipDisabled = options.value.disabled || false; - target.$_ptooltipEscape = options.value.escape || false; - target.$_ptooltipClass = options.value.class; - target.$_ptooltipFitContent = options.value.fitContent || true; + else if (typeof options.value === 'object' && options.value) { + if (options.value.value === undefined || options.value.value === null || options.value.value.trim() === '') return; + else { + target.$_ptooltipValue = options.value.value; + target.$_ptooltipDisabled = options.value.disabled || false; + target.$_ptooltipEscape = options.value.escape || false; + target.$_ptooltipClass = options.value.class; + target.$_ptooltipFitContent = options.value.fitContent || true; + } } target.$_ptooltipZIndex = options.instance.$primevue && options.instance.$primevue.config && options.instance.$primevue.config.zIndex.tooltip; @@ -333,11 +336,15 @@ const Tooltip = { target.$_ptooltipEscape = false; target.$_ptooltipClass = null; } - else { - target.$_ptooltipValue = options.value.value; - target.$_ptooltipDisabled = options.value.disabled || false; - target.$_ptooltipEscape = options.value.escape || false; - target.$_ptooltipClass = options.value.class; + else if (typeof options.value === 'object' && options.value) { + if (options.value.value === undefined || options.value.value === null || options.value.value.trim() === '') return; + else { + target.$_ptooltipValue = options.value.value; + target.$_ptooltipDisabled = options.value.disabled || false; + target.$_ptooltipEscape = options.value.escape || false; + target.$_ptooltipClass = options.value.class; + target.$_ptooltipFitContent = options.value.fitContent || true; + } } } };