Fix NavigationViewItem Expand crash #20

ghost1372 · Jan 2, 2025 · a2d6e9b · a2d6e9b
1 parent 51ec4ed
commit a2d6e9b
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/...vWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs b/...vWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs
@@ -194,7 +194,10 @@ public void EnsureNavigationSelection(string id)
                     group.IsSelected = true;
                     _navigationView.SelectedItem = group;
 
-                    group.IsExpanded = true;
+                    if (group.MenuItems.Count > 0)
+                    {
+                        group.IsExpanded = true;
+                    }
                     return;
                 }
 
@@ -218,8 +221,10 @@ private bool EnsureNavigationSelectionBase(object rawItem, string id, Navigation
                 _navigationView.SelectedItem = item;
                 item.IsSelected = true;
 
-                parentGroup.IsExpanded = true;
-
+                if (parentGroup.MenuItems.Count > 0)
+                {
+                    parentGroup.IsExpanded = true;
+                }
                 return true;
             }
 
@@ -280,7 +285,10 @@ public bool EnsureItemIsVisibleInNavigation(string name)
                             else
                             {
                                 // Expand so we animate
-                                item.IsExpanded = true;
+                                if (item.MenuItems.Count > 0)
+                                {
+                                    item.IsExpanded = true;
+                                }
                                 // Ensure parent is expanded so we actually show the selection indicator
                                 _navigationView.UpdateLayout();
                                 // Set selected item