From cbb5faf1eadb1d75efb39c8e941ce8513edb2d6e 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: Wed, 5 Apr 2023 14:56:05 +0300
Subject: [PATCH] Refactor #3832 Refactor #3833 - For ContextMenu

---
 api-generator/components/contextmenu.js       |  6 +++++-
 components/lib/contextmenu/ContextMenu.d.ts   |  9 +++++++++
 components/lib/contextmenu/ContextMenu.vue    |  2 +-
 components/lib/contextmenu/ContextMenuSub.vue | 14 ++++++++++----
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/api-generator/components/contextmenu.js b/api-generator/components/contextmenu.js
index 0f77066ac..4c7030047 100644
--- a/api-generator/components/contextmenu.js
+++ b/api-generator/components/contextmenu.js
@@ -40,7 +40,11 @@ const ContextMenuProps = [
 const ContextMenuSlots = [
     {
         name: 'item',
-        description: 'Template of a menuitem.'
+        description: 'Custom item template.'
+    },
+    {
+        name: 'submenuicon',
+        description: 'Custom submenu icon template.'
     }
 ];
 
diff --git a/components/lib/contextmenu/ContextMenu.d.ts b/components/lib/contextmenu/ContextMenu.d.ts
index e47b02242..cf289aab1 100755
--- a/components/lib/contextmenu/ContextMenu.d.ts
+++ b/components/lib/contextmenu/ContextMenu.d.ts
@@ -73,6 +73,15 @@ export interface ContextMenuSlots {
          */
         item: MenuItem;
     }): VNode[];
+    /**
+     * Custom submenu icon template.
+     */
+    submenuicon(scope: {
+        /**
+         * Whether item is active
+         */
+        active: boolean;
+    }): VNode[];
 }
 
 /**
diff --git a/components/lib/contextmenu/ContextMenu.vue b/components/lib/contextmenu/ContextMenu.vue
index dca4cd1cb..73da3e4dc 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.item"
+                    :template="$slots"
                     :activeItemPath="activeItemPath"
                     :exact="exact"
                     :aria-labelledby="ariaLabelledby"
diff --git a/components/lib/contextmenu/ContextMenuSub.vue b/components/lib/contextmenu/ContextMenuSub.vue
index 1b1826e8c..64b7f195b 100755
--- a/components/lib/contextmenu/ContextMenuSub.vue
+++ b/components/lib/contextmenu/ContextMenuSub.vue
@@ -17,7 +17,7 @@
                     :aria-posinset="getAriaPosInset(index)"
                 >
                     <div class="p-menuitem-content" @click="onItemClick($event, processedItem)" @mouseenter="onItemMouseEnter($event, processedItem)">
-                        <template v-if="!template">
+                        <template v-if="!template.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>
@@ -27,10 +27,12 @@
                             <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>
                                 <span class="p-menuitem-text">{{ getItemLabel(processedItem) }}</span>
-                                <span v-if="getItemProp(processedItem, 'items')" class="p-submenu-icon pi pi-angle-right"></span>
+                                <slot v-if="getItemProp(processedItem, 'items')" name="submenuicon">
+                                    <component :is="template.submenuicon || 'AngleRightIcon'" :active="isItemActive(processedItem)" class="p-submenu-icon" />
+                                </slot>
                             </a>
                         </template>
-                        <component v-else :is="template" :item="processedItem.item"></component>
+                        <component v-else :is="template.item" :item="processedItem.item"></component>
                     </div>
                     <ContextMenuSub
                         v-if="isItemVisible(processedItem) && isItemGroup(processedItem)"
@@ -56,6 +58,7 @@
 </template>
 
 <script>
+import AngleRightIcon from 'primevue/icon/angleright';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 
@@ -88,7 +91,7 @@ export default {
             default: 0
         },
         template: {
-            type: Function,
+            type: Object,
             default: null
         },
         exact: {
@@ -189,6 +192,9 @@ export default {
             return ['p-menuitem-separator', this.getItemProp(processedItem, 'class')];
         }
     },
+    components: {
+        AngleRightIcon: AngleRightIcon
+    },
     directives: {
         ripple: Ripple
     }