From 082ec90cb0ed94f361dac849e9ad716dc527af41 Mon Sep 17 00:00:00 2001
From: NentoR <nentormail@gmail.com>
Date: Sun, 5 Jun 2022 20:21:34 +0300
Subject: [PATCH 1/2] fix: mobile menu not closing upon redirect

---
 .../theme/components/HeaderNavigation.vue     | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/core/nuxt-theme-module/theme/components/HeaderNavigation.vue b/packages/core/nuxt-theme-module/theme/components/HeaderNavigation.vue
index fee7cdb243..9c3c66e85d 100644
--- a/packages/core/nuxt-theme-module/theme/components/HeaderNavigation.vue
+++ b/packages/core/nuxt-theme-module/theme/components/HeaderNavigation.vue
@@ -10,33 +10,36 @@
     />
   </div>
   <SfModal v-else :visible="isMobileMenuOpen">
-    <SfHeaderNavigationItem
-      v-for="(category, index) in categories"
-      :key="index"
-      class="nav-item"
-      v-e2e="`app-header-url_${category}`"
-    >
-      <template #mobile-navigation-item>
-        <SfMenuItem
-          :label="category"
-          class="sf-header-navigation-item__menu-item"
-          :link="localePath(`/c/${category}`)"
-          @click="toggleMobileMenu"
-        />
-      </template>
-    </SfHeaderNavigationItem>
+    <SfList>
+      <SfHeaderNavigationItem
+          v-for="(category, index) in categories"
+          :key="index"
+          class="nav-item"
+          v-e2e="`app-header-url_${category}`"
+        >
+          <template #mobile-navigation-item>
+            <SfMenuItem
+              :label="category"
+              class="sf-header-navigation-item__menu-item"
+              :link="localePath(`/c/${category}`)"
+              @click.native="toggleMobileMenu"
+            />
+          </template>
+        </SfHeaderNavigationItem>
+    </SfList>
   </SfModal>
 </template>
 
 <script>
-import { SfMenuItem, SfModal } from '@storefront-ui/vue';
+import { SfMenuItem, SfModal, SfList } from '@storefront-ui/vue';
 import { useUiState } from '~/composables';
 
 export default {
   name: 'HeaderNavigation',
   components: {
     SfMenuItem,
-    SfModal
+    SfModal,
+    SfList
   },
   props: {
     isMobile: {

From 107cdfab7759386f85426f5faac56c944be70d0f Mon Sep 17 00:00:00 2001
From: NentoR <nentormail@gmail.com>
Date: Sun, 5 Jun 2022 20:23:06 +0300
Subject: [PATCH 2/2] fix: isMobile of AppHeader not alwaying having correct
 bool state

---
 packages/core/nuxt-theme-module/theme/components/AppHeader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/nuxt-theme-module/theme/components/AppHeader.vue b/packages/core/nuxt-theme-module/theme/components/AppHeader.vue
index 34e4bd5ea1..d672bb81b3 100644
--- a/packages/core/nuxt-theme-module/theme/components/AppHeader.vue
+++ b/packages/core/nuxt-theme-module/theme/components/AppHeader.vue
@@ -145,7 +145,7 @@ export default {
     const isSearchOpen = ref(false);
     const searchBarRef = ref(null);
     const result = ref(null);
-    const isMobile = ref(mapMobileObserver().isMobile.get());
+    const isMobile = computed(() => mapMobileObserver().isMobile.get());
 
     const cartTotalItems = computed(() => {
       const count = cartGetters.getTotalItems(cart.value);