From be2365bfeff31c98c98c109bf318c6c575ba26b1 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Tue, 31 Aug 2021 14:18:37 +0300
Subject: [PATCH] Fixed #1489 - Add tooltipOptions property to SpeedDial

---
 src/components/speeddial/SpeedDial.d.ts |  1 +
 src/components/speeddial/SpeedDial.vue  |  7 ++++---
 src/components/tooltip/Tooltip.js       | 24 ++++++++++++++++++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/speeddial/SpeedDial.d.ts b/src/components/speeddial/SpeedDial.d.ts
index 2b9fa64f0..1ef430b85 100644
--- a/src/components/speeddial/SpeedDial.d.ts
+++ b/src/components/speeddial/SpeedDial.d.ts
@@ -18,6 +18,7 @@ interface SpeedDialProps {
     rotateAnimation?: boolean;
     class?: string;
     style?: any;
+    tooltipOptions?: any;
 }
 
 declare class SpeedDial {
diff --git a/src/components/speeddial/SpeedDial.vue b/src/components/speeddial/SpeedDial.vue
index d64d9f10e..f2bdb40d0 100644
--- a/src/components/speeddial/SpeedDial.vue
+++ b/src/components/speeddial/SpeedDial.vue
@@ -6,8 +6,8 @@
         <ul :ref="listRef" class="p-speeddial-list" role="menu">
             <li v-for="(item, index) of model" :key="index" class="p-speeddial-item" :style="getItemStyle(index)" role="none">
                 <template v-if="!$slots.item">
-                    <a :href="item.url || '#'" role="menuitem" :class="['p-speeddial-action', { 'p-disabled': item.disabled }]" :target="item.target" 
-                        :data-pr-tooltip="item.label" @click="onItemClick($event, item)" v-ripple>
+                    <a :href="item.url || '#'" role="menuitem" :class="['p-speeddial-action', { 'p-disabled': item.disabled }]" :target="item.target"
+                        v-tooltip:[tooltipOptions]="{value: item.label, disabled: !tooltipOptions}" @click="onItemClick($event, item)" v-ripple>
                         <span v-if="item.icon" :class="['p-speeddial-action-icon', item.icon]"></span>
                     </a>
                 </template>
@@ -73,6 +73,7 @@ export default {
             type: Boolean,
             default: true
         },
+        tooltipOptions: null,
         style: null,
         class: null
     },
@@ -375,4 +376,4 @@ export default {
 .p-speeddial-direction-right .p-speeddial-list {
     flex-direction: row;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tooltip/Tooltip.js b/src/components/tooltip/Tooltip.js
index 5eabdf6cb..8ffa424db 100755
--- a/src/components/tooltip/Tooltip.js
+++ b/src/components/tooltip/Tooltip.js
@@ -241,10 +241,27 @@ function getTarget(el) {
     return DomHandler.hasClass(el, 'p-inputwrapper') ? DomHandler.findSingle(el, 'input'): el;
 }
 
+function getModifiers(options) {
+    // modifiers
+    if (options.modifiers && Object.keys(options.modifiers).length) {
+        return options.modifiers;
+    }
+
+    // arg
+    if (options.arg && typeof options.arg === 'object') {
+        return Object.entries(options.arg).reduce((acc, [key, val]) => {
+            if (key === 'event' || key === 'position') acc[val] = true;
+            return acc;
+        }, {});
+    }
+
+    return {};
+}
+
 const Tooltip = {
     beforeMount(el, options) {
         let target = getTarget(el);
-        target.$_ptooltipModifiers = options.modifiers;
+        target.$_ptooltipModifiers = getModifiers(options);
         if (typeof options.value === 'string') {
             target.$_ptooltipValue = options.value;
             target.$_ptooltipDisabled = false;
@@ -271,7 +288,7 @@ const Tooltip = {
     },
     updated(el, options) {
         let target = getTarget(el);
-        target.$_ptooltipModifiers = options.modifiers;
+        target.$_ptooltipModifiers = getModifiers(options);
 
         if (typeof options.value === 'string') {
             target.$_ptooltipValue = options.value;
@@ -281,8 +298,7 @@ const Tooltip = {
             target.$_ptooltipValue = options.value.value;
             target.$_ptooltipDisabled = options.value.disabled;
         }
-    },
-
+    }
 };
 
 export default Tooltip;