From 157c6e91a000d57e38692b9fca8383529c769619 Mon Sep 17 00:00:00 2001
From: Tom Edwards <t.edwards@enscape3d.com>
Date: Fri, 9 Jun 2023 21:38:32 +0200
Subject: [PATCH] Add an overload for GetObservable that accepts an untyped
 AvaloniaProperty and a converter to a typed value Added missing docstrings
 for type params

---
 src/Avalonia.Base/AvaloniaObjectExtensions.cs | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Avalonia.Base/AvaloniaObjectExtensions.cs b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
index b3f41eb420..833cd4b034 100644
--- a/src/Avalonia.Base/AvaloniaObjectExtensions.cs
+++ b/src/Avalonia.Base/AvaloniaObjectExtensions.cs
@@ -60,6 +60,8 @@ namespace Avalonia
         }
 
         /// <inheritdoc cref="GetObservable{T}(AvaloniaObject, AvaloniaProperty{T})"/>
+        /// <typeparam name="TSource">The type of the values held by the <paramref name="property"/>.</typeparam>
+        /// <typeparam name="TResult">The type of the value returned by the <paramref name="converter"/>.</typeparam>
         /// <param name="o"/>
         /// <param name="property"/>
         /// <param name="converter">A method which is executed to convert each property value to <typeparamref name="TResult"/>.</param>
@@ -71,6 +73,15 @@ namespace Avalonia
                 converter ?? throw new ArgumentNullException(nameof(converter)));
         }
 
+        /// <inheritdoc cref="GetObservable{TSource,TResult}"/>
+        public static IObservable<TResult> GetObservable<TResult>(this AvaloniaObject o, AvaloniaProperty property, Func<object?, TResult> converter)
+        {
+            return new AvaloniaPropertyObservable<object?, TResult>(
+                o ?? throw new ArgumentNullException(nameof(o)),
+                property ?? throw new ArgumentNullException(nameof(property)),
+                converter ?? throw new ArgumentNullException(nameof(converter)));
+        }
+
         /// <summary>
         /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>
@@ -92,6 +103,15 @@ namespace Avalonia
                 property ?? throw new ArgumentNullException(nameof(property)));
         }
 
+        /// <inheritdoc cref="GetObservable{TSource,TResult}"/>
+        public static IObservable<BindingValue<TResult>> GetBindingObservable<TResult>(this AvaloniaObject o, AvaloniaProperty property, Func<object?, TResult> converter)
+        {
+            return new AvaloniaPropertyBindingObservable<object?, TResult>(
+                o ?? throw new ArgumentNullException(nameof(o)),
+                property ?? throw new ArgumentNullException(nameof(property)),
+                converter?? throw new ArgumentNullException(nameof(converter)));
+        }
+
         /// <summary>
         /// Gets an observable for an <see cref="AvaloniaProperty"/>.
         /// </summary>