From 0304b36348e0adc1954eca5c6ac4ea449983cc4f Mon Sep 17 00:00:00 2001
From: tugcekucukoglu <tugcekucukoglu.860@gmail.com>
Date: Wed, 8 May 2024 10:56:47 +0300
Subject: [PATCH] Mobile megaMenu & Menubar

---
 components/lib/megamenu/MegaMenu.vue  | 5 -----
 components/lib/menubar/Menubar.vue    | 9 +++------
 components/lib/menubar/MenubarSub.vue | 1 +
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/components/lib/megamenu/MegaMenu.vue b/components/lib/megamenu/MegaMenu.vue
index 8caaab180..b9b674031 100755
--- a/components/lib/megamenu/MegaMenu.vue
+++ b/components/lib/megamenu/MegaMenu.vue
@@ -289,12 +289,7 @@ export default {
                 if (grouped) {
                     this.onItemChange(event);
                 } else {
-                    const rootProcessedItem = root ? processedItem : this.activeItem;
-
                     this.hide(originalEvent);
-                    this.changeFocusedItemInfo(originalEvent, rootProcessedItem ? rootProcessedItem.index : -1);
-                    this.mobileActive = false;
-                    DomHandler.focus(this.menubar);
                 }
             }
         },
diff --git a/components/lib/menubar/Menubar.vue b/components/lib/menubar/Menubar.vue
index f4f44580f..9a8d3ef78 100755
--- a/components/lib/menubar/Menubar.vue
+++ b/components/lib/menubar/Menubar.vue
@@ -27,7 +27,7 @@
         </slot>
         <MenubarSub
             :ref="menubarRef"
-            :id="id"
+            :id="id + '_list'"
             role="menubar"
             :items="processedItems"
             :templates="$slots"
@@ -173,10 +173,7 @@ export default {
         },
         onFocus(event) {
             this.focused = true;
-
-            if (!this.popup) {
-                this.focusedItemInfo = this.focusedItemInfo.index !== -1 ? this.focusedItemInfo : { index: this.findFirstFocusedItemIndex(), level: 0, parentKey: '' };
-            }
+            this.focusedItemInfo = this.focusedItemInfo.index !== -1 ? this.focusedItemInfo : { index: this.findFirstFocusedItemIndex(), level: 0, parentKey: '' };
 
             this.$emit('focus', event);
         },
@@ -294,7 +291,7 @@ export default {
             }
         },
         onItemMouseEnter(event) {
-            if (!this.mobileActive && this.dirty) {
+            if (this.dirty) {
                 this.onItemChange(event);
             }
         },
diff --git a/components/lib/menubar/MenubarSub.vue b/components/lib/menubar/MenubarSub.vue
index 3e745c68e..5067e1de9 100755
--- a/components/lib/menubar/MenubarSub.vue
+++ b/components/lib/menubar/MenubarSub.vue
@@ -41,6 +41,7 @@
                 </div>
                 <MenubarSub
                     v-if="isItemVisible(processedItem) && isItemGroup(processedItem)"
+                    :id="getItemId(processedItem) + '_list'"
                     :menuId="menuId"
                     role="menu"
                     :style="sx('submenu', true, { processedItem })"