Fix #27

WinUICommunity · Apr 27, 2024 · 3fcc078 · 3fcc078
1 parent 9324138
commit 3fcc078
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...gationService/Services/Json/JsonNavigationViewService/JsonNavigationViewService.Config.cs b/...gationService/Services/Json/JsonNavigationViewService/JsonNavigationViewService.Config.cs
@@ -99,7 +99,7 @@ public void ConfigSettingsPage(Type SettingsPage)
 
     private void ConfigPages()
     {
-        _pageService.GetPages(MenuItems);
+        _pageService.GetPages(_menuItemsWithFooterMenuItems);
         _pageService.SetDefaultPage(_defaultPage);
         _pageService.SetSettingsPage(_settingsPage);
         _pageService.SetSectionPage(_sectionPage);

diff --git a/...re/NavigationService/Services/Json/JsonNavigationViewService/JsonNavigationViewService.cs b/...re/NavigationService/Services/Json/JsonNavigationViewService/JsonNavigationViewService.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-
 using Microsoft.Windows.ApplicationModel.Resources;
 
 namespace WinUICommunity;
@@ -10,7 +9,8 @@ public partial class JsonNavigationViewService : IJsonNavigationViewService
     private AutoSuggestBox? _autoSuggestBox;
 
     public IList<object>? MenuItems => _navigationView?.MenuItems;
-
+    public IList<object>? FooterMenuItems => _navigationView?.FooterMenuItems;
+    private IList<object>? _menuItemsWithFooterMenuItems => MenuItems.Concat(FooterMenuItems).ToList();
     public object? SettingsItem => _navigationView?.SettingsItem;
 
     private readonly JsonPageService _pageService = new();
@@ -55,11 +55,11 @@ public void Initialize(NavigationView navigationView, Frame frame)
             NavigationViewItem selectedItem = null;
             if (dataGroup == null && dataItem == null)
             {
-                selectedItem = GetSelectedItem(_navigationView.MenuItems, e.SourcePageType);
+                selectedItem = GetSelectedItem(_menuItemsWithFooterMenuItems, e.SourcePageType);
             }
             else
             {
-                selectedItem = GetSelectedItem(_navigationView.MenuItems, dataItem, dataGroup);
+                selectedItem = GetSelectedItem(_menuItemsWithFooterMenuItems, dataItem, dataGroup);
             }
 
             if (selectedItem != null)
@@ -195,7 +195,7 @@ public NavigationViewItem GetSelectedItem(NavigationViewItem navigationViewItem)
 
         if (!string.IsNullOrEmpty(rootItem))
         {
-            foreach (var baseItem in _navigationView.MenuItems)
+            foreach (var baseItem in _menuItemsWithFooterMenuItems)
             {
                 if (baseItem is NavigationViewItem item)
                 {