dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more edge cases

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-31 22:50:52 +01:00
parent 8f1a3252c6
commit c24538f545
16 changed files with 212 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.UI.Avalonia/AttachedBehaviour.cs
+2 -1
View File
@@ -2,7 +2,8 @@
namespace Toolkit.UI.Avalonia;
public class AttachedBehaviour : Trigger
public class AttachedBehaviour :
Trigger
{
protected override void OnAttachedToVisualTree()
{
Toolkit.UI.Avalonia/ListBoxExtension.cs
+77
View File
@@ -0,0 +1,77 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.LogicalTree;
using Toolkit.UI.Controls.Avalonia;
namespace Toolkit.UI.Avalonia;
public class ListBoxExtension
{
public static readonly AttachedProperty<bool> IsItemInvokedEnabledProperty =
AvaloniaProperty.RegisterAttached<NavigationViewItem, bool>("IsItemInvokedEnabled",
typeof(ListBoxExtension), false);
public static readonly RoutedEvent<ItemInvokedEventArgs> ItemInvokedEvent =
RoutedEvent.Register<ItemInvokedEventArgs>("ItemInvoked",
RoutingStrategies.Bubble, typeof(ListBoxExtension));
static ListBoxExtension()
{
IsItemInvokedEnabledProperty.Changed.AddClassHandler<ListBoxItem>(OnIsItemClickEnabledPropertyChanged);
}
private static void OnIsItemClickEnabledPropertyChanged(ListBoxItem sender,
AvaloniaPropertyChangedEventArgs args)
{
bool TrySetupListBox()
{
if (sender.GetLogicalAncestors().OfType<ListBox>().FirstOrDefault() is ListBox listBox)
{
void OnItemInvoked(object? _, SelectionChangedEventArgs args)
{
if (args.AddedItems is { Count: > 0 })
{
if (sender.DataContext == listBox.SelectedItem)
{
sender.RaiseEvent(new ItemInvokedEventArgs { RoutedEvent = ItemInvokedEvent });
}
}
}
if (sender.DataContext == listBox.SelectedItem)
{
sender.RaiseEvent(new ItemInvokedEventArgs { RoutedEvent = ItemInvokedEvent });
}
listBox.SelectionChanged += OnItemInvoked;
return true;
}
return false;
}
if (!TrySetupListBox())
{
void OnAttachedToVisualTree(object? _, VisualTreeAttachmentEventArgs __)
{
sender.AttachedToVisualTree -= OnAttachedToVisualTree;
TrySetupListBox();
}
sender.AttachedToVisualTree += OnAttachedToVisualTree;
}
}
public static bool GetIsItemInvokedEnabled(ListBoxItem element) =>
element.GetValue(IsItemInvokedEnabledProperty);
public static void SetIsItemInvokedEnabled(ListBoxItem element, bool value) =>
element.SetValue(IsItemInvokedEnabledProperty, value);
public static void AddItemInvokedHandler(ListBoxItem element, EventHandler<ItemInvokedEventArgs> handler) =>
element.AddHandler(ItemInvokedEvent, handler);
public static void RemoveItemInvokedHandler(ListBoxItem element, EventHandler<ItemInvokedEventArgs> handler) =>
element.RemoveHandler(ItemInvokedEvent, handler);
}
Toolkit.UI.Avalonia/NavigationViewItemExtension.cs
+21 -21
View File
@@ -5,22 +5,22 @@ using Toolkit.UI.Controls.Avalonia;
namespace Toolkit.UI.Avalonia;
public class NavigationViewItemExtension
public class NavigationViewExtension
{
public static readonly AttachedProperty<bool> IsItemClickEnabledProperty =
AvaloniaProperty.RegisterAttached<NavigationViewItem, bool>("IsItemClickEnabled",
typeof(NavigationViewItemExtension), false);
public static readonly AttachedProperty<bool> IsItemInvokedEnabledProperty =
AvaloniaProperty.RegisterAttached<NavigationViewItem, bool>("IsItemInvokedEnabled",
typeof(NavigationViewExtension), false);
public static readonly RoutedEvent<ItemInvokedEventArgs> ItemClickEvent =
RoutedEvent.Register<ItemInvokedEventArgs>("ItemClick",
RoutingStrategies.Bubble, typeof(NavigationViewItemExtension));
public static readonly RoutedEvent<ItemInvokedEventArgs> ItemInvokedEvent =
RoutedEvent.Register<ItemInvokedEventArgs>("ItemInvoked",
RoutingStrategies.Bubble, typeof(NavigationViewExtension));
static NavigationViewItemExtension()
static NavigationViewExtension()
{
IsItemClickEnabledProperty.Changed.AddClassHandler<NavigationViewItem>(OnIsItemClickEnabledPropertyChanged);
IsItemInvokedEnabledProperty.Changed.AddClassHandler<NavigationViewItem>(OnIsItemInvokedEnabledPropertyChanged);
}
private static void OnIsItemClickEnabledPropertyChanged(NavigationViewItem sender,
private static void OnIsItemInvokedEnabledPropertyChanged(NavigationViewItem sender,
AvaloniaPropertyChangedEventArgs args)
{
bool TrySetupNavigationView()
@@ -31,10 +31,10 @@ public class NavigationViewItemExtension
{
if (args.InvokedItemContainer == sender)
{
sender.RaiseEvent(new ItemInvokedEventArgs { RoutedEvent = ItemClickEvent });
sender.RaiseEvent(new ItemInvokedEventArgs { RoutedEvent = ItemInvokedEvent });
}
}
navigationView.ItemInvoked += OnItemInvoked;
return true;
}
@@ -54,15 +54,15 @@ public class NavigationViewItemExtension
}
}
public static bool GetIsItemClickEnabled(NavigationViewItem element) =>
element.GetValue(IsItemClickEnabledProperty);
public static bool GetIsItemInvokedEnabled(NavigationViewItem element) =>
element.GetValue(IsItemInvokedEnabledProperty);
public static void SetIsItemClickEnabled(NavigationViewItem element, bool value) =>
element.SetValue(IsItemClickEnabledProperty, value);
public static void SetIsItemInvokedEnabled(NavigationViewItem element, bool value) =>
element.SetValue(IsItemInvokedEnabledProperty, value);
public static void AddItemClickHandler(NavigationViewItem element, EventHandler<ItemInvokedEventArgs> handler) =>
element.AddHandler(ItemClickEvent, handler);
public static void AddItemInvokedHandler(NavigationViewItem element, EventHandler<ItemInvokedEventArgs> handler) =>
element.AddHandler(ItemInvokedEvent, handler);
public static void RemoveItemClickHandler(NavigationViewItem element, EventHandler<ItemInvokedEventArgs> handler) =>
element.RemoveHandler(ItemClickEvent, handler);
}
public static void RemoveItemInvokedHandler(NavigationViewItem element, EventHandler<ItemInvokedEventArgs> handler) =>
element.RemoveHandler(ItemInvokedEvent, handler);
}