From 59c25cbdbb25363ea49e4d31a66f25109da7fb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?=
 <tugcekucukoglu.860@gmail.com>
Date: Thu, 27 Apr 2023 10:14:34 +0300
Subject: [PATCH] Refactor #3889 - For SpeedDial

---
 components/lib/speeddial/SpeedDial.d.ts |  8 ++++----
 components/lib/speeddial/SpeedDial.vue  | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/components/lib/speeddial/SpeedDial.d.ts b/components/lib/speeddial/SpeedDial.d.ts
index 0cb25a052e..f67077ec5a 100644
--- a/components/lib/speeddial/SpeedDial.d.ts
+++ b/components/lib/speeddial/SpeedDial.d.ts
@@ -39,13 +39,13 @@ export interface SpeedDialPassThroughOptions {
      */
     icon?: SpeedDialPassThroughOptionType;
     /**
-     * Uses to pass attributes to the list's DOM element.
+     * Uses to pass attributes to the menu's DOM element.
      */
-    list?: SpeedDialPassThroughOptionType;
+    menu?: SpeedDialPassThroughOptionType;
     /**
-     * Uses to pass attributes to the item's DOM element.
+     * Uses to pass attributes to the menu item's DOM element.
      */
-    item?: SpeedDialPassThroughOptionType;
+    menuitem?: SpeedDialPassThroughOptionType;
     /**
      * Uses to pass attributes to the action's DOM element.
      */
diff --git a/components/lib/speeddial/SpeedDial.vue b/components/lib/speeddial/SpeedDial.vue
index 4c0ae13c18..9409dc53a3 100644
--- a/components/lib/speeddial/SpeedDial.vue
+++ b/components/lib/speeddial/SpeedDial.vue
@@ -22,9 +22,18 @@
                 </template>
             </SDButton>
         </slot>
-        <ul :ref="listRef" :id="id + '_list'" class="p-speeddial-list" role="menu" @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" :aria-activedescendant="focused ? focusedOptionId : undefined" tabindex="-1" v-bind="ptm('list')">
+        <ul :ref="listRef" :id="id + '_list'" class="p-speeddial-list" role="menu" @focus="onFocus" @blur="onBlur" @keydown="onKeyDown" :aria-activedescendant="focused ? focusedOptionId : undefined" tabindex="-1" v-bind="ptm('menu')">
             <template v-for="(item, index) of model" :key="index">
-                <li v-if="isItemVisible(item)" :id="`${id}_${index}`" :aria-controls="`${id}_item`" class="p-speeddial-item" :class="itemClass(`${id}_${index}`)" :style="getItemStyle(index)" role="menuitem" v-bind="ptm('item')">
+                <li
+                    v-if="isItemVisible(item)"
+                    :id="`${id}_${index}`"
+                    :aria-controls="`${id}_item`"
+                    class="p-speeddial-item"
+                    :class="itemClass(`${id}_${index}`)"
+                    :style="getItemStyle(index)"
+                    role="menuitem"
+                    v-bind="ptm('menuitem', { activeDescendant: focused ? focusedOptionId : undefined })"
+                >
                     <template v-if="!$slots.item">
                         <a
                             v-tooltip:[tooltipOptions]="{ value: item.label, disabled: !tooltipOptions }"
@@ -36,7 +45,7 @@
                             :target="item.target"
                             @click="onItemClick($event, item)"
                             :aria-label="item.label"
-                            v-bind="ptm('action')"
+                            v-bind="ptm('action', { activeDescendant: focused ? focusedOptionId : undefined })"
                         >
                             <span v-if="item.icon" :class="['p-speeddial-action-icon', item.icon]" v-bind="ptm('actionIcon')"></span>
                         </a>