From 37f43958e1d6e95da725351470578d2df9672cf0 Mon Sep 17 00:00:00 2001
From: balajidharma <balajidharma@hotmail.com>
Date: Tue, 13 Jun 2023 22:56:35 -0400
Subject: [PATCH] Fixed active menu issue #24

---
 resources/js/Components/AsideMenuItem.vue | 23 ++++++++++++++++++-----
 resources/js/Components/AsideMenuList.vue |  7 ++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/resources/js/Components/AsideMenuItem.vue b/resources/js/Components/AsideMenuItem.vue
index dcc1968..846027c 100644
--- a/resources/js/Components/AsideMenuItem.vue
+++ b/resources/js/Components/AsideMenuItem.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue'
-import { Link } from '@inertiajs/vue3'
+import { Link, usePage } from '@inertiajs/vue3'
 import { useStyleStore } from '@/Stores/style.js'
 import { mdiMinus, mdiPlus } from '@mdi/js'
 import { getButtonColor } from '@/colors.js'
@@ -15,9 +15,11 @@ const props = defineProps({
   isDropdownList: Boolean,
 })
 
+const { url, component } = usePage()
+
 const itemHref = computed(() => (props.item && props.item.link) ? props.item.link : '')
 
-const emit = defineEmits(['menu-click'])
+const emit = defineEmits(['menu-click', 'dropdown-active'])
 
 const styleStore = useStyleStore()
 
@@ -46,10 +48,20 @@ const menuClick = event => {
   }
 }
 
+const dropdownActive = value => {
+  isDropdownActive.value = value;
+}
+
 const activeInactiveStyle = computed(
-  () => props.item.route && route().current(props.item.route)
-    ? styleStore.asideMenuItemActiveStyle
-    : ''
+  () => {
+    if(props.item.link && url === props.item.link) {
+      emit('dropdown-active', true)
+      return styleStore.asideMenuItemActiveStyle
+    }
+    else {
+      return ''
+    }
+  }
 )
 </script>
 
@@ -88,6 +100,7 @@ const activeInactiveStyle = computed(
       :menu="item.children"
       :class="[ styleStore.asideMenuDropdownStyle, isDropdownActive ? 'block dark:bg-slate-800/50' : 'hidden' ]"
       is-dropdown-list
+      @dropdown-active="dropdownActive"
     />
   </li>
 </template>
diff --git a/resources/js/Components/AsideMenuList.vue b/resources/js/Components/AsideMenuList.vue
index 0bce67a..b4113c3 100644
--- a/resources/js/Components/AsideMenuList.vue
+++ b/resources/js/Components/AsideMenuList.vue
@@ -9,11 +9,15 @@ defineProps({
   }
 })
 
-const emit = defineEmits(['menu-click'])
+const emit = defineEmits(['menu-click', 'dropdown-active'])
 
 const menuClick = (event, item) => {
   emit('menu-click', event, item)
 }
+
+const dropdownActive = value => {
+  emit('dropdown-active', value)
+}
 </script>
 
 <template>
@@ -24,6 +28,7 @@ const menuClick = (event, item) => {
       :item="item"
       :is-dropdown-list="isDropdownList"
       @menu-click="menuClick"
+      @dropdown-active="dropdownActive"
     />
   </ul>
 </template>