From 2d114831e091c6e3e200b32adc9b626b754c94e2 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 17 Apr 2023 08:59:08 +0300
Subject: [PATCH] Refactor #3832 Refactor #3833 - For ContextMenu

---
 components/lib/contextmenu/ContextMenu.d.ts   | 14 ++++++++++++++
 components/lib/contextmenu/ContextMenu.vue    |  2 +-
 components/lib/contextmenu/ContextMenuSub.vue | 14 +++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/components/lib/contextmenu/ContextMenu.d.ts b/components/lib/contextmenu/ContextMenu.d.ts
index cf289aab1..e44f7d71c 100755
--- a/components/lib/contextmenu/ContextMenu.d.ts
+++ b/components/lib/contextmenu/ContextMenu.d.ts
@@ -73,6 +73,20 @@ export interface ContextMenuSlots {
          */
         item: MenuItem;
     }): VNode[];
+    /**
+     * Custom item icon template.
+     * @param {Object} scope - item icon slot's params.
+     */
+    itemicon(scope: {
+        /**
+         * Menuitem instance
+         */
+        item: MenuItem;
+        /**
+         * Style class of the item icon element.
+         */
+        class: any;
+    }): VNode[];
     /**
      * Custom submenu icon template.
      */
diff --git a/components/lib/contextmenu/ContextMenu.vue b/components/lib/contextmenu/ContextMenu.vue
index 73da3e4dc..d4f78d4e6 100755
--- a/components/lib/contextmenu/ContextMenu.vue
+++ b/components/lib/contextmenu/ContextMenu.vue
@@ -14,7 +14,7 @@
                     :menuId="id"
                     :focusedItemId="focused ? focusedItemId : undefined"
                     :items="processedItems"
-                    :template="$slots"
+                    :templates="$slots"
                     :activeItemPath="activeItemPath"
                     :exact="exact"
                     :aria-labelledby="ariaLabelledby"
diff --git a/components/lib/contextmenu/ContextMenuSub.vue b/components/lib/contextmenu/ContextMenuSub.vue
index 7721f8e16..0c1a8d217 100755
--- a/components/lib/contextmenu/ContextMenuSub.vue
+++ b/components/lib/contextmenu/ContextMenuSub.vue
@@ -17,20 +17,20 @@
                     :aria-posinset="getAriaPosInset(index)"
                 >
                     <div class="p-menuitem-content" @click="onItemClick($event, processedItem)" @mouseenter="onItemMouseEnter($event, processedItem)">
-                        <template v-if="!template.item">
+                        <template v-if="!templates.item">
                             <router-link v-if="getItemProp(processedItem, 'to') && !isItemDisabled(processedItem)" v-slot="{ navigate, href, isActive, isExactActive }" :to="getItemProp(processedItem, 'to')" custom>
                                 <a v-ripple :href="href" :class="getItemActionClass(processedItem, { isActive, isExactActive })" tabindex="-1" aria-hidden="true" @click="onItemActionClick($event, navigate)">
-                                    <span v-if="getItemProp(processedItem, 'icon')" :class="getItemIconClass(processedItem)"></span>
+                                    <component :is="templates.itemicon || (getItemProp(processedItem, 'icon') ? 'span' : undefined)" :item="processedItem.item" :class="getItemIconClass(processedItem)" />
                                     <span class="p-menuitem-text">{{ getItemLabel(processedItem) }}</span>
                                 </a>
                             </router-link>
                             <a v-else v-ripple :href="getItemProp(processedItem, 'url')" :class="getItemActionClass(processedItem)" :target="getItemProp(processedItem, 'target')" tabindex="-1" aria-hidden="true">
-                                <span v-if="getItemProp(processedItem, 'icon')" :class="getItemIconClass(processedItem)"></span>
+                                <component :is="templates.itemicon || (getItemProp(processedItem, 'icon') ? 'span' : undefined)" :item="processedItem.item" :class="getItemIconClass(processedItem)" />
                                 <span class="p-menuitem-text">{{ getItemLabel(processedItem) }}</span>
-                                <component v-if="getItemProp(processedItem, 'items')" :is="template.submenuicon || 'AngleRightIcon'" :active="isItemActive(processedItem)" class="p-submenu-icon" />
+                                <component v-if="getItemProp(processedItem, 'items')" :is="templates.submenuicon || 'AngleRightIcon'" :active="isItemActive(processedItem)" class="p-submenu-icon" />
                             </a>
                         </template>
-                        <component v-else :is="template.item" :item="processedItem.item"></component>
+                        <component v-else :is="templates.item" :item="processedItem.item"></component>
                     </div>
                     <ContextMenuSub
                         v-if="isItemVisible(processedItem) && isItemGroup(processedItem)"
@@ -40,7 +40,7 @@
                         :menuId="menuId"
                         :focusedItemId="focusedItemId"
                         :items="processedItem.items"
-                        :template="template"
+                        :templates="templates"
                         :activeItemPath="activeItemPath"
                         :exact="exact"
                         :level="level + 1"
@@ -88,7 +88,7 @@ export default {
             type: Number,
             default: 0
         },
-        template: {
+        templates: {
             type: Object,
             default: null
         },