From 5ab8604436de66f521efc219fef035e94a844377 Mon Sep 17 00:00:00 2001
From: zacfromaustinpowder
 <165237243+zacfromaustinpowder@users.noreply.github.com>
Date: Thu, 13 Nov 2025 18:50:03 +1000
Subject: [PATCH] Added an optional "ConvertBack" method to FuncValueConverter
 (#19920)

---
 .../Data/Converters/FuncValueConverter.cs     | 56 +++++++++++++++++--
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs b/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
index 0d446d0729..4ae6db0ea5 100644
--- a/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
@@ -13,16 +13,28 @@ namespace Avalonia.Data.Converters
     public class FuncValueConverter<TIn, TOut> : IValueConverter
     {
         private readonly Func<TIn?, TOut> _convert;
+        private readonly Func<TOut?, TIn>? _convertBack;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FuncValueConverter{TIn, TOut}"/> class.
         /// </summary>
-        /// <param name="convert">The convert function.</param>
+        /// <param name="convert">The function to convert TIn to TOut.</param>
         public FuncValueConverter(Func<TIn?, TOut> convert)
         {
             _convert = convert;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FuncValueConverter{TIn, TOut}"/> class.
+        /// </summary>
+        /// <param name="convert">The function to convert TIn to TOut.</param>
+        /// <param name="convertBack">The function to convert TOut back to In.</param>
+        public FuncValueConverter(Func<TIn?, TOut> convert, Func<TOut?, TIn>? convertBack)
+        {
+            _convert = convert;
+            _convertBack = convertBack;
+        }
+
         /// <inheritdoc/>
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
@@ -39,7 +51,19 @@ namespace Avalonia.Data.Converters
         /// <inheritdoc/>
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            if (_convertBack == null)
+            {
+                throw new NotImplementedException();
+            }
+
+            if (TypeUtilities.CanCast<TOut>(value))
+            {
+                return _convertBack((TOut?)value);
+            }
+            else
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
         }
     }
 
@@ -53,16 +77,28 @@ namespace Avalonia.Data.Converters
     public class FuncValueConverter<TIn, TParam, TOut> : IValueConverter
     {
         private readonly Func<TIn?, TParam?, TOut> _convert;
+        private readonly Func<TOut?, TParam?, TIn>? _convertBack;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FuncValueConverter{TIn, TParam, TOut}"/> class.
         /// </summary>
-        /// <param name="convert">The convert function.</param>
+        /// <param name="convert">The function to convert TIn to TOut.</param>
         public FuncValueConverter(Func<TIn?, TParam?, TOut> convert)
         {
             _convert = convert;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FuncValueConverter{TIn, TParam, TOut}"/> class.
+        /// </summary>
+        /// <param name="convert">The function to convert TIn to TOut.</param>
+        /// <param name="convertBack">The function to convert TOut back to In.</param>
+        public FuncValueConverter(Func<TIn?, TParam?, TOut> convert, Func<TOut?, TParam?, TIn>? convertBack = null)
+        {
+            _convert = convert;
+            _convertBack = convertBack;
+        }
+
         /// <inheritdoc/>
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
@@ -79,7 +115,19 @@ namespace Avalonia.Data.Converters
         /// <inheritdoc/>
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            if (_convertBack == null)
+            {
+                throw new NotImplementedException();
+            }
+
+            if (TypeUtilities.CanCast<TOut>(value) && TypeUtilities.CanCast<TParam>(parameter))
+            {
+                return _convertBack((TOut?)value, (TParam?)parameter);
+            }
+            else
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
         }
     }
 }