use BindingOperations.DoNothing if Data is null

punker76 · Nov 1, 2024 · fd9f663 · fd9f663
1 parent 1147545
commit fd9f663
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/src/IconPacks.Avalonia.Core/Converter/NullToDoNothingValueConverter.cs b/src/IconPacks.Avalonia.Core/Converter/NullToDoNothingValueConverter.cs
@@ -0,0 +1,39 @@
+using Avalonia.Data;
+using System;
+using System.Globalization;
+
+namespace IconPacks.Avalonia.Converter
+{
+    public class NullToDoNothingValueConverter : MarkupConverter
+    {
+        // Explicit static constructor to tell C# compiler
+        // not to mark type as beforefieldinit
+        static NullToDoNothingValueConverter()
+        {
+        }
+
+        public NullToDoNothingValueConverter()
+        {
+        }
+
+        public static NullToDoNothingValueConverter Instance { get; } = new();
+
+        /// <inheritdoc />
+        public override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            return Instance;
+        }
+
+        /// <inheritdoc />
+        protected override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value ?? BindingOperations.DoNothing;
+        }
+
+        /// <inheritdoc />
+        protected override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return BindingOperations.DoNothing;
+        }
+    }
+}
diff --git a/src/IconPacks.Avalonia.Core/PackIconControlBase.cs b/src/IconPacks.Avalonia.Core/PackIconControlBase.cs
@@ -103,7 +103,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                     this.UpdateRotateTransformation(change.GetNewValue<double>());
                 }
             }
-            
+
             // Update Spin-Animation as needed 
             if (change.Property == SpinProperty
                 || change.Property == IsVisibleProperty
@@ -112,7 +112,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 || change.Property == SpinEasingFunctionProperty)
             {
                 this.StopSpinAnimation();
-                
+
                 if (this.CanSpin())
                 {
                     this.BeginSpinAnimation();

diff --git a/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml b/src/IconPacks.Avalonia.Core/PackIconControlBase.xaml
@@ -14,7 +14,7 @@
                 <Viewbox x:Name="PART_ViewBox"
                          Margin="{TemplateBinding Padding}">
                     <Path x:Name="PART_IconPath"
-                          Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={x:Static converter:NullToUnsetValueConverter.Instance}}"
+                          Data="{Binding Data, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay, Converter={x:Static converter:NullToDoNothingValueConverter.Instance}}"
                           Stretch="Uniform"
                           UseLayoutRounding="False" />
                 </Viewbox>