From c8f92b010227945503f659bf6cdbe2f5dcd867e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bahad=C4=B1r=20Sofuo=C4=9Flu?= <bahadirsofuoglu@gmail.com>
Date: Mon, 7 Nov 2022 16:03:17 +0300
Subject: [PATCH] refactor

---
 src/layout/AppConfig.vue   |  3 ---
 src/layout/AppMenu.vue     |  7 +------
 src/layout/AppMenuItem.vue | 17 ++++++++++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/layout/AppConfig.vue b/src/layout/AppConfig.vue
index 9a54119..db6da98 100644
--- a/src/layout/AppConfig.vue
+++ b/src/layout/AppConfig.vue
@@ -10,7 +10,6 @@ const { changeThemeSettings, setScale, layoutConfig } = useLayoutService();
 const onConfigButtonClick = () => {
     visible.value = !visible.value;
 };
-
 const onChangeTheme = (theme, mode) => {
     const elementId = 'theme-css';
     const linkElement = document.getElementById(elementId);
@@ -26,12 +25,10 @@ const onChangeTheme = (theme, mode) => {
 
     changeThemeSettings(theme, mode === 'dark');
 };
-
 const decrementScale = () => {
     setScale(layoutConfig.scale.value - 1);
     applyScale();
 };
-
 const incrementScale = () => {
     setScale(layoutConfig.scale.value + 1);
     applyScale();
diff --git a/src/layout/AppMenu.vue b/src/layout/AppMenu.vue
index 989604d..66588b8 100644
--- a/src/layout/AppMenu.vue
+++ b/src/layout/AppMenu.vue
@@ -157,17 +157,12 @@ const model = ref([
         ]
     }
 ]);
-
-function test(e) {
-    console.log('test');
-    console.log(e);
-}
 </script>
 
 <template>
     <ul class="layout-menu">
         <template v-for="(item, i) in model" :key="item">
-            <app-menu-item @submenu:opened="test" v-if="!item.separator" :item="item" :index="i"></app-menu-item>
+            <app-menu-item v-if="!item.separator" :item="item" :index="i"></app-menu-item>
             <li v-if="item.separator" class="menu-separator"></li>
         </template>
         <li>
diff --git a/src/layout/AppMenuItem.vue b/src/layout/AppMenuItem.vue
index 635dd1e..1013649 100644
--- a/src/layout/AppMenuItem.vue
+++ b/src/layout/AppMenuItem.vue
@@ -28,11 +28,15 @@ const props = defineProps({
 
 const isActiveMenu = ref(false);
 const itemKey = ref(null);
+
 onBeforeMount(() => {
     itemKey.value = props.parentItemKey ? props.parentItemKey + '-' + props.index : String(props.index);
 
-    isActiveMenu.value = layoutConfig.activeMenuItem.value === itemKey.value || layoutConfig.activeMenuItem?.value?.startsWith(itemKey.value + '-');
+    const activeItem = layoutState.activeMenuItem;
+
+    isActiveMenu.value = activeItem === itemKey.value || activeItem ? activeItem.startsWith(itemKey.value + '-') : false;
 });
+
 watch(
     () => layoutConfig.activeMenuItem.value,
     (newVal) => {
@@ -45,16 +49,19 @@ const itemClick = (event, item) => {
         return;
     }
 
-    if ((item.to || item.url) && (layoutState.staticMenuMobileActive.value || layoutState.overlayMenuActive.value)) {
+    const { overlayMenuActive, staticMenuMobileActive } = layoutState;
+
+    if ((item.to || item.url) && (staticMenuMobileActive.value || overlayMenuActive.value)) {
         onMenuToggle();
     }
-    //execute command
+
     if (item.command) {
         item.command({ originalEvent: event, item: item });
     }
 
-    if (item.items) setActiveMenuItem(isActiveMenu.value ? props.parentItemKey : itemKey);
-    else setActiveMenuItem(itemKey.value);
+    const foundItemKey = item.items ? (isActiveMenu.value ? props.parentItemKey : itemKey) : itemKey.value;
+
+    setActiveMenuItem(foundItemKey);
 };
 
 const checkActiveRoute = (item) => {