Skip to content

Update NavigationView.Properties.cs #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pomianowski merged 3 commits into from
Mar 13, 2024
Merged

Update NavigationView.Properties.cs #964

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5725019
Update NavigationView.Properties.cs
scanfing Feb 20, 2024
43af100
add null check befor UpdateMenuItemsTemplate/AddItemsToDictionaries w…
scanfing Feb 20, 2024
2b5e75e
Merge branch 'development' into development
pomianowski Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 56 additions & 1 deletion src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// Copyright(c) Microsoft Corporation.All rights reserved.

using System.Collections;
using System.Collections.Specialized;
using System.Windows.Controls;
using Wpf.Ui.Animations;

Expand Down Expand Up @@ -82,7 +83,7 @@ public partial class NavigationView
nameof(FooterMenuItemsProperty),
typeof(IList),
typeof(NavigationView),
new FrameworkPropertyMetadata(null)
new FrameworkPropertyMetadata(null, OnFooterMenuItemsPropertyChanged)
);

/// <summary>
Expand Down Expand Up @@ -513,16 +514,45 @@ private static void OnMenuItemsPropertyChanged(DependencyObject? d, DependencyPr

if (navigationView.MenuItemsItemsControl is null)
{
navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
return;
}

if (navigationView.MenuItemsItemsControl.ItemsSource.Equals(enumerableNewValue))
{
navigationView.UpdateMenuItemsTemplate(enumerableNewValue);
return;
}

navigationView.MenuItemsItemsControl.ItemsSource = null;
navigationView.MenuItemsItemsControl.ItemsSource = enumerableNewValue;
navigationView.UpdateMenuItemsTemplate(enumerableNewValue);
navigationView.AddItemsToDictionaries(enumerableNewValue);

navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
}

private void UpdateCollectionChangedEvent(IList? oldMenuItems, IList? newMenuItems)
{
if(oldMenuItems is INotifyCollectionChanged notifyCollection)
{
notifyCollection.CollectionChanged -= OnMenuItems_CollectionChanged;
}
if(newMenuItems is INotifyCollectionChanged newNotifyCollection)
{
newNotifyCollection.CollectionChanged += OnMenuItems_CollectionChanged;
}
}

private void OnMenuItems_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
{
if (e.NewItems is null)
{
return;
}

UpdateMenuItemsTemplate(e.NewItems);
AddItemsToDictionaries(e.NewItems);
}

private static void OnMenuItemsSourcePropertyChanged(
Expand Down Expand Up @@ -551,6 +581,31 @@ DependencyPropertyChangedEventArgs e
navigationView.FooterMenuItems = enumerableNewValue;
}

private static void OnFooterMenuItemsPropertyChanged(DependencyObject? d, DependencyPropertyChangedEventArgs e)
{
if (d is not NavigationView navigationView || e.NewValue is not IList enumerableNewValue)
{
return;
}

if (navigationView.FooterMenuItemsItemsControl is null)
{
navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
return;
}

if (navigationView.FooterMenuItemsItemsControl.ItemsSource.Equals(enumerableNewValue))
{
return;
}

navigationView.FooterMenuItemsItemsControl.ItemsSource = null;
navigationView.FooterMenuItemsItemsControl.ItemsSource = enumerableNewValue;
navigationView.UpdateMenuItemsTemplate(enumerableNewValue);
navigationView.AddItemsToDictionaries(enumerableNewValue);
navigationView.UpdateCollectionChangedEvent(e.OldValue as IList, e.NewValue as IList);
}

private static void OnPaneDisplayModePropertyChanged(
DependencyObject? d,
DependencyPropertyChangedEventArgs e
Expand Down