From be33e737a13c6b6766a1c6bc44d2651989529576 Mon Sep 17 00:00:00 2001
From: tugcekucukoglu <tugcekucukoglu.860@gmail.com>
Date: Wed, 8 Nov 2023 15:48:47 +0300
Subject: [PATCH] Refactor #4739 - For Menu

---
 components/lib/menu/BaseMenu.vue       |  4 ----
 components/lib/menu/Menu.d.ts          |  1 +
 components/lib/menu/Menu.vue           | 13 ++-----------
 components/lib/menu/Menuitem.vue       | 14 ++------------
 components/lib/menu/style/MenuStyle.js |  8 +-------
 5 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/components/lib/menu/BaseMenu.vue b/components/lib/menu/BaseMenu.vue
index 62767bb8f..a98cdefce 100644
--- a/components/lib/menu/BaseMenu.vue
+++ b/components/lib/menu/BaseMenu.vue
@@ -26,10 +26,6 @@ export default {
             type: Number,
             default: 0
         },
-        exact: {
-            type: Boolean,
-            default: true
-        },
         tabindex: {
             type: Number,
             default: 0
diff --git a/components/lib/menu/Menu.d.ts b/components/lib/menu/Menu.d.ts
index e8b59aab4..c46aef37b 100755
--- a/components/lib/menu/Menu.d.ts
+++ b/components/lib/menu/Menu.d.ts
@@ -210,6 +210,7 @@ export interface MenuProps {
     baseZIndex?: number | undefined;
     /**
      * Whether to apply 'router-link-active-exact' class if route exactly matches the item path.
+     * @deprecated since v3.40.0.
      * @defaultValue true
      */
     exact?: boolean | undefined;
diff --git a/components/lib/menu/Menu.vue b/components/lib/menu/Menu.vue
index 0088a0b7b..99728ee91 100644
--- a/components/lib/menu/Menu.vue
+++ b/components/lib/menu/Menu.vue
@@ -25,12 +25,12 @@
                                 <slot name="submenuheader" :item="item">{{ label(item) }}</slot>
                             </li>
                             <template v-for="(child, j) of item.items" :key="child.label + i + '_' + j">
-                                <PVMenuitem v-if="visible(child) && !child.separator" :id="id + '_' + i + '_' + j" :item="child" :templates="$slots" :exact="exact" :focusedOptionId="focusedOptionId" @item-click="itemClick" :pt="pt" />
+                                <PVMenuitem v-if="visible(child) && !child.separator" :id="id + '_' + i + '_' + j" :item="child" :templates="$slots" :focusedOptionId="focusedOptionId" @item-click="itemClick" :pt="pt" />
                                 <li v-else-if="visible(child) && child.separator" :key="'separator' + i + j" :class="[cx('separator'), item.class]" :style="child.style" role="separator" v-bind="ptm('separator')"></li>
                             </template>
                         </template>
                         <li v-else-if="visible(item) && item.separator" :key="'separator' + i.toString()" :class="[cx('separator'), item.class]" :style="item.style" role="separator" v-bind="ptm('separator')"></li>
-                        <PVMenuitem v-else :key="label(item) + i.toString()" :id="id + '_' + i" :item="item" :index="i" :templates="$slots" :exact="exact" :focusedOptionId="focusedOptionId" @item-click="itemClick" :pt="pt" />
+                        <PVMenuitem v-else :key="label(item) + i.toString()" :id="id + '_' + i" :item="item" :index="i" :templates="$slots" :focusedOptionId="focusedOptionId" @item-click="itemClick" :pt="pt" />
                     </template>
                 </ul>
                 <div v-if="$slots.end" :class="cx('end')" v-bind="ptm('end')">
@@ -73,11 +73,6 @@ export default {
     resizeListener: null,
     container: null,
     list: null,
-    beforeMount() {
-        if (!this.$slots.item) {
-            console.warn('In future versions, vue-router support will be removed. Item templating should be used.');
-        }
-    },
     mounted() {
         this.id = this.id || UniqueComponentId();
 
@@ -115,10 +110,6 @@ export default {
                 item.command(event);
             }
 
-            if (item.to && event.navigate) {
-                event.navigate(event.originalEvent);
-            }
-
             if (this.overlayVisible) this.hide();
 
             if (!this.popup && this.focusedOptionIndex !== event.id) {
diff --git a/components/lib/menu/Menuitem.vue b/components/lib/menu/Menuitem.vue
index 54f65f44b..dd9c9f66d 100644
--- a/components/lib/menu/Menuitem.vue
+++ b/components/lib/menu/Menuitem.vue
@@ -13,14 +13,7 @@
     >
         <div :class="cx('content')" @click="onItemClick($event)" v-bind="getPTOptions('content')">
             <template v-if="!templates.item">
-                <router-link v-if="item.to && !disabled()" v-slot="{ navigate, href, isActive, isExactActive }" :to="item.to" custom>
-                    <a v-ripple :href="href" :class="cx('action', { isActive, isExactActive })" tabindex="-1" aria-hidden="true" @click="onItemActionClick($event, navigate)" v-bind="getPTOptions('action')">
-                        <component v-if="templates.itemicon" :is="templates.itemicon" :item="item" :class="[cx('icon'), item.icon]" />
-                        <span v-else-if="item.icon" :class="[cx('icon'), item.icon]" v-bind="getPTOptions('icon')" />
-                        <span :class="cx('label')" v-bind="getPTOptions('label')">{{ label() }}</span>
-                    </a>
-                </router-link>
-                <a v-else v-ripple :href="item.url" :class="cx('action')" :target="item.target" tabindex="-1" aria-hidden="true" v-bind="getPTOptions('action')">
+                <a v-ripple :href="item.url" :class="cx('action')" :target="item.target" tabindex="-1" aria-hidden="true" v-bind="getPTOptions('action')">
                     <component v-if="templates.itemicon" :is="templates.itemicon" :item="item" :class="[cx('icon'), item.icon]" />
                     <span v-else-if="item.icon" :class="[cx('icon'), item.icon]" v-bind="getPTOptions('icon')" />
                     <span :class="cx('label')" v-bind="getPTOptions('label')">{{ label() }}</span>
@@ -46,7 +39,7 @@ export default {
     props: {
         item: null,
         templates: null,
-        exact: null,
+
         id: null,
         focusedOptionId: null,
         index: null
@@ -68,9 +61,6 @@ export default {
         isItemFocused() {
             return this.focusedOptionId === this.id;
         },
-        onItemActionClick(event, navigate) {
-            navigate && navigate(event);
-        },
         onItemClick(event) {
             const command = this.getItemProp(this.item, 'command');
 
diff --git a/components/lib/menu/style/MenuStyle.js b/components/lib/menu/style/MenuStyle.js
index 7b483cd22..798d5a748 100644
--- a/components/lib/menu/style/MenuStyle.js
+++ b/components/lib/menu/style/MenuStyle.js
@@ -45,13 +45,7 @@ const classes = {
         }
     ],
     content: 'p-menuitem-content',
-    action: ({ props, isActive, isExactActive }) => [
-        'p-menuitem-link',
-        {
-            'router-link-active': isActive,
-            'router-link-active-exact': props.exact && isExactActive
-        }
-    ],
+    action: 'p-menuitem-link',
     icon: 'p-menuitem-icon',
     label: 'p-menuitem-text'
 };