From 1da32c92e7ed3f111a32d011ae2d87e809ee99a0 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Wed, 24 Jun 2026 18:43:33 +0200
Subject: [PATCH 01/17] Remove MAUI internals usage

Replace MAUI internal helper dependencies with public API mappings and public Binding-based typed binding behavior.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../BindingHelpers.cs                         |  23 +-
 .../ElementExtensionsTests.cs                 |  20 +-
 .../GesturesExtensionsTests.cs                |   8 +-
 .../ImageExtensionTests.cs                    |   8 +-
 .../Mocks/MockApplication.cs                  |   4 -
 .../Mocks/MockResourcesProvider.cs            |  14 -
 .../PaceholderExtensionsTests.cs              |   6 +-
 .../PaddingElementExtensionsTests.cs          |  10 +-
 .../TextTests.cs                              |  40 +-
 .../TypedBindingExtensionsTests.cs            | 182 ++++++-
 .../UnitExpressionSearch.cs                   |  35 --
 .../BindablePropertyHelpers.cs                | 119 +++++
 .../DynamicResourceHandlerExtensions.cs       |   9 +-
 .../ElementExtensions.cs                      |  55 ++-
 .../ImageExtensions.cs                        |   6 +-
 .../PlaceholderExtensions.cs                  |   4 +-
 .../TypedBinding.cs                           | 444 ------------------
 .../TypedBindingExtensions.cs                 |  75 ++-
 .../TypedBindingsExtensions.Handlers.cs       | 323 +++++++++++--
 .../TypedGesturesExtensions.cs                |  38 +-
 20 files changed, 764 insertions(+), 659 deletions(-)
 delete mode 100644 src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockResourcesProvider.cs
 delete mode 100644 src/CommunityToolkit.Maui.Markup.UnitTests/UnitExpressionSearch.cs
 create mode 100644 src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs
 delete mode 100644 src/CommunityToolkit.Maui.Markup/TypedBinding.cs

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/BindingHelpers.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/BindingHelpers.cs
index 3913bfed..388c5f0d 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/BindingHelpers.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/BindingHelpers.cs
@@ -1,6 +1,5 @@
-using System.Globalization;
+using System.Globalization;
 using System.Reflection;
-using Microsoft.Maui.Controls.Internals;
 using NUnit.Framework;
 namespace CommunityToolkit.Maui.Markup.UnitTests;
 
@@ -79,14 +78,17 @@ internal static void AssertTypedBindingExists<TBindable, TBindingContext, TSourc
 		TDest? expectedFallbackValue = default,
 		TParam? expectedConverterParameter = default) where TBindable : BindableObject
 	{
-		var binding = GetTypedBinding(bindable, targetProperty) ?? throw new NullReferenceException();
+		var binding = GetBinding(bindable, targetProperty) ?? throw new NullReferenceException();
 
 		Assert.Multiple(() =>
 		{
 			Assert.That(binding, Is.Not.Null);
 			Assert.That(binding.Mode, Is.EqualTo(expectedBindingMode));
 
-			Assert.That(binding.Converter?.ToString(), Is.EqualTo(expectedConverter?.ToString()));
+			var actualConverter = binding.Converter?.GetType().Name.StartsWith("GetterValueConverter", StringComparison.Ordinal) is true && expectedConverter is null
+				? null
+				: binding.Converter;
+			Assert.That(actualConverter?.ToString(), Is.EqualTo(expectedConverter?.ToString()));
 
 			Assert.That(binding.ConverterParameter, Is.EqualTo(expectedConverterParameter));
 
@@ -200,8 +202,6 @@ internal static void AssertBindingExists<TDest, TParam>(
 
 	internal static Binding? GetBinding(BindableObject bindable, BindableProperty property) => GetBindingBase<Binding>(bindable, property);
 
-	internal static TypedBindingBase? GetTypedBinding(BindableObject bindable, BindableProperty property) => GetBindingBase<TypedBindingBase>(bindable, property);
-
 	internal static MultiBinding? GetMultiBinding(BindableObject bindable, BindableProperty property) => GetBindingBase<MultiBinding>(bindable, property);
 
 	/// <remarks>
@@ -213,8 +213,15 @@ internal static void AssertBindingExists<TDest, TParam>(
 	{
 		getContextMethodInfo ??= typeof(BindableObject).GetMethod("GetContext", BindingFlags.NonPublic | BindingFlags.Instance);
 
-		var context = (BindableObject.BindablePropertyContext?)getContextMethodInfo?.Invoke(bindable, [property]);
-		return (TBinding?)context?.Bindings.GetValue();
+		var context = getContextMethodInfo?.Invoke(bindable, [property]);
+		var contextType = context?.GetType();
+		var bindings = contextType?.GetProperty("Bindings", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)?.GetValue(context)
+			?? contextType?.GetField("Bindings", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)?.GetValue(context);
+		var binding = bindings?.GetType()
+			.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+			.SingleOrDefault(static method => method.Name is "GetValue" && method.GetParameters().Length is 0)
+			?.Invoke(bindings, null);
+		return binding as TBinding;
 	}
 
 	internal static IValueConverter AssertConvert<TValue, TConvertedValue>(this IValueConverter converter, TValue value, object? parameter, TConvertedValue expectedConvertedValue, bool twoWay = false, bool backOnly = false, CultureInfo? culture = null)
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/ElementExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/ElementExtensionsTests.cs
index bf2e1833..775ea12e 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/ElementExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/ElementExtensionsTests.cs
@@ -60,39 +60,39 @@ public void EffectsMultiple()
 
 	[Test]
 	public void FontSize()
-		=> TestPropertiesSet(l => l.FontSize(8), (FontElement.FontSizeProperty, 6.0, 8.0));
+		=> TestPropertiesSet(l => l.FontSize(8), (Label.FontSizeProperty, 6.0, 8.0));
 
 	[Test]
 	public void Bold()
-		=> TestPropertiesSet(l => l.Bold(), (FontElement.FontAttributesProperty, FontAttributes.None, FontAttributes.Bold));
+		=> TestPropertiesSet(l => l.Bold(), (Label.FontAttributesProperty, FontAttributes.None, FontAttributes.Bold));
 
 	[Test]
 	public void Italic()
-		=> TestPropertiesSet(l => l.Italic(), (FontElement.FontAttributesProperty, FontAttributes.None, FontAttributes.Italic));
+		=> TestPropertiesSet(l => l.Italic(), (Label.FontAttributesProperty, FontAttributes.None, FontAttributes.Italic));
 
 	[Test]
 	public void FontWithPositionalParameters()
 		=> TestPropertiesSet(
 			l => l.Font("AFontName", 8, true, true),
-			(FontElement.FontSizeProperty, 6.0, 8.0),
-			(FontElement.FontAttributesProperty, FontAttributes.None, FontAttributes.Bold | FontAttributes.Italic),
-			(FontElement.FontFamilyProperty, string.Empty, "AFontName"));
+			(Label.FontSizeProperty, 6.0, 8.0),
+			(Label.FontAttributesProperty, FontAttributes.None, FontAttributes.Bold | FontAttributes.Italic),
+			(Label.FontFamilyProperty, string.Empty, "AFontName"));
 
 	[Test]
 	public void FontWithSizeNamedParameter()
-		=> TestPropertiesSet(l => l.Font(size: 8), (FontElement.FontSizeProperty, 6.0, 8.0));
+		=> TestPropertiesSet(l => l.Font(size: 8), (Label.FontSizeProperty, 6.0, 8.0));
 
 	[Test]
 	public void FontWithBoldNamedParameter()
-		=> TestPropertiesSet(l => l.Font(bold: true), (FontElement.FontAttributesProperty, FontAttributes.None, FontAttributes.Bold));
+		=> TestPropertiesSet(l => l.Font(bold: true), (Label.FontAttributesProperty, FontAttributes.None, FontAttributes.Bold));
 
 	[Test]
 	public void FontWithItalicNamedParameter()
-		=> TestPropertiesSet(l => l.Font(italic: true), (FontElement.FontAttributesProperty, FontAttributes.None, FontAttributes.Italic));
+		=> TestPropertiesSet(l => l.Font(italic: true), (Label.FontAttributesProperty, FontAttributes.None, FontAttributes.Italic));
 
 	[Test]
 	public void FontWithFamilyNamedParameter()
-		=> TestPropertiesSet(l => l.Font(family: "AFontName"), (FontElement.FontFamilyProperty, string.Empty, "AFontName"));
+		=> TestPropertiesSet(l => l.Font(family: "AFontName"), (Label.FontFamilyProperty, string.Empty, "AFontName"));
 
 	static Label AssertDynamicResources()
 	{
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs
index 805bf367..1d6f5d9c 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs
@@ -206,7 +206,7 @@ public void BindTapGestureDefaults()
 			Assert.That(gestureElement.GestureRecognizers[0], Is.InstanceOf<TapGestureRecognizer>());
 		});
 
-		BindingHelpers.AssertTypedBindingExists((TapGestureRecognizer)gestureElement.GestureRecognizers[0], TapGestureRecognizer.CommandProperty, BindingMode.Default, gestureElement.BindingContext);
+		BindingHelpers.AssertTypedBindingExists((TapGestureRecognizer)gestureElement.GestureRecognizers[0], TapGestureRecognizer.CommandProperty, BindingMode.OneWay, gestureElement.BindingContext);
 	}
 
 	[Test]
@@ -308,7 +308,7 @@ public void BindTapGesturePositionalParametersWithNestedBindings()
 		});
 
 		BindingHelpers.AssertTypedBindingExists(tapGestureRecognizer, TapGestureRecognizer.CommandProperty, BindingMode.OneTime, gestureElement.BindingContext);
-		BindingHelpers.AssertTypedBindingExists(tapGestureRecognizer, TapGestureRecognizer.CommandParameterProperty, BindingMode.Default, gestureElement.BindingContext);
+		BindingHelpers.AssertTypedBindingExists(tapGestureRecognizer, TapGestureRecognizer.CommandParameterProperty, BindingMode.OneWay, gestureElement.BindingContext);
 	}
 
 	[Test]
@@ -323,7 +323,7 @@ public void BindSwipeGestureDefaults()
 
 		Assert.That(gestureElement.GestureRecognizers, Has.Count.EqualTo(1));
 		Assert.That(gestureElement.GestureRecognizers[0], Is.InstanceOf<SwipeGestureRecognizer>());
-		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandProperty, BindingMode.Default, gestureElement.BindingContext);
+		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandProperty, BindingMode.OneWay, gestureElement.BindingContext);
 	}
 
 	[Test]
@@ -429,7 +429,7 @@ public void BindSwipeGesturePositionalParametersWithNestedBindings()
 		});
 
 		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandProperty, BindingMode.OneTime, gestureElement.BindingContext);
-		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandParameterProperty, BindingMode.Default, gestureElement.BindingContext);
+		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandParameterProperty, BindingMode.OneWay, gestureElement.BindingContext);
 	}
 
 	[Test]
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs
index 5d5f1291..b7c676bc 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs
@@ -23,14 +23,14 @@ public void SetSourceTest()
 	[Test]
 	public void SetAspectTest()
 	{
-		TestPropertiesSet(i => i.Aspect(Aspect.AspectFill), (ImageElement.AspectProperty, Aspect.AspectFill));
-		TestPropertiesSet(i => i.Aspect(Aspect.Center), (ImageElement.AspectProperty, Aspect.Center));
-		TestPropertiesSet(i => i.Aspect(Aspect.Fill), (ImageElement.AspectProperty, Aspect.Fill));
+		TestPropertiesSet(i => i.Aspect(Aspect.AspectFill), (Image.AspectProperty, Aspect.AspectFill));
+		TestPropertiesSet(i => i.Aspect(Aspect.Center), (Image.AspectProperty, Aspect.Center));
+		TestPropertiesSet(i => i.Aspect(Aspect.Fill), (Image.AspectProperty, Aspect.Fill));
 	}
 
 	[Test]
 	public void SetIsOpaqueTest()
-		=> TestPropertiesSet(i => i.IsOpaque(true), (ImageElement.IsOpaqueProperty, true));
+		=> TestPropertiesSet(i => i.IsOpaque(true), (Image.IsOpaqueProperty, true));
 
 	[Test]
 	public void SupportDerivedFromImage()
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockApplication.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockApplication.cs
index daed3192..c1846663 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockApplication.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockApplication.cs
@@ -1,4 +1,3 @@
-using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Handlers;
 namespace CommunityToolkit.Maui.Markup.UnitTests.Mocks;
 
@@ -9,9 +8,6 @@ public MockApplication(IServiceProvider serviceProvider)
 		Resources = new MockResourceDictionary();
 
 		Services = serviceProvider;
-#pragma warning disable CS0612 // Type or member is obsolete
-		DependencyService.Register<ISystemResourcesProvider, MockResourcesProvider>();
-#pragma warning restore CS0612 // Type or member is obsolete
 	}
 
 	public IApplication Application => this;
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockResourcesProvider.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockResourcesProvider.cs
deleted file mode 100644
index 4bfa6d5e..00000000
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/Mocks/MockResourcesProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Microsoft.Maui.Controls.Internals;
-namespace CommunityToolkit.Maui.Markup.UnitTests.Mocks;
-
-
-// Inspired by https://github.com/dotnet/maui/blob/79695fbb7ba6517a334c795ecf0a1d6358ef309a/src/Controls/Foldable/test/MockPlatformServices.cs#L145-L176
-
-#pragma warning disable CS0612 // Type or member is obsolete
-class MockResourcesProvider : ISystemResourcesProvider
-#pragma warning restore CS0612 // Type or member is obsolete
-{
-	readonly ResourceDictionary dictionary = new();
-
-	public IResourceDictionary GetSystemResources() => dictionary;
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs
index 6d2b9465..b220f8b3 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs
@@ -6,15 +6,15 @@ class PaceholderExtensionsTests : BaseMarkupTestFixture<Entry>
 {
 	[Test]
 	public void SetPlaceholderTest()
-		=> TestPropertiesSet(e => e.Placeholder("Hello World"), (PlaceholderElement.PlaceholderProperty, "Hello World"));
+		=> TestPropertiesSet(e => e.Placeholder("Hello World"), (Entry.PlaceholderProperty, "Hello World"));
 
 	[Test]
 	public void SetPlaceholderAndColorTest()
-		=> TestPropertiesSet(e => e.Placeholder("Hello World", Colors.Red), (PlaceholderElement.PlaceholderProperty, "Hello World"), (PlaceholderElement.PlaceholderColorProperty, Colors.Red));
+		=> TestPropertiesSet(e => e.Placeholder("Hello World", Colors.Red), (Entry.PlaceholderProperty, "Hello World"), (Entry.PlaceholderColorProperty, Colors.Red));
 
 	[Test]
 	public void SetPlaceholderColorTest()
-		=> TestPropertiesSet(e => e.PlaceholderColor(Colors.Red), (PlaceholderElement.PlaceholderColorProperty, Colors.Red));
+		=> TestPropertiesSet(e => e.PlaceholderColor(Colors.Red), (Entry.PlaceholderColorProperty, Colors.Red));
 
 	[Test]
 	public void SupportDerivedFromEditor()
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
index 52afb4a3..3e55c0b1 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
@@ -7,23 +7,23 @@ namespace CommunityToolkit.Maui.Markup.UnitTests;
 [TestFixture(typeof(ImageButton))]
 [TestFixture(typeof(Label))]
 [TestFixture(typeof(Page))]
-class PaddingElementExtensionsTests<TPaddingElement> : BaseMarkupTestFixture<TPaddingElement> where TPaddingElement : Element, IPaddingElement, new()
+class PaddingElementExtensionsTests<TPaddingElement> : BaseMarkupTestFixture<TPaddingElement> where TPaddingElement : BindableObject, new()
 {
 	[Test]
 	public void PaddingThickness()
-		=> TestPropertiesSet(l => l.Padding(new Thickness(1)), (PaddingElement.PaddingProperty, new Thickness(0), new Thickness(1)));
+		=> TestPropertiesSet(l => l.Padding(new Thickness(1)), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1)));
 
 	[Test]
 	public void PaddingUniform()
-		=> TestPropertiesSet(l => l.Padding(1), (PaddingElement.PaddingProperty, new Thickness(0), new Thickness(1)));
+		=> TestPropertiesSet(l => l.Padding(1), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1)));
 
 	[Test]
 	public void PaddingHorizontalVertical()
-		=> TestPropertiesSet(l => l.Padding(1, 2), (PaddingElement.PaddingProperty, new Thickness(0), new Thickness(1, 2)));
+		=> TestPropertiesSet(l => l.Padding(1, 2), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1, 2)));
 
 	[Test]
 	public void Paddings()
-		=> TestPropertiesSet(l => l.Paddings(left: 1, top: 2, right: 3, bottom: 4), (PaddingElement.PaddingProperty, new Thickness(0), new Thickness(1, 2, 3, 4)));
+		=> TestPropertiesSet(l => l.Paddings(left: 1, top: 2, right: 3, bottom: 4), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1, 2, 3, 4)));
 
 	[Test]
 	public void SupportDerivedFrom()
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TextTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TextTests.cs
index e72585eb..7bf6b674 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TextTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TextTests.cs
@@ -6,11 +6,11 @@ class LabelTextTests : BaseMarkupTestFixture<Label>
 {
 	[Test]
 	public void LabelTextColor_ProvidedColor()
-		=> TestPropertiesSet(l => l.TextColor(Colors.Red), (TextElement.TextColorProperty, Colors.Red));
+		=> TestPropertiesSet(l => l.TextColor(Colors.Red), (Label.TextColorProperty, Colors.Red));
 
 	[Test]
 	public void LabelTextColor_CustomColor()
-		=> TestPropertiesSet(l => l.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (TextElement.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
+		=> TestPropertiesSet(l => l.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (Label.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
 
 	[Test]
 	public void LabelText_NoColor()
@@ -18,11 +18,11 @@ public void LabelText_NoColor()
 
 	[Test]
 	public void LabelText_ProvidedColor()
-		=> TestPropertiesSet(l => l.Text("Hello World", Colors.Green), (Label.TextProperty, "Hello World"), (TextElement.TextColorProperty, Colors.Green));
+		=> TestPropertiesSet(l => l.Text("Hello World", Colors.Green), (Label.TextProperty, "Hello World"), (Label.TextColorProperty, Colors.Green));
 
 	[Test]
 	public void LabelText_CustomColor()
-		=> TestPropertiesSet(l => l.Text("Hello World", new Color(250, 5, 128, 1)), (Label.TextProperty, "Hello World"), (TextElement.TextColorProperty, new Color(250, 5, 128, 1)));
+		=> TestPropertiesSet(l => l.Text("Hello World", new Color(250, 5, 128, 1)), (Label.TextProperty, "Hello World"), (Label.TextColorProperty, new Color(250, 5, 128, 1)));
 
 	[Test]
 	public void SupportDerivedFromLabel()
@@ -46,11 +46,11 @@ class ButtonTextTests : BaseMarkupTestFixture<Button>
 {
 	[Test]
 	public void ButtonTextColor_ProvidedColor()
-		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (TextElement.TextColorProperty, Colors.Red));
+		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (Button.TextColorProperty, Colors.Red));
 
 	[Test]
 	public void ButtonTextColor_CustomColor()
-		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (TextElement.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
+		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (Button.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
 
 	[Test]
 	public void ButtonText_NoColor()
@@ -58,11 +58,11 @@ public void ButtonText_NoColor()
 
 	[Test]
 	public void ButtonText_ProvidedColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (Button.TextProperty, "Hello World"), (TextElement.TextColorProperty, Colors.Green));
+		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (Button.TextProperty, "Hello World"), (Button.TextColorProperty, Colors.Green));
 
 	[Test]
 	public void ButtonText_CustomColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (Button.TextProperty, "Hello World"), (TextElement.TextColorProperty, new Color(250, 5, 128, 1)));
+		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (Button.TextProperty, "Hello World"), (Button.TextColorProperty, new Color(250, 5, 128, 1)));
 
 	[Test]
 	public void SupportDerivedFromButton()
@@ -114,11 +114,11 @@ class EditorTextTests : BaseMarkupTestFixture<Editor>
 {
 	[Test]
 	public void EditorTextColor_ProvidedColor()
-		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (TextElement.TextColorProperty, Colors.Red));
+		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (Editor.TextColorProperty, Colors.Red));
 
 	[Test]
 	public void EditorTextColor_CustomColor()
-		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (TextElement.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
+		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (Editor.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
 
 	[Test]
 	public void EditorText_NoColor()
@@ -126,11 +126,11 @@ public void EditorText_NoColor()
 
 	[Test]
 	public void EditorText_ProvidedColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (Editor.TextProperty, "Hello World"), (TextElement.TextColorProperty, Colors.Green));
+		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (Editor.TextProperty, "Hello World"), (Editor.TextColorProperty, Colors.Green));
 
 	[Test]
 	public void EditorText_CustomColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (Editor.TextProperty, "Hello World"), (TextElement.TextColorProperty, new Color(250, 5, 128, 1)));
+		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (Editor.TextProperty, "Hello World"), (Editor.TextColorProperty, new Color(250, 5, 128, 1)));
 
 	[Test]
 	public void SupportDerivedFromEnditor()
@@ -154,11 +154,11 @@ class EntryTextTests : BaseMarkupTestFixture<Entry>
 {
 	[Test]
 	public void EntryTextColor_ProvidedColor()
-		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (TextElement.TextColorProperty, Colors.Red));
+		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (Entry.TextColorProperty, Colors.Red));
 
 	[Test]
 	public void EntryTextColor_CustomColor()
-		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (TextElement.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
+		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (Entry.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
 
 	[Test]
 	public void EntryText_NoColor()
@@ -166,11 +166,11 @@ public void EntryText_NoColor()
 
 	[Test]
 	public void EntryText_ProvidedColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (Entry.TextProperty, "Hello World"), (TextElement.TextColorProperty, Colors.Green));
+		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (Entry.TextProperty, "Hello World"), (Entry.TextColorProperty, Colors.Green));
 
 	[Test]
 	public void EntryText_CustomColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (Entry.TextProperty, "Hello World"), (TextElement.TextColorProperty, new Color(250, 5, 128, 1)));
+		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (Entry.TextProperty, "Hello World"), (Entry.TextColorProperty, new Color(250, 5, 128, 1)));
 
 	[Test]
 	public void SupportDerivedFromEntry()
@@ -194,11 +194,11 @@ class SearchBarTextTests : BaseMarkupTestFixture<SearchBar>
 {
 	[Test]
 	public void SearchBarTextColor_ProvidedColor()
-		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (TextElement.TextColorProperty, Colors.Red));
+		=> TestPropertiesSet(b => b.TextColor(Colors.Red), (SearchBar.TextColorProperty, Colors.Red));
 
 	[Test]
 	public void SearchBarTextColor_CustomColor()
-		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (TextElement.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
+		=> TestPropertiesSet(b => b.TextColor(new Color(0.124f, 0.654f, 0.9234f, 0.100f)), (SearchBar.TextColorProperty, new Color(0.124f, 0.654f, 0.9234f, 0.100f)));
 
 	[Test]
 	public void SearchBarText_NoColor()
@@ -206,11 +206,11 @@ public void SearchBarText_NoColor()
 
 	[Test]
 	public void SearchBarText_ProvidedColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (SearchBar.TextProperty, "Hello World"), (TextElement.TextColorProperty, Colors.Green));
+		=> TestPropertiesSet(b => b.Text("Hello World", Colors.Green), (SearchBar.TextProperty, "Hello World"), (SearchBar.TextColorProperty, Colors.Green));
 
 	[Test]
 	public void SearchBarText_CustomColor()
-		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (SearchBar.TextProperty, "Hello World"), (TextElement.TextColorProperty, new Color(250, 5, 128, 1)));
+		=> TestPropertiesSet(b => b.Text("Hello World", new Color(250, 5, 128, 1)), (SearchBar.TextProperty, "Hello World"), (SearchBar.TextColorProperty, new Color(250, 5, 128, 1)));
 
 	[Test]
 	public void SupportDerivedFromSearchBar()
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
index d5988a09..f1996b93 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
@@ -34,18 +34,21 @@ public override void TearDown()
 	}
 
 	[Test]
-	public void BindCommandThrowsArgumentNullExceptionWhenParameterHandlersNull()
+	public void BindCommandSupportsParameterGetterWithoutHandlers()
 	{
-		Assert.Throws<ArgumentNullException>(() =>
-		{
-			new Button()
-				.BindCommand<Button, ViewModel, object?, Color>(
-					vm => vm.Command,
-					[
-						(vm => vm, nameof(ViewModel.Command))
-					],
-					parameterGetter: _ => Colors.Black);
-		});
+		var button = new Button
+		{
+			BindingContext = viewModel
+		};
+
+		button.BindCommand<Button, ViewModel, object?, Color>(
+			vm => vm.Command,
+			[
+				(vm => vm, nameof(ViewModel.Command))
+			],
+			parameterGetter: _ => Colors.Black);
+
+		Assert.That(button.CommandParameter, Is.EqualTo(Colors.Black));
 	}
 
 	[Test]
@@ -58,7 +61,7 @@ public void BindCommandWithDefaults()
 
 		button.BindCommand(static (ViewModel vm) => vm.Command);
 
-		BindingHelpers.AssertTypedBindingExists(button, Button.CommandProperty, BindingMode.Default, viewModel);
+		BindingHelpers.AssertTypedBindingExists(button, Button.CommandProperty, BindingMode.OneWay, viewModel);
 		Assert.That(BindingHelpers.GetBinding(button, Button.CommandParameterProperty), Is.Null);
 	}
 
@@ -104,7 +107,7 @@ public async Task ConfirmStringFormat()
 
 		viewModel.PropertyChanged += HandlePropertyChanged;
 
-		BindingHelpers.AssertTypedBindingExists(label, Label.TextProperty, BindingMode.Default, viewModel, stringFormat);
+		BindingHelpers.AssertTypedBindingExists(label, Label.TextProperty, BindingMode.OneWay, viewModel, stringFormat);
 		Assert.That(label.Text, Is.EqualTo(string.Format(stringFormat, ViewModel.DefaultPercentage)));
 
 		label.Text = string.Format(stringFormat, 0.1);
@@ -150,7 +153,7 @@ public async Task ConfirmReadOnlyTypedBindings()
 		viewModel.PropertyChanged += HandleViewModelPropertyChanged;
 		label.PropertyChanged += HandleLabelPropertyChanged;
 
-		BindingHelpers.AssertTypedBindingExists(label, Label.TextColorProperty, BindingMode.Default, viewModel);
+		BindingHelpers.AssertTypedBindingExists(label, Label.TextColorProperty, BindingMode.OneWay, viewModel);
 		Assert.That(label.TextColor, Is.EqualTo(ViewModel.DefaultColor));
 
 		viewModel.TextColor = Colors.Green;
@@ -190,6 +193,118 @@ void HandleLabelPropertyChanged(object? sender, PropertyChangedEventArgs e)
 		}
 	}
 
+	[Test]
+	public void DefaultTwoWayTypedBindingWithoutSetterDoesNotWriteBack()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var slider = new Slider
+		{
+			BindingContext = viewModel
+		}.Bind(Slider.ValueProperty, static (ViewModel viewModel) => viewModel.Percentage);
+
+		BindingHelpers.AssertTypedBindingExists(slider, Slider.ValueProperty, BindingMode.OneWay, viewModel);
+
+		slider.Value = 1;
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(slider.Value, Is.EqualTo(1));
+			Assert.That(viewModel.Percentage, Is.EqualTo(ViewModel.DefaultPercentage));
+		});
+	}
+
+	[Test]
+	public void DefaultTwoWayObjectTypedBindingWithoutSetterDoesNotWriteBack()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var selectedItem = new object();
+		var updatedSelectedItem = new object();
+		viewModel.SelectedItem = selectedItem;
+
+		var collectionView = new CollectionView
+		{
+			BindingContext = viewModel
+		}.Bind(SelectableItemsView.SelectedItemProperty, static (ViewModel viewModel) => viewModel.SelectedItem);
+
+		BindingHelpers.AssertTypedBindingExists(collectionView, SelectableItemsView.SelectedItemProperty, BindingMode.OneWay, viewModel);
+
+		collectionView.SelectedItem = updatedSelectedItem;
+
+		Assert.That(viewModel.SelectedItem, Is.SameAs(selectedItem));
+	}
+
+	[Test]
+	public void BindingDoNothingConvertBackSkipsSetterWriteBack()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var slider = new Slider
+		{
+			BindingContext = viewModel
+		}.Bind<Slider, ViewModel, double, object?, double>(
+			Slider.ValueProperty,
+			static viewModel => viewModel.Percentage,
+			static (viewModel, percentage) => viewModel.Percentage = percentage,
+			converter: new DoNothingConvertBackConverter());
+
+		slider.Value = 1;
+
+		Assert.That(viewModel.Percentage, Is.EqualTo(ViewModel.DefaultPercentage));
+	}
+
+	[Test]
+	public void InvalidTargetValueDoesNotCrashSetterWriteBack()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		viewModel.Age = 1;
+		var entry = new Entry
+		{
+			BindingContext = viewModel
+		}.Bind(Entry.TextProperty, static (ViewModel viewModel) => viewModel.Age, static (viewModel, age) => viewModel.Age = age);
+
+		Assert.DoesNotThrow(() => entry.Text = "abc");
+		Assert.That(viewModel.Age, Is.EqualTo(1));
+	}
+
+	[Test]
+	public void OneWayToSourceTypedBindingPushesInitialTargetValue()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var entry = new Entry
+		{
+			BindingContext = viewModel,
+			Text = "12"
+		}.Bind(Entry.TextProperty, static (ViewModel viewModel) => viewModel.Age, static (viewModel, age) => viewModel.Age = age, BindingMode.OneWayToSource);
+
+		Assert.That(viewModel.Age, Is.EqualTo(12));
+
+		entry.Text = "13";
+
+		Assert.That(viewModel.Age, Is.EqualTo(13));
+	}
+
+	[Test]
+	public void OneWayToSourceTypedBindingPushesInitialTargetValueWhenBindingContextIsSetAfterBind()
+	{
+		var entry = new Entry
+		{
+			Text = "12"
+		}.Bind(Entry.TextProperty, static (ViewModel viewModel) => viewModel.Age, static (viewModel, age) => viewModel.Age = age, BindingMode.OneWayToSource);
+		var lateViewModel = new ViewModel();
+
+		entry.BindingContext = lateViewModel;
+
+		Assert.That(lateViewModel.Age, Is.EqualTo(12));
+
+		entry.Text = "13";
+
+		Assert.That(lateViewModel.Age, Is.EqualTo(13));
+	}
+
 	[Test]
 	public void ConfirmOneTimeBinding()
 	{
@@ -259,7 +374,7 @@ public async Task ConfirmReadWriteTypedBinding()
 		slider.PropertyChanged += HandleSliderPropertyChanged;
 		viewModel.PropertyChanged += HandleViewModelPropertyChanged;
 
-		BindingHelpers.AssertTypedBindingExists(slider, Slider.ValueProperty, BindingMode.Default, viewModel);
+		BindingHelpers.AssertTypedBindingExists(slider, Slider.ValueProperty, BindingMode.OneWay, viewModel);
 		Assert.That(slider.Value, Is.EqualTo(ViewModel.DefaultPercentage));
 
 		slider.Value = 1;
@@ -483,7 +598,7 @@ public async Task ConfirmReadOnlyTypedBindingWithIValueConverter()
 		BindingHelpers.AssertTypedBindingExists<Label, ViewModel, Color, object?, string>(
 			label,
 			Label.TextProperty,
-			BindingMode.Default,
+			BindingMode.OneWay,
 			viewModel,
 			expectedConverter: colorToHexRgbStringConverter);
 
@@ -544,7 +659,7 @@ public async Task ConfirmReadOnlyTypedBindingWithFuncConversion()
 		BindingHelpers.AssertTypedBindingExists<Slider, ViewModel, double, Color>(
 			slider,
 			Slider.ThumbColorProperty,
-			BindingMode.Default,
+			BindingMode.OneWay,
 			viewModel,
 			percentage => percentage > 0.5 ? Colors.Green : Colors.Red);
 
@@ -608,7 +723,7 @@ public async Task ConfirmReadOnlyTypedBindingWithFuncConversionUsingValueType()
 		BindingHelpers.AssertTypedBindingExists<Slider, ViewModel, double, double>(
 			slider,
 			Slider.HeightRequestProperty,
-			BindingMode.Default,
+			BindingMode.OneWay,
 			viewModel,
 			height => height + heightAdjustment);
 
@@ -669,7 +784,7 @@ public async Task ConfirmNullableTypedBindingWithValueNull()
 		entry.TextChanged += HandleEntryTextChanged;
 		viewModel.PropertyChanged += HandleViewModelPropertyChanged;
 
-		BindingHelpers.AssertTypedBindingExists(entry, Entry.TextProperty, BindingMode.Default, viewModel);
+		BindingHelpers.AssertTypedBindingExists(entry, Entry.TextProperty, BindingMode.OneWay, viewModel);
 		Assert.That(entry.Text, Is.Null);
 
 		entry.Text = "1";
@@ -710,6 +825,29 @@ void HandleEntryTextChanged(object? sender, TextChangedEventArgs e)
 		}
 	}
 
+	[Test]
+	public void CapturedValueTypedBindingIgnoresMismatchedBindingContext()
+	{
+		var label = new Label
+		{
+			BindingContext = new object()
+		};
+
+		Assert.DoesNotThrow(() => label.Bind(Label.TextColorProperty, static (ViewModel _) => Colors.Red));
+		Assert.That(label.TextColor, Is.Not.EqualTo(Colors.Red));
+
+		label.BindingContext = viewModel;
+
+		Assert.That(label.TextColor, Is.EqualTo(Colors.Red));
+	}
+
+	sealed class DoNothingConvertBackConverter : IValueConverter
+	{
+		public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) => value;
+
+		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => Binding.DoNothing;
+	}
+
 	class ViewModel : INotifyPropertyChanged
 	{
 		public const double DefaultPercentage = 0.5;
@@ -730,6 +868,12 @@ public ViewModel()
 
 		public event PropertyChangedEventHandler? PropertyChanged;
 
+		public object? SelectedItem
+		{
+			get;
+			set => SetProperty(ref field, value);
+		}
+
 		public double HeightRequest
 		{
 			get;
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/UnitExpressionSearch.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/UnitExpressionSearch.cs
deleted file mode 100644
index 4b8ba113..00000000
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/UnitExpressionSearch.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Linq.Expressions;
-using System.Reflection;
-using Microsoft.Maui.Controls.Internals;
-namespace CommunityToolkit.Maui.Markup.UnitTests;
-
-class UnitExpressionSearch : ExpressionVisitor, IExpressionSearch
-{
-	List<object>? results;
-	Type? targeType;
-
-	public List<T?> FindObjects<T>(Expression expression) where T : class
-	{
-		results = [];
-		targeType = typeof(T);
-		Visit(expression);
-		return results.Select(o => o as T).ToList();
-	}
-
-	protected override Expression VisitMember(MemberExpression node)
-	{
-		if (node is { Expression: ConstantExpression expression, Member: FieldInfo info })
-		{
-			var container = expression.Value;
-			var value = info.GetValue(container);
-
-			if (targeType?.IsInstanceOfType(value) is true
-				&& results is not null)
-			{
-				results.Add(value);
-			}
-		}
-
-		return base.VisitMember(node);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs b/src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs
new file mode 100644
index 00000000..fea9fb1a
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs
@@ -0,0 +1,119 @@
+namespace CommunityToolkit.Maui.Markup;
+
+static class BindablePropertyHelpers
+{
+	public static BindableProperty GetPaddingProperty(BindableObject bindable) => bindable switch
+	{
+		Border => Border.PaddingProperty,
+		Button => Button.PaddingProperty,
+		ContentPresenter => ContentPresenter.PaddingProperty,
+		ImageButton => ImageButton.PaddingProperty,
+		Label => Label.PaddingProperty,
+		Layout => Layout.PaddingProperty,
+		Page => Page.PaddingProperty,
+		ScrollView => ScrollView.PaddingProperty,
+		TemplatedView => TemplatedView.PaddingProperty,
+		_ => throw CreateUnsupportedException(bindable, "Padding")
+	};
+
+	public static BindableProperty GetFontFamilyProperty(BindableObject bindable) => bindable switch
+	{
+		Button => Button.FontFamilyProperty,
+		DatePicker => DatePicker.FontFamilyProperty,
+		FontImageSource => FontImageSource.FontFamilyProperty,
+		SearchBar => SearchBar.FontFamilyProperty,
+		InputView => InputView.FontFamilyProperty,
+		Label => Label.FontFamilyProperty,
+		Picker => Picker.FontFamilyProperty,
+		RadioButton => RadioButton.FontFamilyProperty,
+		SearchHandler => SearchHandler.FontFamilyProperty,
+		Span => Span.FontFamilyProperty,
+		TimePicker => TimePicker.FontFamilyProperty,
+		_ => throw CreateUnsupportedException(bindable, "FontFamily")
+	};
+
+	public static BindableProperty GetFontSizeProperty(BindableObject bindable) => bindable switch
+	{
+		Button => Button.FontSizeProperty,
+		DatePicker => DatePicker.FontSizeProperty,
+		SearchBar => SearchBar.FontSizeProperty,
+		InputView => InputView.FontSizeProperty,
+		Label => Label.FontSizeProperty,
+		Picker => Picker.FontSizeProperty,
+		RadioButton => RadioButton.FontSizeProperty,
+		SearchHandler => SearchHandler.FontSizeProperty,
+		Span => Span.FontSizeProperty,
+		TimePicker => TimePicker.FontSizeProperty,
+		_ => throw CreateUnsupportedException(bindable, "FontSize")
+	};
+
+	public static BindableProperty GetFontAttributesProperty(BindableObject bindable) => bindable switch
+	{
+		Button => Button.FontAttributesProperty,
+		DatePicker => DatePicker.FontAttributesProperty,
+		SearchBar => SearchBar.FontAttributesProperty,
+		InputView => InputView.FontAttributesProperty,
+		Label => Label.FontAttributesProperty,
+		Picker => Picker.FontAttributesProperty,
+		RadioButton => RadioButton.FontAttributesProperty,
+		SearchHandler => SearchHandler.FontAttributesProperty,
+		Span => Span.FontAttributesProperty,
+		TimePicker => TimePicker.FontAttributesProperty,
+		_ => throw CreateUnsupportedException(bindable, "FontAttributes")
+	};
+
+	public static BindableProperty GetTextColorProperty(BindableObject bindable) => bindable switch
+	{
+		Button => Button.TextColorProperty,
+		DatePicker => DatePicker.TextColorProperty,
+		SearchBar => SearchBar.TextColorProperty,
+		InputView => InputView.TextColorProperty,
+		Label => Label.TextColorProperty,
+		Picker => Picker.TextColorProperty,
+		RadioButton => RadioButton.TextColorProperty,
+		SearchHandler => SearchHandler.TextColorProperty,
+		Span => Span.TextColorProperty,
+		TimePicker => TimePicker.TextColorProperty,
+		_ => throw CreateUnsupportedException(bindable, "TextColor")
+	};
+
+	public static BindableProperty GetImageSourceProperty(BindableObject bindable) => bindable switch
+	{
+		Image => Image.SourceProperty,
+		ImageButton => ImageButton.SourceProperty,
+		_ => throw CreateUnsupportedException(bindable, "Source")
+	};
+
+	public static BindableProperty GetImageAspectProperty(BindableObject bindable) => bindable switch
+	{
+		Image => Image.AspectProperty,
+		ImageButton => ImageButton.AspectProperty,
+		_ => throw CreateUnsupportedException(bindable, "Aspect")
+	};
+
+	public static BindableProperty GetImageIsOpaqueProperty(BindableObject bindable) => bindable switch
+	{
+		Image => Image.IsOpaqueProperty,
+		ImageButton => ImageButton.IsOpaqueProperty,
+		_ => throw CreateUnsupportedException(bindable, "IsOpaque")
+	};
+
+	public static BindableProperty GetPlaceholderProperty(BindableObject bindable) => bindable switch
+	{
+		SearchBar => SearchBar.PlaceholderProperty,
+		InputView => InputView.PlaceholderProperty,
+		SearchHandler => SearchHandler.PlaceholderProperty,
+		_ => throw CreateUnsupportedException(bindable, "Placeholder")
+	};
+
+	public static BindableProperty GetPlaceholderColorProperty(BindableObject bindable) => bindable switch
+	{
+		SearchBar => SearchBar.PlaceholderColorProperty,
+		InputView => InputView.PlaceholderColorProperty,
+		SearchHandler => SearchHandler.PlaceholderColorProperty,
+		_ => throw CreateUnsupportedException(bindable, "PlaceholderColor")
+	};
+
+	static NotSupportedException CreateUnsupportedException(BindableObject bindable, string propertyName)
+		=> new($"{bindable.GetType()} does not expose a public {propertyName} bindable property.");
+}
diff --git a/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs b/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs
index 7bac838b..aa141d37 100644
--- a/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs
@@ -1,8 +1,7 @@
-using Microsoft.Maui.Controls.Internals;
-namespace CommunityToolkit.Maui.Markup;
+namespace CommunityToolkit.Maui.Markup;
 
 /// <summary>
-/// Extension Methods for IDynamicResourceHandler
+/// Extension Methods for dynamic resources
 /// </summary>
 public static class DynamicResourceHandlerExtensions
 {
@@ -15,7 +14,7 @@ public static class DynamicResourceHandlerExtensions
 	/// <param name="key"></param>
 	/// <returns>Layout with added Dynamic Resource</returns>
 	public static TDynamicResourceHandler DynamicResource<TDynamicResourceHandler>(this TDynamicResourceHandler dynamicResourceHandler, BindableProperty property, string key)
-		where TDynamicResourceHandler : IDynamicResourceHandler
+		where TDynamicResourceHandler : Element
 	{
 		dynamicResourceHandler.SetDynamicResource(property, key);
 
@@ -30,7 +29,7 @@ public static TDynamicResourceHandler DynamicResource<TDynamicResourceHandler>(t
 	/// <param name="resources"></param>
 	/// <returns>Layout with added Dynamic Resource</returns>
 	public static TDynamicResourceHandler DynamicResources<TDynamicResourceHandler>(this TDynamicResourceHandler dynamicResourceHandler, params ReadOnlySpan<(BindableProperty property, string key)> resources)
-		where TDynamicResourceHandler : IDynamicResourceHandler
+		where TDynamicResourceHandler : Element
 	{
 		foreach (var (property, key) in resources)
 		{
diff --git a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
index bd3a91e6..ca6e7f4f 100644
--- a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
@@ -1,5 +1,4 @@
-using Microsoft.Maui.Controls.Internals;
-namespace CommunityToolkit.Maui.Markup;
+namespace CommunityToolkit.Maui.Markup;
 
 /// <summary>
 /// Extension Methods for Elements
@@ -13,9 +12,9 @@ public static class ElementExtensions
 	/// <param name="paddingElement"></param>
 	/// <param name="padding"></param>
 	/// <returns>Layout with added Padding</returns>
-	public static TLayout Padding<TLayout>(this TLayout paddingElement, Thickness padding) where TLayout : Element, IPaddingElement
+	public static TLayout Padding<TLayout>(this TLayout paddingElement, Thickness padding) where TLayout : BindableObject
 	{
-		paddingElement.SetValue(PaddingElement.PaddingProperty, padding);
+		paddingElement.SetValue(BindablePropertyHelpers.GetPaddingProperty(paddingElement), padding);
 
 		return paddingElement;
 	}
@@ -28,9 +27,9 @@ public static TLayout Padding<TLayout>(this TLayout paddingElement, Thickness pa
 	/// <param name="horizontalSize"></param>
 	/// <param name="verticalSize"></param>
 	/// <returns>Layout with added Padding</returns>
-	public static TLayout Padding<TLayout>(this TLayout paddingElement, double horizontalSize, double verticalSize) where TLayout : Element, IPaddingElement
+	public static TLayout Padding<TLayout>(this TLayout paddingElement, double horizontalSize, double verticalSize) where TLayout : BindableObject
 	{
-		paddingElement.SetValue(PaddingElement.PaddingProperty, new Thickness(horizontalSize, verticalSize));
+		paddingElement.SetValue(BindablePropertyHelpers.GetPaddingProperty(paddingElement), new Thickness(horizontalSize, verticalSize));
 
 		return paddingElement;
 	}
@@ -45,9 +44,9 @@ public static TLayout Padding<TLayout>(this TLayout paddingElement, double horiz
 	/// <param name="right"></param>
 	/// <param name="bottom"></param>
 	/// <returns>Layout with added Padding</returns>
-	public static TLayout Paddings<TLayout>(this TLayout paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0) where TLayout : Element, IPaddingElement
+	public static TLayout Paddings<TLayout>(this TLayout paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0) where TLayout : BindableObject
 	{
-		paddingElement.SetValue(PaddingElement.PaddingProperty, new Thickness(left, top, right, bottom));
+		paddingElement.SetValue(BindablePropertyHelpers.GetPaddingProperty(paddingElement), new Thickness(left, top, right, bottom));
 
 		return paddingElement;
 	}
@@ -55,11 +54,11 @@ public static TLayout Paddings<TLayout>(this TLayout paddingElement, double left
 	/// <summary>
 	/// Remove Dynamic Resource
 	/// </summary>
-	/// <typeparam name="TBindable"></typeparam>
+	/// <typeparam name="TElement"></typeparam>
 	/// <param name="bindable"></param>
 	/// <param name="properties"></param>
 	/// <returns>Layout without Dynamic Resource</returns>
-	public static TBindable RemoveDynamicResources<TBindable>(this TBindable bindable, params ReadOnlySpan<BindableProperty> properties) where TBindable : BindableObject
+	public static TElement RemoveDynamicResources<TElement>(this TElement bindable, params ReadOnlySpan<BindableProperty> properties) where TElement : Element
 	{
 		foreach (var property in properties)
 		{
@@ -89,65 +88,65 @@ public static TElement Effects<TElement>(this TElement element, params ReadOnlyS
 	/// <summary>
 	/// Sets FontSize
 	/// </summary>
-	/// <typeparam name="TFontElement"></typeparam>
+	/// <typeparam name="TBindable"></typeparam>
 	/// <param name="fontElement"></param>
 	/// <param name="size"></param>
 	/// <returns></returns>
-	public static TFontElement FontSize<TFontElement>(this TFontElement fontElement, double size) where TFontElement : BindableObject, IFontElement
+	public static TBindable FontSize<TBindable>(this TBindable fontElement, double size) where TBindable : BindableObject
 	{
-		fontElement.SetValue(FontElement.FontSizeProperty, size);
+		fontElement.SetValue(BindablePropertyHelpers.GetFontSizeProperty(fontElement), size);
 		return fontElement;
 	}
 
 	/// <summary>
 	/// Sets Bold
 	/// </summary>
-	/// <typeparam name="TFontElement"></typeparam>
+	/// <typeparam name="TBindable"></typeparam>
 	/// <param name="fontElement"></param>
 	/// <returns>Font element with added Bold</returns>
-	public static TFontElement Bold<TFontElement>(this TFontElement fontElement) where TFontElement : BindableObject, IFontElement
+	public static TBindable Bold<TBindable>(this TBindable fontElement) where TBindable : BindableObject
 	{
-		fontElement.SetValue(FontElement.FontAttributesProperty, FontAttributes.Bold);
+		fontElement.SetValue(BindablePropertyHelpers.GetFontAttributesProperty(fontElement), FontAttributes.Bold);
 		return fontElement;
 	}
 
 	/// <summary>
 	/// Sets Italic
 	/// </summary>
-	/// <typeparam name="TFontElement"></typeparam>
+	/// <typeparam name="TBindable"></typeparam>
 	/// <param name="fontElement"></param>
 	/// <returns>Font element with added Italic</returns>
-	public static TFontElement Italic<TFontElement>(this TFontElement fontElement) where TFontElement : BindableObject, IFontElement
+	public static TBindable Italic<TBindable>(this TBindable fontElement) where TBindable : BindableObject
 	{
-		fontElement.SetValue(FontElement.FontAttributesProperty, FontAttributes.Italic);
+		fontElement.SetValue(BindablePropertyHelpers.GetFontAttributesProperty(fontElement), FontAttributes.Italic);
 		return fontElement;
 	}
 
 	/// <summary>
 	/// Sets Font Properties
 	/// </summary>
-	/// <typeparam name="TFontElement"></typeparam>
+	/// <typeparam name="TBindable"></typeparam>
 	/// <param name="fontElement"></param>
 	/// <param name="family"></param>
 	/// <param name="size"></param>
 	/// <param name="bold"></param>
 	/// <param name="italic"></param>
 	/// <returns>Font element with added Font properties</returns>
-	public static TFontElement Font<TFontElement>(
-		this TFontElement fontElement,
+	public static TBindable Font<TBindable>(
+		this TBindable fontElement,
 		string? family = null,
 		double? size = null,
 		bool? bold = null,
-		bool? italic = null) where TFontElement : BindableObject, IFontElement
+		bool? italic = null) where TBindable : BindableObject
 	{
 		if (family != null)
 		{
-			fontElement.SetValue(FontElement.FontFamilyProperty, family);
+			fontElement.SetValue(BindablePropertyHelpers.GetFontFamilyProperty(fontElement), family);
 		}
 
 		if (size.HasValue)
 		{
-			fontElement.SetValue(FontElement.FontSizeProperty, size.Value);
+			fontElement.SetValue(BindablePropertyHelpers.GetFontSizeProperty(fontElement), size.Value);
 		}
 
 		if (bold.HasValue || italic.HasValue)
@@ -164,7 +163,7 @@ public static TFontElement Font<TFontElement>(
 				attributes |= FontAttributes.Italic;
 			}
 
-			fontElement.SetValue(FontElement.FontAttributesProperty, attributes);
+			fontElement.SetValue(BindablePropertyHelpers.GetFontAttributesProperty(fontElement), attributes);
 		}
 
 		return fontElement;
@@ -177,14 +176,14 @@ public static TFontElement Font<TFontElement>(
 	/// <param name="bindable">Element</param>
 	/// <param name="textColor">Text <see cref="Color"/></param>
 	/// <returns></returns>
-	public static TBindable TextColor<TBindable>(this TBindable bindable, Color? textColor) where TBindable : BindableObject, ITextStyle
+	public static TBindable TextColor<TBindable>(this TBindable bindable, Color? textColor) where TBindable : BindableObject
 	{
 		if (bindable is MenuItem)
 		{
 			throw new NotSupportedException($"{typeof(MenuItem)} is not supported");
 		}
 
-		bindable.SetValue(TextElement.TextColorProperty, textColor);
+		bindable.SetValue(BindablePropertyHelpers.GetTextColorProperty(bindable), textColor);
 
 		return bindable;
 	}
diff --git a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
index bcdcfed7..de8373d3 100644
--- a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
@@ -15,7 +15,7 @@ public static class ImageExtensions
 	/// <returns></returns>
 	public static TBindable Source<TBindable>(this TBindable bindable, ImageSource? imageSource) where TBindable : BindableObject, IImageSourcePart
 	{
-		bindable.SetValue(ImageElement.SourceProperty, imageSource);
+		bindable.SetValue(BindablePropertyHelpers.GetImageSourceProperty(bindable), imageSource);
 		return bindable;
 	}
 
@@ -28,7 +28,7 @@ public static TBindable Source<TBindable>(this TBindable bindable, ImageSource?
 	/// <returns></returns>
 	public static TBindable Aspect<TBindable>(this TBindable bindable, Aspect aspect) where TBindable : BindableObject, IImage
 	{
-		bindable.SetValue(ImageElement.AspectProperty, aspect);
+		bindable.SetValue(BindablePropertyHelpers.GetImageAspectProperty(bindable), aspect);
 		return bindable;
 	}
 
@@ -41,7 +41,7 @@ public static TBindable Aspect<TBindable>(this TBindable bindable, Aspect aspect
 	/// <returns></returns>
 	public static TBindable IsOpaque<TBindable>(this TBindable bindable, bool isOpaque) where TBindable : BindableObject, IImage
 	{
-		bindable.SetValue(ImageElement.IsOpaqueProperty, isOpaque);
+		bindable.SetValue(BindablePropertyHelpers.GetImageIsOpaqueProperty(bindable), isOpaque);
 		return bindable;
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs b/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
index 14f6bbfb..c6cd74f2 100644
--- a/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
@@ -14,7 +14,7 @@ public static class PlaceholderExtensions
 	/// <returns></returns>
 	public static TBindable PlaceholderColor<TBindable>(this TBindable bindable, Color? textColor) where TBindable : BindableObject, IPlaceholder
 	{
-		bindable.SetValue(PlaceholderElement.PlaceholderColorProperty, textColor);
+		bindable.SetValue(BindablePropertyHelpers.GetPlaceholderColorProperty(bindable), textColor);
 		return bindable;
 	}
 
@@ -27,7 +27,7 @@ public static TBindable PlaceholderColor<TBindable>(this TBindable bindable, Col
 	/// <returns></returns>
 	public static TBindable Placeholder<TBindable>(this TBindable bindable, string? text) where TBindable : BindableObject, IPlaceholder
 	{
-		bindable.SetValue(PlaceholderElement.PlaceholderProperty, text);
+		bindable.SetValue(BindablePropertyHelpers.GetPlaceholderProperty(bindable), text);
 		return bindable;
 	}
 
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBinding.cs b/src/CommunityToolkit.Maui.Markup/TypedBinding.cs
deleted file mode 100644
index cef93af3..00000000
--- a/src/CommunityToolkit.Maui.Markup/TypedBinding.cs
+++ /dev/null
@@ -1,444 +0,0 @@
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Controls.Xaml.Diagnostics;
-
-namespace CommunityToolkit.Maui.Markup;
-
-sealed class TypedBinding<TSource, TProperty> : TypedBindingBase where TSource : class?
-{
-	readonly WeakReference<TSource?> weakSource = new(null);
-	readonly WeakReference<BindableObject?> weakTarget = new(null);
-
-	readonly Func<TSource, TProperty> getter;
-	readonly Action<TSource, TProperty?>? setter;
-	readonly PropertyChangedProxy[] handlers;
-	readonly List<WeakReference<Element>> ancestryChain = [];
-
-	bool isBindingContextRelativeSource;
-	SetterSpecificity? specificity;
-	BindableProperty? targetProperty;
-
-	public TypedBinding(Func<TSource, TProperty> getter, Action<TSource, TProperty?>? setter, (Func<TSource, object?>, string)[] handlers)
-	{
-		ArgumentNullException.ThrowIfNull(handlers);
-
-		this.getter = getter ?? throw new ArgumentNullException(nameof(getter));
-		this.setter = setter;
-
-		this.handlers = new PropertyChangedProxy[handlers.Length];
-		for (var i = 0; i < handlers.Length; i++)
-		{
-			this.handlers[i] = new PropertyChangedProxy(handlers[i].Item1, handlers[i].Item2, this);
-		}
-	}
-
-	// Applies the binding to a previously set source and target.
-	internal override void Apply(bool fromTarget = false)
-	{
-		base.Apply(fromTarget);
-
-		if (!weakTarget.TryGetTarget(out var target))
-		{
-			Unapply();
-			return;
-		}
-
-		if (weakSource.TryGetTarget(out var source)
-			&& targetProperty is not null
-			&& specificity.HasValue)
-		{
-			ApplyCore(source, target, targetProperty, fromTarget, specificity.Value);
-		}
-	}
-
-	// Applies the binding to a new source or target.
-	[MemberNotNull(nameof(targetProperty)), MemberNotNull(nameof(specificity))]
-	internal override void Apply(object? context, BindableObject bindObj, BindableProperty targetProperty, bool fromBindingContextChanged, SetterSpecificity specificity)
-	{
-		this.targetProperty = targetProperty;
-		this.specificity = specificity;
-		var source = Source ?? Context ?? context;
-		var isApplied = IsApplied;
-
-		if (Source is not null && isApplied && fromBindingContextChanged)
-		{
-			return;
-		}
-
-		base.Apply(source, bindObj, targetProperty, fromBindingContextChanged, specificity);
-
-		if (weakTarget.TryGetTarget(out var prevTarget) && !ReferenceEquals(prevTarget, bindObj))
-		{
-			throw new InvalidOperationException("Binding instances cannot be reused");
-		}
-
-		if (weakSource.TryGetTarget(out var previousSource) && !ReferenceEquals(previousSource, source))
-		{
-			throw new InvalidOperationException("Binding instances cannot be reused");
-		}
-
-		weakSource.SetTarget(source as TSource);
-		weakTarget.SetTarget(bindObj);
-
-		ApplyCore(source as TSource, bindObj, targetProperty, false, specificity);
-	}
-
-	internal override BindingBase Clone()
-	{
-		var handlers = new ValueTuple<Func<TSource, object?>, string>[this.handlers.Length];
-
-		for (var i = 0; i < this.handlers.Length; i++)
-		{
-			handlers[i] = new ValueTuple<Func<TSource, object?>, string>(this.handlers[i].PartGetter, this.handlers[i].PropertyName);
-		}
-
-		return new TypedBinding<TSource, TProperty>(getter, setter, handlers)
-		{
-			Mode = Mode,
-			Converter = Converter,
-			ConverterParameter = ConverterParameter,
-			StringFormat = StringFormat,
-			Source = Source,
-			UpdateSourceEventName = UpdateSourceEventName,
-		};
-	}
-
-	internal override object GetSourceValue(object? value, Type targetPropertyType)
-	{
-		if (Converter is not null)
-		{
-			value = Converter.Convert(value, targetPropertyType, ConverterParameter, CultureInfo.CurrentUICulture);
-		}
-
-		return base.GetSourceValue(value, targetPropertyType);
-	}
-
-	[return: NotNullIfNotNull(nameof(value))]
-	internal override object? GetTargetValue(object? value, Type sourcePropertyType)
-	{
-		if (Converter is not null)
-		{
-			value = Converter.ConvertBack(value, sourcePropertyType, ConverterParameter, CultureInfo.CurrentUICulture);
-		}
-
-		//return base.GetTargetValue(value, sourcePropertyType);
-		return value;
-	}
-
-	internal override void Unapply(bool fromBindingContextChanged = false)
-	{
-		if (Source != null && fromBindingContextChanged && IsApplied)
-		{
-			return;
-		}
-
-		base.Unapply(fromBindingContextChanged: fromBindingContextChanged);
-
-		Unsubscribe();
-
-		weakSource.SetTarget(null);
-		weakTarget.SetTarget(null);
-	}
-
-	internal override void ApplyToResolvedSource(object sourceObject, BindableObject target, BindableProperty property, bool fromTarget, SetterSpecificity specificity)
-	{
-		if (sourceObject is not TSource source)
-		{
-			throw new InvalidOperationException($"Invalid context. Expected type {typeof(TSource).FullName}, but received {sourceObject.GetType()?.FullName ?? "null"}");
-		}
-
-		weakTarget.SetTarget(target);
-		weakSource.SetTarget(source);
-
-		ApplyCore(source, target, property, fromTarget, specificity);
-	}
-
-	internal override void SubscribeToAncestryChanges(List<Element> chain, bool includeBindingContext, bool rootIsSource)
-	{
-		ArgumentNullException.ThrowIfNull(chain);
-
-		ClearAncestryChangeSubscriptions();
-
-		isBindingContextRelativeSource = includeBindingContext;
-		ancestryChain.Clear();
-
-		for (int i = 0; i < chain.Count; i++)
-		{
-			var elem = chain[i];
-			if (i != chain.Count - 1 || !rootIsSource)
-			{
-				// don't care about a successfully resolved source's parents
-				elem.ParentSet += OnElementParentSet;
-			}
-			if (isBindingContextRelativeSource)
-			{
-				elem.BindingContextChanged += OnElementBindingContextChanged;
-			}
-
-			ancestryChain.Add(new WeakReference<Element>(elem));
-		}
-	}
-
-	void ClearAncestryChangeSubscriptions(int beginningWith = 0)
-	{
-		if (ancestryChain.Count is 0)
-		{
-			return;
-		}
-
-		var count = ancestryChain.Count;
-		for (var i = beginningWith; i < count; i++)
-		{
-			var weakElement = ancestryChain.Last();
-			if (weakElement.TryGetTarget(out var elem))
-			{
-				elem.ParentSet -= OnElementParentSet;
-				if (isBindingContextRelativeSource)
-				{
-					elem.BindingContextChanged -= OnElementBindingContextChanged;
-				}
-			}
-			ancestryChain.RemoveAt(ancestryChain.Count - 1);
-		}
-	}
-
-	// ApplyCore is as slim as it should be:
-	// Setting  100000 values						: 17ms.
-	// ApplyCore  100000 (w/o INPC, w/o unapply)	: 20ms.
-	void ApplyCore(TSource? sourceObject, BindableObject target, BindableProperty property, bool fromTarget, SetterSpecificity specificity)
-	{
-		var mode = this.GetRealizedMode(property);
-		if (mode is BindingMode.OneWay or BindingMode.OneTime && fromTarget)
-		{
-			return;
-		}
-
-		var needsGetter = (mode == BindingMode.TwoWay && !fromTarget) || mode == BindingMode.OneWay || mode == BindingMode.OneTime;
-
-		if (sourceObject is not null && mode is BindingMode.OneWay or BindingMode.TwoWay)
-		{
-			Subscribe(sourceObject);
-		}
-
-		if (needsGetter)
-		{
-			var value = FallbackValue ?? property.GetDefaultValue(target);
-			if (sourceObject is not null)
-			{
-				try
-				{
-					var returnValue = getter(sourceObject);
-					value = GetSourceValue(returnValue, property.ReturnType);
-				}
-				catch (Exception ex) when (ex is NullReferenceException or KeyNotFoundException or IndexOutOfRangeException or ArgumentOutOfRangeException)
-				{
-				}
-			}
-			if (!BindingExpressionHelper.TryConvert(ref value, property, property.ReturnType, true))
-			{
-				BindingDiagnostics.SendBindingFailure(this, sourceObject, target, property, "Binding", BindingExpression.CannotConvertTypeErrorMessage, value, property.ReturnType);
-				return;
-			}
-			target.SetValueCore(property, value, SetValueFlags.ClearDynamicResource, BindableObject.SetValuePrivateFlags.Default | BindableObject.SetValuePrivateFlags.Converted, specificity);
-			return;
-		}
-
-		var needsSetter = (mode == BindingMode.TwoWay && fromTarget) || mode == BindingMode.OneWayToSource;
-		if (needsSetter && sourceObject is not null)
-		{
-			var value = GetTargetValue(target.GetValue(property), typeof(TProperty?));
-
-			if (value is null)
-			{
-				setter?.Invoke(sourceObject, default);
-				return;
-			}
-
-			if (!BindingExpressionHelper.TryConvert(ref value, property, typeof(TProperty), false))
-			{
-				BindingDiagnostics.SendBindingFailure(this, sourceObject, target, property, "Binding", BindingExpression.CannotConvertTypeErrorMessage, value, typeof(TProperty));
-				return;
-			}
-
-			setter?.Invoke(sourceObject, (TProperty)value);
-		}
-	}
-
-	// Returns null if the member is not in the chain or the
-	// chain is no longer valid.
-	int? FindAncestryIndex(Element elem)
-	{
-		for (var i = 0; i < ancestryChain.Count; i++)
-		{
-			var weak = ancestryChain[i];
-			if (!weak.TryGetTarget(out var chainMember))
-			{
-				return -1;
-			}
-
-			if (Equals(elem, chainMember))
-			{
-				return i;
-			}
-		}
-
-		return null;
-	}
-
-	void OnElementBindingContextChanged(object? sender, EventArgs e)
-	{
-		if (sender is not Element elem)
-		{
-			return;
-		}
-
-		if (!weakTarget.TryGetTarget(out var target) || targetProperty is null)
-		{
-			return;
-		}
-
-		if (weakSource.TryGetTarget(out var currentSource))
-		{
-			// make sure that this isn't just a repeat notice
-			// from someone else in the chain about our already-resolved 
-			// binding source
-			if (ReferenceEquals(currentSource, elem.BindingContext))
-			{
-				return;
-			}
-		}
-
-		Unapply();
-		Apply(null, target, targetProperty, false, SetterSpecificity.FromBinding);
-	}
-
-	void OnElementParentSet(object? sender, EventArgs e)
-	{
-		if (sender is not Element element || !weakTarget.TryGetTarget(out var target) || targetProperty is null)
-		{
-			return;
-		}
-
-		if (element.Parent is null)
-		{
-			// Remove anything further up in the chain
-			// than the element with the null parent
-			var index = FindAncestryIndex(element);
-
-			if (index is null)
-			{
-				Unapply();
-				return;
-			}
-
-			if (index + 1 < ancestryChain.Count)
-			{
-				ClearAncestryChangeSubscriptions(index.Value + 1);
-			}
-
-			// Force the binding expression to resolve to null
-			// for now, until someone in the chain gets a new
-			// non-null parent.
-			ApplyCore(null, target, targetProperty, false, specificity ?? default);
-		}
-		else
-		{
-			Unapply();
-			Apply(null, target, targetProperty, false, specificity ?? default);
-		}
-	}
-
-	sealed class PropertyChangedProxy
-	{
-		readonly BindingBase binding;
-		readonly PropertyChangedEventHandler handler;
-
-		public PropertyChangedProxy(Func<TSource, object?> partGetter, string propertyName, BindingBase binding)
-		{
-			this.binding = binding;
-
-			PartGetter = partGetter;
-			PropertyName = propertyName;
-			Listener = new BindingExpression.WeakPropertyChangedProxy();
-			//avoid GC collection, keep a ref to the OnPropertyChanged handler
-			handler = OnPropertyChanged;
-		}
-
-		~PropertyChangedProxy() => Listener?.Unsubscribe();
-
-		public Func<TSource, object?> PartGetter { get; }
-		public string PropertyName { get; }
-		public BindingExpression.WeakPropertyChangedProxy? Listener { get; }
-
-		public INotifyPropertyChanged? Part
-		{
-			get => Listener?.TryGetSource(out var target) is true ? target : null;
-			set
-			{
-				//Already subscribed
-				if (Listener?.TryGetSource(out var source) is true
-					&& ReferenceEquals(value, source))
-				{
-					return;
-				}
-
-				//clear out previous subscription
-				Listener?.Unsubscribe();
-
-				if (value is not null)
-				{
-					Listener?.Subscribe(value, handler);
-				}
-			}
-		}
-
-		void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
-		{
-			ArgumentNullException.ThrowIfNull(sender);
-
-			if (!string.IsNullOrEmpty(e.PropertyName)
-				&& string.CompareOrdinal(e.PropertyName, PropertyName) is not 0)
-			{
-				return;
-			}
-
-			if (IPlatformApplication.Current?.Services.GetRequiredApplicationDispatcher() is IDispatcher dispatcher)
-			{
-				dispatcher.DispatchIfRequired(() => binding.Apply(false));
-			}
-			else
-			{
-				binding.Apply(false);
-			}
-		}
-	}
-
-	void Subscribe(TSource sourceObject)
-	{
-		foreach (var handler in handlers)
-		{
-			var part = handler.PartGetter(sourceObject);
-			if (part is null)
-			{
-				break;
-			}
-
-			if (part is not INotifyPropertyChanged notifyPropertyChanged)
-			{
-				continue;
-			}
-
-			handler.Part = notifyPropertyChanged;
-		}
-	}
-
-	void Unsubscribe()
-	{
-		foreach (var handle in handlers)
-		{
-			handle.Listener?.Unsubscribe();
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs
index 984c16e4..d2860299 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs
@@ -199,16 +199,21 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 
 	{
 		var getterFunc = ConvertExpressionToFunc(getter);
+		var path = GetMemberPathOrNullForCapturedValue(getter);
+		var converter = (convert, convertBack) switch
+		{
+			(null, null) => null,
+			_ => new FuncConverter<TSource, TDest, TParam>(convert, convertBack)
+		};
 
-		return Bind(
+		return SetTypedBinding(
 			bindable,
 			targetProperty,
 			getterFunc,
-			[(b => b, GetMemberName(getter))],
+			path,
 			setter,
 			mode,
-			convert,
-			convertBack,
+			converter,
 			converterParameter,
 			stringFormat,
 			source,
@@ -234,12 +239,13 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 
 	{
 		var getterFunc = ConvertExpressionToFunc(getter);
+		var path = GetMemberPathOrNullForCapturedValue(getter);
 
-		return Bind(
+		return SetTypedBinding(
 			bindable,
 			targetProperty,
 			getterFunc,
-			[(b => b, GetMemberName(getter))],
+			path,
 			setter,
 			mode,
 			converter,
@@ -250,12 +256,57 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 			fallbackValue);
 	}
 
-	static Func<TBindingContext, TSource> ConvertExpressionToFunc<TBindingContext, TSource>(in Expression<Func<TBindingContext, TSource>> expression) => expression.Compile();
+	static Func<TBindingContext, TSource> ConvertExpressionToFunc<TBindingContext, TSource>(in Expression<Func<TBindingContext, TSource>> expression)
+	{
+		ArgumentNullException.ThrowIfNull(expression);
+
+		return expression.Compile();
+	}
+
+	static string GetMemberPath<TBindingContext>((Func<TBindingContext, object?>, string)[] handlers)
+	{
+		ArgumentNullException.ThrowIfNull(handlers);
+
+		if (handlers.Length is 0 || handlers.Any(static handler => string.IsNullOrWhiteSpace(handler.Item2)))
+		{
+			throw CreateInvalidGetterException();
+		}
+
+		return string.Join(".", handlers.Select(static handler => handler.Item2));
+	}
+
+	static string? GetMemberPathOrNullForCapturedValue<T>(in Expression<T> expression)
+	{
+		ArgumentNullException.ThrowIfNull(expression);
+
+		var members = new Stack<string>();
+		var currentExpression = UnwrapConvertExpression(expression.Body);
 
-	static string GetMemberName<T>(in Expression<T> expression) => expression.Body switch
+		while (currentExpression is MemberExpression memberExpression)
+		{
+			members.Push(memberExpression.Member.Name);
+			currentExpression = UnwrapConvertExpression(memberExpression.Expression);
+		}
+
+		return currentExpression switch
+		{
+			ParameterExpression when members.Count > 0 => string.Join(".", members),
+			ConstantExpression when members.Count > 0 => null,
+			null when members.Count > 0 => null,
+			_ => throw CreateInvalidGetterException()
+		};
+	}
+
+	static Expression? UnwrapConvertExpression(Expression? expression)
 	{
-		MemberExpression m => m.Member.Name,
-		UnaryExpression { Operand: MemberExpression m } => m.Member.Name,
-		_ => throw new InvalidOperationException("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic")
-	};
+		while (expression is UnaryExpression { NodeType: ExpressionType.Convert or ExpressionType.ConvertChecked } unaryExpression)
+		{
+			expression = unaryExpression.Operand;
+		}
+
+		return expression;
+	}
+
+	static InvalidOperationException CreateInvalidGetterException()
+		=> new("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic");
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index 671519e5..3bf35565 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -1,4 +1,5 @@
-using System.Windows.Input;
+using System.ComponentModel;
+using System.Windows.Input;
 
 namespace CommunityToolkit.Maui.Markup;
 
@@ -7,6 +8,12 @@ namespace CommunityToolkit.Maui.Markup;
 /// </summary>
 public static partial class TypedBindingExtensions
 {
+	static readonly BindableProperty sourceUpdateHandlersProperty = BindableProperty.CreateAttached(
+		"SourceUpdateHandlers",
+		typeof(Dictionary<BindableProperty, SourceUpdateHandlers>),
+		typeof(TypedBindingExtensions),
+		default(Dictionary<BindableProperty, SourceUpdateHandlers>));
+
 	/// <summary>Bind to the <typeparamref name="TBindable"/>'s default Command properties </summary>
 	public static TBindable BindCommand<TBindable, TCommandBindingContext>(
 		this TBindable bindable,
@@ -46,23 +53,21 @@ public static TBindable BindCommand<TBindable, TCommandBindingContext, TParamete
 	{
 		var (commandProperty, parameterProperty) = DefaultBindableProperties.GetCommandAndCommandParameterProperty<TBindable>();
 
-		Bind(bindable,
+		SetTypedBinding<TBindable, TCommandBindingContext, ICommand, object?, object?>(bindable,
 			commandProperty,
 			getter,
-			handlers,
+			GetMemberPath(handlers),
 			setter,
 			commandBindingMode,
 			source: source);
 
 		if (parameterGetter is not null)
 		{
-			ArgumentNullException.ThrowIfNull(parameterHandlers);
-
-			Bind(
+			SetTypedBinding<TBindable, TParameterBindingContext, TParameterSource, object?, object?>(
 				bindable,
 				parameterProperty,
 				parameterGetter,
-				parameterHandlers,
+				parameterHandlers is null ? null : GetMemberPath(parameterHandlers),
 				parameterSetter,
 				parameterBindingMode,
 				source: parameterSource);
@@ -155,18 +160,18 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 			_ => new FuncConverter<TSource, TDest, TParam>(convert, convertBack)
 		};
 
-		bindable.SetBinding(targetProperty, new TypedBinding<TBindingContext, TSource>(getter, setter, handlers)
-		{
-			Mode = mode,
-			Converter = converter,
-			ConverterParameter = converterParameter,
-			StringFormat = stringFormat,
-			Source = source,
-			TargetNullValue = targetNullValue,
-			FallbackValue = fallbackValue
-		});
-
-		return bindable;
+		return SetTypedBinding(bindable,
+			targetProperty,
+			getter,
+			GetMemberPath(handlers),
+			setter,
+			mode,
+			converter,
+			converterParameter,
+			stringFormat,
+			source,
+			targetNullValue,
+			fallbackValue);
 	}
 
 	/// <summary>Bind to a specified property with inline conversion and conversion parameter</summary>
@@ -186,17 +191,279 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 		where TBindable : BindableObject
 		where TBindingContext : class?
 	{
-		bindable.SetBinding(targetProperty, new TypedBinding<TBindingContext, TSource>(getter, setter, handlers)
+		return SetTypedBinding(bindable,
+			targetProperty,
+			getter,
+			GetMemberPath(handlers),
+			setter,
+			mode,
+			converter,
+			converterParameter,
+			stringFormat,
+			source,
+			targetNullValue,
+			fallbackValue);
+	}
+
+	static TBindable SetTypedBinding<TBindable, TBindingContext, TSource, TParam, TDest>(
+		TBindable bindable,
+		BindableProperty targetProperty,
+		Func<TBindingContext, TSource> getter,
+		string? path,
+		Action<TBindingContext, TSource?>? setter = null,
+		BindingMode mode = BindingMode.Default,
+		IValueConverter? converter = null,
+		TParam? converterParameter = default,
+		string? stringFormat = null,
+		TBindingContext? source = default,
+		TDest? targetNullValue = default,
+		TDest? fallbackValue = default)
+		where TBindable : BindableObject
+		where TBindingContext : class?
+	{
+		ArgumentNullException.ThrowIfNull(getter);
+
+		if (path is null && setter is not null)
 		{
-			Mode = mode,
-			Converter = converter,
-			ConverterParameter = converterParameter,
-			StringFormat = stringFormat,
-			Source = source,
-			TargetNullValue = targetNullValue,
-			FallbackValue = fallbackValue
-		});
+			throw CreateInvalidGetterException();
+		}
+
+		RemoveSourceUpdateHandler(bindable, targetProperty);
+
+		var resolvedMode = ResolveBindingMode(targetProperty, mode);
+		var updatesTarget = UpdatesTarget(resolvedMode);
+		var isApplyingBinding = false;
+
+		void ApplyBinding()
+		{
+			if (!updatesTarget)
+			{
+				bindable.RemoveBinding(targetProperty);
+				return;
+			}
+
+			try
+			{
+				isApplyingBinding = true;
+				var binding = new Binding(
+					path ?? Binding.SelfPath,
+					GetTargetUpdateBindingMode(resolvedMode),
+					path is null ? new GetterValueConverter<TBindingContext, TSource>(getter, converter) : converter,
+					converterParameter,
+					stringFormat,
+					source)
+				{
+					TargetNullValue = targetNullValue,
+					FallbackValue = fallbackValue
+				};
+
+				bindable.SetBinding(targetProperty, binding);
+			}
+			finally
+			{
+				isApplyingBinding = false;
+			}
+		}
+
+		ApplyBinding();
+
+		if (setter is not null && UpdatesSource(resolvedMode))
+		{
+			var sourceUpdateHandler = CreateSourceUpdateHandler(bindable, targetProperty, getter, setter, converter, converterParameter, source, () => isApplyingBinding, ApplyBinding);
+			var bindingContextChangedHandler = source is null && !updatesTarget
+				? CreateBindingContextChangedHandler(bindable, targetProperty, getter, setter, converter, converterParameter, source)
+				: null;
+
+			SetSourceUpdateHandler(bindable, targetProperty, sourceUpdateHandler, bindingContextChangedHandler);
+
+			if (!updatesTarget)
+			{
+				UpdateSourceFromTarget(bindable, targetProperty, getter, setter, converter, converterParameter, source);
+			}
+		}
 
 		return bindable;
 	}
+
+	static BindingMode ResolveBindingMode(BindableProperty targetProperty, BindingMode mode)
+		=> mode is BindingMode.Default ? targetProperty.DefaultBindingMode : mode;
+
+	static bool UpdatesTarget(BindingMode mode)
+		=> mode is BindingMode.OneWay or BindingMode.TwoWay or BindingMode.OneTime;
+
+	static bool UpdatesSource(BindingMode mode)
+		=> mode is BindingMode.TwoWay or BindingMode.OneWayToSource;
+
+	static BindingMode GetTargetUpdateBindingMode(BindingMode mode)
+		=> mode is BindingMode.OneTime ? BindingMode.OneTime : BindingMode.OneWay;
+
+	static PropertyChangedEventHandler CreateSourceUpdateHandler<TBindingContext, TSource, TParam>(
+		BindableObject bindable,
+		BindableProperty targetProperty,
+		Func<TBindingContext, TSource> getter,
+		Action<TBindingContext, TSource?> setter,
+		IValueConverter? converter,
+		TParam? converterParameter,
+		TBindingContext? source,
+		Func<bool> isApplyingBinding,
+		Action applyBinding)
+		where TBindingContext : class?
+	{
+		return (_, args) =>
+		{
+			if (isApplyingBinding() || !string.Equals(args.PropertyName, targetProperty.PropertyName, StringComparison.Ordinal))
+			{
+				return;
+			}
+
+			if (!UpdateSourceFromTarget(bindable, targetProperty, getter, setter, converter, converterParameter, source))
+			{
+				return;
+			}
+
+			applyBinding();
+		};
+	}
+
+	static EventHandler CreateBindingContextChangedHandler<TBindingContext, TSource, TParam>(
+		BindableObject bindable,
+		BindableProperty targetProperty,
+		Func<TBindingContext, TSource> getter,
+		Action<TBindingContext, TSource?> setter,
+		IValueConverter? converter,
+		TParam? converterParameter,
+		TBindingContext? source)
+		where TBindingContext : class?
+	{
+		return (_, _) => UpdateSourceFromTarget(bindable, targetProperty, getter, setter, converter, converterParameter, source);
+	}
+
+	static bool UpdateSourceFromTarget<TBindingContext, TSource, TParam>(
+		BindableObject bindable,
+		BindableProperty targetProperty,
+		Func<TBindingContext, TSource> getter,
+		Action<TBindingContext, TSource?> setter,
+		IValueConverter? converter,
+		TParam? converterParameter,
+		TBindingContext? source)
+		where TBindingContext : class?
+	{
+		var sourceObject = source ?? bindable.BindingContext as TBindingContext;
+		if (sourceObject is null || !TryConvertTargetValue<TSource, TParam>(bindable.GetValue(targetProperty), converter, converterParameter, out var sourceValue))
+		{
+			return false;
+		}
+
+		if (!TryGetCurrentSourceValue(sourceObject, getter, out var currentSourceValue) || Equals(currentSourceValue, sourceValue))
+		{
+			return false;
+		}
+
+		setter(sourceObject, sourceValue);
+		return true;
+	}
+
+	static bool TryGetCurrentSourceValue<TBindingContext, TSource>(
+		TBindingContext sourceObject,
+		Func<TBindingContext, TSource> getter,
+		out TSource sourceValue)
+	{
+		try
+		{
+			sourceValue = getter(sourceObject);
+			return true;
+		}
+		catch (Exception ex) when (ex is NullReferenceException or KeyNotFoundException or IndexOutOfRangeException or ArgumentOutOfRangeException)
+		{
+			sourceValue = default!;
+			return false;
+		}
+	}
+
+	static bool TryConvertTargetValue<TSource, TParam>(object? targetValue, IValueConverter? converter, TParam? converterParameter, out TSource? sourceValue)
+	{
+		var convertedValue = converter?.ConvertBack(targetValue, typeof(TSource), converterParameter, System.Globalization.CultureInfo.CurrentUICulture) ?? targetValue;
+
+		if (ReferenceEquals(convertedValue, BindableProperty.UnsetValue) || ReferenceEquals(convertedValue, Binding.DoNothing))
+		{
+			sourceValue = default;
+			return false;
+		}
+
+		try
+		{
+			sourceValue = convertedValue is null ? default : ConvertTargetValue<TSource>(convertedValue);
+			return true;
+		}
+		catch (Exception ex) when (ex is InvalidCastException or FormatException or OverflowException or NotSupportedException)
+		{
+			sourceValue = default;
+			return false;
+		}
+	}
+
+	static TSource ConvertTargetValue<TSource>(object targetValue)
+	{
+		var sourceType = Nullable.GetUnderlyingType(typeof(TSource)) ?? typeof(TSource);
+		if (targetValue is string targetText && string.IsNullOrEmpty(targetText) && Nullable.GetUnderlyingType(typeof(TSource)) is not null)
+		{
+			return default!;
+		}
+
+		return targetValue is TSource sourceValue
+			? sourceValue
+			: (TSource)System.Convert.ChangeType(targetValue, sourceType, System.Globalization.CultureInfo.CurrentUICulture);
+	}
+
+	static void SetSourceUpdateHandler(BindableObject bindable, BindableProperty targetProperty, PropertyChangedEventHandler propertyChangedHandler, EventHandler? bindingContextChangedHandler)
+	{
+		var handlers = (Dictionary<BindableProperty, SourceUpdateHandlers>?)bindable.GetValue(sourceUpdateHandlersProperty);
+		if (handlers is null)
+		{
+			handlers = [];
+			bindable.SetValue(sourceUpdateHandlersProperty, handlers);
+		}
+
+		handlers[targetProperty] = new SourceUpdateHandlers(propertyChangedHandler, bindingContextChangedHandler);
+		bindable.PropertyChanged += propertyChangedHandler;
+		if (bindingContextChangedHandler is not null)
+		{
+			bindable.BindingContextChanged += bindingContextChangedHandler;
+		}
+	}
+
+	static void RemoveSourceUpdateHandler(BindableObject bindable, BindableProperty targetProperty)
+	{
+		var handlers = (Dictionary<BindableProperty, SourceUpdateHandlers>?)bindable.GetValue(sourceUpdateHandlersProperty);
+		if (handlers?.Remove(targetProperty, out var handler) is true)
+		{
+			bindable.PropertyChanged -= handler.PropertyChangedHandler;
+			if (handler.BindingContextChangedHandler is not null)
+			{
+				bindable.BindingContextChanged -= handler.BindingContextChangedHandler;
+			}
+		}
+	}
+
+	sealed record SourceUpdateHandlers(PropertyChangedEventHandler PropertyChangedHandler, EventHandler? BindingContextChangedHandler);
+
+	sealed class GetterValueConverter<TBindingContext, TSource>(Func<TBindingContext, TSource> getter, IValueConverter? converter) : IValueConverter
+		where TBindingContext : class?
+	{
+		public object? Convert(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
+		{
+			if (value is not TBindingContext sourceObject)
+			{
+				return BindableProperty.UnsetValue;
+			}
+
+			var sourceValue = getter(sourceObject);
+			return converter?.Convert(sourceValue, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? sourceValue;
+		}
+
+		public object? ConvertBack(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
+			=> BindableProperty.UnsetValue;
+
+		public override string? ToString() => converter?.ToString() ?? base.ToString();
+	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs b/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
index 04227309..2f7db0c2 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
@@ -57,17 +57,17 @@ public static TGestureElement BindSwipeGesture<TGestureElement, TCommandBindingC
 			_ => ConvertExpressionToFunc(parameterGetter)
 		};
 
-		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = parameterGetter switch
+		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberNameOrNullForCapturedValue(parameterGetter) switch
 		{
 			null => null,
-			_ => [(b => b, GetMemberName(parameterGetter))]
+			var memberName => [(b => b, memberName)]
 		};
 
 		return BindSwipeGesture(
 			gestureElement,
 			getterFunc,
 			[
-				(b => b, GetMemberName(getter))
+				(b => b, GetMemberNameOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
 			],
 			setter,
 			source,
@@ -182,17 +182,17 @@ public static TGestureElement BindTapGesture<TGestureElement, TCommandBindingCon
 			_ => ConvertExpressionToFunc(parameterGetter)
 		};
 
-		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = parameterGetter switch
+		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberNameOrNullForCapturedValue(parameterGetter) switch
 		{
 			null => null,
-			_ => [(b => b, GetMemberName(parameterGetter))]
+			var memberName => [(b => b, memberName)]
 		};
 
 		return BindTapGesture(
 			gestureElement,
 			getterFunc,
 			[
-				(b => b, GetMemberName(getter))
+				(b => b, GetMemberNameOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
 			],
 			setter,
 			source,
@@ -261,12 +261,28 @@ public static TGestureElement BindTapGesture<TGestureElement, TCommandBindingCon
 
 	static Func<TBindingContext, TSource> ConvertExpressionToFunc<TBindingContext, TSource>(in Expression<Func<TBindingContext, TSource>> expression) => expression.Compile();
 
-	static string GetMemberName<T>(in Expression<T> expression) => expression.Body switch
+	static string? GetMemberNameOrNullForCapturedValue<T>(in Expression<T>? expression)
 	{
-		MemberExpression m => m.Member.Name,
-		UnaryExpression { Operand: MemberExpression m } => m.Member.Name,
-		_ => throw new InvalidOperationException("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic")
-	};
+		if (expression is null)
+		{
+			return null;
+		}
+
+		var body = expression.Body is UnaryExpression { Operand: MemberExpression unaryMemberExpression }
+			? unaryMemberExpression
+			: expression.Body;
+
+		return body switch
+		{
+			MemberExpression { Expression: ConstantExpression } => null,
+			MemberExpression { Expression: null } => null,
+			MemberExpression memberExpression => memberExpression.Member.Name,
+			_ => throw CreateInvalidGetterException()
+		};
+	}
+
+	static InvalidOperationException CreateInvalidGetterException()
+		=> new("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic");
 
 	static TGestureRecognizer BindGesture<TGestureRecognizer, TGestureElement, TCommandBindingContext, TParameterBindingContext, TParameterSource>(
 		this TGestureElement gestureElement,

From 95a0d725abecb9ad909935d40ef687ae8d880275 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Wed, 24 Jun 2026 19:34:50 +0200
Subject: [PATCH 02/17] Address internals-removal review feedback

Narrow padding and text color helpers back to public supported surfaces, add explicit typed binding removal for setter write-back handlers, and cover the adjusted behavior in tests.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PaddingElementExtensionsTests.cs          |  78 ++++++----
 .../TypedBindingExtensionsTests.cs            |  16 +++
 .../ElementExtensions.cs                      | 135 +++++++++++++-----
 .../TypedBindingsExtensions.Handlers.cs       |  10 ++
 4 files changed, 176 insertions(+), 63 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
index 3e55c0b1..ccb36cde 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
@@ -2,38 +2,68 @@
 using NUnit.Framework;
 namespace CommunityToolkit.Maui.Markup.UnitTests;
 
-[TestFixture(typeof(Button))]
-[TestFixture(typeof(Border))]
-[TestFixture(typeof(ImageButton))]
-[TestFixture(typeof(Label))]
-[TestFixture(typeof(Page))]
-class PaddingElementExtensionsTests<TPaddingElement> : BaseMarkupTestFixture<TPaddingElement> where TPaddingElement : BindableObject, new()
+[TestFixture]
+class PaddingElementExtensionsTests : BaseMarkupTestFixture
 {
-	[Test]
-	public void PaddingThickness()
-		=> TestPropertiesSet(l => l.Padding(new Thickness(1)), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1)));
+	static readonly PaddingCase[] paddingCases =
+	[
+		new("Border", () => new Border(), Border.PaddingProperty, (bindable, padding) => ((Border)bindable).Padding(padding), (bindable, uniformSize) => ((Border)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Border)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Border)bindable).Paddings(left, top, right, bottom)),
+		new("Button", () => new Button(), Button.PaddingProperty, (bindable, padding) => ((Button)bindable).Padding(padding), (bindable, uniformSize) => ((Button)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Button)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Button)bindable).Paddings(left, top, right, bottom)),
+		new("ImageButton", () => new ImageButton(), ImageButton.PaddingProperty, (bindable, padding) => ((ImageButton)bindable).Padding(padding), (bindable, uniformSize) => ((ImageButton)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((ImageButton)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((ImageButton)bindable).Paddings(left, top, right, bottom)),
+		new("Label", () => new Label(), Label.PaddingProperty, (bindable, padding) => ((Label)bindable).Padding(padding), (bindable, uniformSize) => ((Label)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Label)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Label)bindable).Paddings(left, top, right, bottom)),
+		new("Page", () => new Page(), Page.PaddingProperty, (bindable, padding) => ((Page)bindable).Padding(padding), (bindable, uniformSize) => ((Page)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Page)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Page)bindable).Paddings(left, top, right, bottom))
+	];
 
-	[Test]
-	public void PaddingUniform()
-		=> TestPropertiesSet(l => l.Padding(1), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1)));
+	[TestCaseSource(nameof(paddingCases))]
+	public void PaddingThickness(PaddingCase paddingCase)
+	{
+		var bindable = paddingCase.Create();
+		TestPropertiesSet(bindable, b => paddingCase.SetThickness(b, new Thickness(1)), (paddingCase.Property, new Thickness(0), new Thickness(1)));
+	}
 
-	[Test]
-	public void PaddingHorizontalVertical()
-		=> TestPropertiesSet(l => l.Padding(1, 2), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1, 2)));
+	[TestCaseSource(nameof(paddingCases))]
+	public void PaddingUniform(PaddingCase paddingCase)
+	{
+		var bindable = paddingCase.Create();
+		TestPropertiesSet(bindable, b => paddingCase.SetUniform(b, 1), (paddingCase.Property, new Thickness(0), new Thickness(1)));
+	}
 
-	[Test]
-	public void Paddings()
-		=> TestPropertiesSet(l => l.Paddings(left: 1, top: 2, right: 3, bottom: 4), (BindablePropertyHelpers.GetPaddingProperty(Bindable), new Thickness(0), new Thickness(1, 2, 3, 4)));
+	[TestCaseSource(nameof(paddingCases))]
+	public void PaddingHorizontalVertical(PaddingCase paddingCase)
+	{
+		var bindable = paddingCase.Create();
+		TestPropertiesSet(bindable, b => paddingCase.SetHorizontalVertical(b, 1, 2), (paddingCase.Property, new Thickness(0), new Thickness(1, 2)));
+	}
+
+	[TestCaseSource(nameof(paddingCases))]
+	public void Paddings(PaddingCase paddingCase)
+	{
+		var bindable = paddingCase.Create();
+		TestPropertiesSet(bindable, b => paddingCase.SetPaddings(b, 1, 2, 3, 4), (paddingCase.Property, new Thickness(0), new Thickness(1, 2, 3, 4)));
+	}
 
 	[Test]
 	public void SupportDerivedFrom()
 	{
-		Assert.That(new DerivedFrom()
-						.Padding(1)
-						.Padding(1, 2)
-						.Paddings(left: 1, top: 2, right: 3, bottom: 4),
-					Is.InstanceOf<DerivedFrom>());
+		DerivedFrom derivedFrom = new DerivedFrom()
+			.Padding(1)
+			.Padding(1, 2)
+			.Paddings(left: 1, top: 2, right: 3, bottom: 4);
+
+		Assert.That(derivedFrom, Is.InstanceOf<DerivedFrom>());
+	}
+
+	public sealed record PaddingCase(
+		string Name,
+		Func<BindableObject> Create,
+		BindableProperty Property,
+		Action<BindableObject, Thickness> SetThickness,
+		Action<BindableObject, double> SetUniform,
+		Action<BindableObject, double, double> SetHorizontalVertical,
+		Action<BindableObject, double, double, double, double> SetPaddings)
+	{
+		public override string ToString() => Name;
 	}
 
 	class DerivedFrom : ContentView { }
-}
\ No newline at end of file
+}
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
index f1996b93..af07ec30 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
@@ -214,6 +214,22 @@ public void DefaultTwoWayTypedBindingWithoutSetterDoesNotWriteBack()
 		});
 	}
 
+	[Test]
+	public void RemoveTypedBindingRemovesSetterWriteBackHandler()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var slider = new Slider
+		{
+			BindingContext = viewModel
+		}.Bind(Slider.ValueProperty, static (ViewModel viewModel) => viewModel.Percentage, static (viewModel, percentage) => viewModel.Percentage = percentage);
+
+		slider.RemoveTypedBinding(Slider.ValueProperty);
+		slider.Value = 1;
+
+		Assert.That(viewModel.Percentage, Is.EqualTo(ViewModel.DefaultPercentage));
+	}
+
 	[Test]
 	public void DefaultTwoWayObjectTypedBindingWithoutSetterDoesNotWriteBack()
 	{
diff --git a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
index ca6e7f4f..442e22f4 100644
--- a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
@@ -5,49 +5,106 @@
 /// </summary>
 public static class ElementExtensions
 {
-	/// <summary>
-	/// Set Padding
-	/// </summary>
-	/// <typeparam name="TLayout"></typeparam>
-	/// <param name="paddingElement"></param>
-	/// <param name="padding"></param>
-	/// <returns>Layout with added Padding</returns>
-	public static TLayout Padding<TLayout>(this TLayout paddingElement, Thickness padding) where TLayout : BindableObject
-	{
-		paddingElement.SetValue(BindablePropertyHelpers.GetPaddingProperty(paddingElement), padding);
+	/// <summary>Set Padding.</summary>
+	/// <param name="paddingElement">Element on which to set padding.</param>
+	/// <param name="padding">Padding to set.</param>
+	/// <param name="overload">Unused overload discriminator.</param>
+	/// <returns>Element with added Padding.</returns>
+	public static TBorder Padding<TBorder>(this TBorder paddingElement, Thickness padding, Border? overload = null) where TBorder : Border => SetPadding(paddingElement, padding);
 
-		return paddingElement;
-	}
+	/// <inheritdoc />
+	public static TButton Padding<TButton>(this TButton paddingElement, Thickness padding, Button? overload = null) where TButton : Button => SetPadding(paddingElement, padding);
 
-	/// <summary>
-	/// Set Padding
-	/// </summary>
-	/// <typeparam name="TLayout"></typeparam>
-	/// <param name="paddingElement"></param>
-	/// <param name="horizontalSize"></param>
-	/// <param name="verticalSize"></param>
-	/// <returns>Layout with added Padding</returns>
-	public static TLayout Padding<TLayout>(this TLayout paddingElement, double horizontalSize, double verticalSize) where TLayout : BindableObject
-	{
-		paddingElement.SetValue(BindablePropertyHelpers.GetPaddingProperty(paddingElement), new Thickness(horizontalSize, verticalSize));
+	/// <inheritdoc />
+	public static TContentPresenter Padding<TContentPresenter>(this TContentPresenter paddingElement, Thickness padding, ContentPresenter? overload = null) where TContentPresenter : ContentPresenter => SetPadding(paddingElement, padding);
 
-		return paddingElement;
-	}
+	/// <inheritdoc />
+	public static TImageButton Padding<TImageButton>(this TImageButton paddingElement, Thickness padding, ImageButton? overload = null) where TImageButton : ImageButton => SetPadding(paddingElement, padding);
 
-	/// <summary>
-	/// Set Padding
-	/// </summary>
-	/// <typeparam name="TLayout"></typeparam>
-	/// <param name="paddingElement"></param>
-	/// <param name="left"></param>
-	/// <param name="top"></param>
-	/// <param name="right"></param>
-	/// <param name="bottom"></param>
-	/// <returns>Layout with added Padding</returns>
-	public static TLayout Paddings<TLayout>(this TLayout paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0) where TLayout : BindableObject
-	{
-		paddingElement.SetValue(BindablePropertyHelpers.GetPaddingProperty(paddingElement), new Thickness(left, top, right, bottom));
+	/// <inheritdoc />
+	public static TLabel Padding<TLabel>(this TLabel paddingElement, Thickness padding, Label? overload = null) where TLabel : Label => SetPadding(paddingElement, padding);
+
+	/// <inheritdoc />
+	public static TLayout Padding<TLayout>(this TLayout paddingElement, Thickness padding, Layout? overload = null) where TLayout : Layout => SetPadding(paddingElement, padding);
+
+	/// <inheritdoc />
+	public static TPage Padding<TPage>(this TPage paddingElement, Thickness padding, Page? overload = null) where TPage : Page => SetPadding(paddingElement, padding);
+
+	/// <inheritdoc />
+	public static TScrollView Padding<TScrollView>(this TScrollView paddingElement, Thickness padding, ScrollView? overload = null) where TScrollView : ScrollView => SetPadding(paddingElement, padding);
+
+	/// <inheritdoc />
+	public static TTemplatedView Padding<TTemplatedView>(this TTemplatedView paddingElement, Thickness padding, TemplatedView? overload = null) where TTemplatedView : TemplatedView => SetPadding(paddingElement, padding);
+
+	/// <summary>Set Padding.</summary>
+	/// <param name="paddingElement">Element on which to set padding.</param>
+	/// <param name="horizontalSize">Horizontal padding.</param>
+	/// <param name="verticalSize">Vertical padding.</param>
+	/// <param name="overload">Unused overload discriminator.</param>
+	/// <returns>Element with added Padding.</returns>
+	public static TBorder Padding<TBorder>(this TBorder paddingElement, double horizontalSize, double verticalSize, Border? overload = null) where TBorder : Border => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
 
+	/// <inheritdoc />
+	public static TButton Padding<TButton>(this TButton paddingElement, double horizontalSize, double verticalSize, Button? overload = null) where TButton : Button => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <inheritdoc />
+	public static TContentPresenter Padding<TContentPresenter>(this TContentPresenter paddingElement, double horizontalSize, double verticalSize, ContentPresenter? overload = null) where TContentPresenter : ContentPresenter => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <inheritdoc />
+	public static TImageButton Padding<TImageButton>(this TImageButton paddingElement, double horizontalSize, double verticalSize, ImageButton? overload = null) where TImageButton : ImageButton => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <inheritdoc />
+	public static TLabel Padding<TLabel>(this TLabel paddingElement, double horizontalSize, double verticalSize, Label? overload = null) where TLabel : Label => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <inheritdoc />
+	public static TLayout Padding<TLayout>(this TLayout paddingElement, double horizontalSize, double verticalSize, Layout? overload = null) where TLayout : Layout => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <inheritdoc />
+	public static TPage Padding<TPage>(this TPage paddingElement, double horizontalSize, double verticalSize, Page? overload = null) where TPage : Page => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <inheritdoc />
+	public static TScrollView Padding<TScrollView>(this TScrollView paddingElement, double horizontalSize, double verticalSize, ScrollView? overload = null) where TScrollView : ScrollView => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <inheritdoc />
+	public static TTemplatedView Padding<TTemplatedView>(this TTemplatedView paddingElement, double horizontalSize, double verticalSize, TemplatedView? overload = null) where TTemplatedView : TemplatedView => SetPadding(paddingElement, new Thickness(horizontalSize, verticalSize));
+
+	/// <summary>Set Padding.</summary>
+	/// <param name="paddingElement">Element on which to set padding.</param>
+	/// <param name="left">Left padding.</param>
+	/// <param name="top">Top padding.</param>
+	/// <param name="right">Right padding.</param>
+	/// <param name="bottom">Bottom padding.</param>
+	/// <param name="overload">Unused overload discriminator.</param>
+	/// <returns>Element with added Padding.</returns>
+	public static TBorder Paddings<TBorder>(this TBorder paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, Border? overload = null) where TBorder : Border => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TButton Paddings<TButton>(this TButton paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, Button? overload = null) where TButton : Button => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TContentPresenter Paddings<TContentPresenter>(this TContentPresenter paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, ContentPresenter? overload = null) where TContentPresenter : ContentPresenter => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TImageButton Paddings<TImageButton>(this TImageButton paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, ImageButton? overload = null) where TImageButton : ImageButton => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TLabel Paddings<TLabel>(this TLabel paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, Label? overload = null) where TLabel : Label => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TLayout Paddings<TLayout>(this TLayout paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, Layout? overload = null) where TLayout : Layout => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TPage Paddings<TPage>(this TPage paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, Page? overload = null) where TPage : Page => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TScrollView Paddings<TScrollView>(this TScrollView paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, ScrollView? overload = null) where TScrollView : ScrollView => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	/// <inheritdoc />
+	public static TTemplatedView Paddings<TTemplatedView>(this TTemplatedView paddingElement, double left = 0, double top = 0, double right = 0, double bottom = 0, TemplatedView? overload = null) where TTemplatedView : TemplatedView => SetPadding(paddingElement, new Thickness(left, top, right, bottom));
+
+	static TElement SetPadding<TElement>(TElement paddingElement, Thickness padding) where TElement : BindableObject
+	{
+		paddingElement.SetValue(BindablePropertyHelpers.GetPaddingProperty(paddingElement), padding);
 		return paddingElement;
 	}
 
@@ -176,7 +233,7 @@ public static TBindable Font<TBindable>(
 	/// <param name="bindable">Element</param>
 	/// <param name="textColor">Text <see cref="Color"/></param>
 	/// <returns></returns>
-	public static TBindable TextColor<TBindable>(this TBindable bindable, Color? textColor) where TBindable : BindableObject
+	public static TBindable TextColor<TBindable>(this TBindable bindable, Color? textColor) where TBindable : BindableObject, ITextStyle
 	{
 		if (bindable is MenuItem)
 		{
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index 3bf35565..278a63ab 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -205,6 +205,16 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 			fallbackValue);
 	}
 
+	/// <summary>Remove a typed binding from a specified property.</summary>
+	public static TBindable RemoveTypedBinding<TBindable>(this TBindable bindable, BindableProperty targetProperty)
+		where TBindable : BindableObject
+	{
+		RemoveSourceUpdateHandler(bindable, targetProperty);
+		bindable.RemoveBinding(targetProperty);
+
+		return bindable;
+	}
+
 	static TBindable SetTypedBinding<TBindable, TBindingContext, TSource, TParam, TDest>(
 		TBindable bindable,
 		BindableProperty targetProperty,

From 768568855e92f94208211c7c93819c6dd973c55a Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 25 Jun 2026 12:34:55 +0200
Subject: [PATCH 03/17] Clarify typed binding removal behavior

Document RemoveTypedBinding for typed bindings with setter write-back handlers and explain why target-side write-back restores the public binding.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../TypedBindingsExtensions.Handlers.cs                       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index 278a63ab..02fc0d1c 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -206,6 +206,9 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 	}
 
 	/// <summary>Remove a typed binding from a specified property.</summary>
+	/// <remarks>
+	/// Use this instead of <see cref="BindableObject.RemoveBinding(BindableProperty)"/> for typed bindings created with a setter so source write-back handlers are detached too.
+	/// </remarks>
 	public static TBindable RemoveTypedBinding<TBindable>(this TBindable bindable, BindableProperty targetProperty)
 		where TBindable : BindableObject
 	{
@@ -331,6 +334,7 @@ static PropertyChangedEventHandler CreateSourceUpdateHandler<TBindingContext, TS
 				return;
 			}
 
+			// A direct target value write can detach the public Binding, so restore it after source write-back.
 			applyBinding();
 		};
 	}

From 26778b4a3163a7cde687389b82679845b7ffbd38 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 25 Jun 2026 13:11:18 +0200
Subject: [PATCH 04/17] Guard typed binding converter write-back

Treat conversion-style ConvertBack failures as skipped source updates and cover the behavior with a typed binding regression test.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../TypedBindingExtensionsTests.cs            | 25 +++++++++++++++++++
 .../TypedBindingsExtensions.Handlers.cs       | 15 ++++++-----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
index af07ec30..ff458bd0 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
@@ -270,6 +270,24 @@ public void BindingDoNothingConvertBackSkipsSetterWriteBack()
 		Assert.That(viewModel.Percentage, Is.EqualTo(ViewModel.DefaultPercentage));
 	}
 
+	[Test]
+	public void ThrowingConvertBackSkipsSetterWriteBack()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var slider = new Slider
+		{
+			BindingContext = viewModel
+		}.Bind<Slider, ViewModel, double, object?, double>(
+			Slider.ValueProperty,
+			static viewModel => viewModel.Percentage,
+			static (viewModel, percentage) => viewModel.Percentage = percentage,
+			converter: new ThrowingConvertBackConverter());
+
+		Assert.DoesNotThrow(() => slider.Value = 1);
+		Assert.That(viewModel.Percentage, Is.EqualTo(ViewModel.DefaultPercentage));
+	}
+
 	[Test]
 	public void InvalidTargetValueDoesNotCrashSetterWriteBack()
 	{
@@ -864,6 +882,13 @@ sealed class DoNothingConvertBackConverter : IValueConverter
 		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => Binding.DoNothing;
 	}
 
+	sealed class ThrowingConvertBackConverter : IValueConverter
+	{
+		public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) => value;
+
+		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new FormatException();
+	}
+
 	class ViewModel : INotifyPropertyChanged
 	{
 		public const double DefaultPercentage = 0.5;
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index 02fc0d1c..ce69a333 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -396,16 +396,15 @@ static bool TryGetCurrentSourceValue<TBindingContext, TSource>(
 
 	static bool TryConvertTargetValue<TSource, TParam>(object? targetValue, IValueConverter? converter, TParam? converterParameter, out TSource? sourceValue)
 	{
-		var convertedValue = converter?.ConvertBack(targetValue, typeof(TSource), converterParameter, System.Globalization.CultureInfo.CurrentUICulture) ?? targetValue;
-
-		if (ReferenceEquals(convertedValue, BindableProperty.UnsetValue) || ReferenceEquals(convertedValue, Binding.DoNothing))
-		{
-			sourceValue = default;
-			return false;
-		}
-
 		try
 		{
+			var convertedValue = converter?.ConvertBack(targetValue, typeof(TSource), converterParameter, System.Globalization.CultureInfo.CurrentUICulture) ?? targetValue;
+			if (ReferenceEquals(convertedValue, BindableProperty.UnsetValue) || ReferenceEquals(convertedValue, Binding.DoNothing))
+			{
+				sourceValue = default;
+				return false;
+			}
+
 			sourceValue = convertedValue is null ? default : ConvertTargetValue<TSource>(convertedValue);
 			return true;
 		}

From af7be072b676eb56f933bd128e2ec8efd9654e75 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 25 Jun 2026 13:34:20 +0200
Subject: [PATCH 05/17] Pin build workflow Xcode version

Select Xcode 26.5 for the macOS Build workflow so the .NET iOS and MacCatalyst 26.5 workloads used by the latest .NET 10 SDK do not resolve to Xcode 26.6.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/dotnet-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
index 711c8c9e..29997c23 100644
--- a/.github/workflows/dotnet-build.yml
+++ b/.github/workflows/dotnet-build.yml
@@ -26,7 +26,7 @@ env:
   PathToCommunityToolkitSampleCsproj: 'samples/CommunityToolkit.Maui.Markup.Sample/CommunityToolkit.Maui.Markup.Sample.csproj'
   PathToCommunityToolkitUnitTestCsproj: 'src/CommunityToolkit.Maui.Markup.UnitTests/CommunityToolkit.Maui.Markup.UnitTests.csproj'
   PathToCommunityToolkitSourceGeneratorsCsproj: 'src/CommunityToolkit.Maui.Markup.SourceGenerators/CommunityToolkit.Maui.Markup.SourceGenerators.csproj'
-  Xcode_Version: '^26'
+  Xcode_Version: '26.5'
   ShouldCheckDependencies: true
 
 concurrency:

From 90f3634fe565846903c10a6c9f28ff21bb96b1f8 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 25 Jun 2026 13:48:30 +0200
Subject: [PATCH 06/17] Cover ScrollView padding overloads

Add ScrollView and derived ScrollView padding coverage to prove the public overloads remain unambiguous and preserve fluent return types.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PaddingElementExtensionsTests.cs             | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
index ccb36cde..473ea2d8 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/PaddingElementExtensionsTests.cs
@@ -11,7 +11,8 @@ class PaddingElementExtensionsTests : BaseMarkupTestFixture
 		new("Button", () => new Button(), Button.PaddingProperty, (bindable, padding) => ((Button)bindable).Padding(padding), (bindable, uniformSize) => ((Button)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Button)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Button)bindable).Paddings(left, top, right, bottom)),
 		new("ImageButton", () => new ImageButton(), ImageButton.PaddingProperty, (bindable, padding) => ((ImageButton)bindable).Padding(padding), (bindable, uniformSize) => ((ImageButton)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((ImageButton)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((ImageButton)bindable).Paddings(left, top, right, bottom)),
 		new("Label", () => new Label(), Label.PaddingProperty, (bindable, padding) => ((Label)bindable).Padding(padding), (bindable, uniformSize) => ((Label)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Label)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Label)bindable).Paddings(left, top, right, bottom)),
-		new("Page", () => new Page(), Page.PaddingProperty, (bindable, padding) => ((Page)bindable).Padding(padding), (bindable, uniformSize) => ((Page)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Page)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Page)bindable).Paddings(left, top, right, bottom))
+		new("Page", () => new Page(), Page.PaddingProperty, (bindable, padding) => ((Page)bindable).Padding(padding), (bindable, uniformSize) => ((Page)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((Page)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((Page)bindable).Paddings(left, top, right, bottom)),
+		new("ScrollView", () => new ScrollView(), ScrollView.PaddingProperty, (bindable, padding) => ((ScrollView)bindable).Padding(padding), (bindable, uniformSize) => ((ScrollView)bindable).Padding(uniformSize), (bindable, horizontal, vertical) => ((ScrollView)bindable).Padding(horizontal, vertical), (bindable, left, top, right, bottom) => ((ScrollView)bindable).Paddings(left, top, right, bottom))
 	];
 
 	[TestCaseSource(nameof(paddingCases))]
@@ -50,7 +51,16 @@ public void SupportDerivedFrom()
 			.Padding(1, 2)
 			.Paddings(left: 1, top: 2, right: 3, bottom: 4);
 
-		Assert.That(derivedFrom, Is.InstanceOf<DerivedFrom>());
+		DerivedFromScrollView derivedFromScrollView = new DerivedFromScrollView()
+			.Padding(1)
+			.Padding(1, 2)
+			.Paddings(left: 1, top: 2, right: 3, bottom: 4);
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(derivedFrom, Is.InstanceOf<DerivedFrom>());
+			Assert.That(derivedFromScrollView, Is.InstanceOf<DerivedFromScrollView>());
+		});
 	}
 
 	public sealed record PaddingCase(
@@ -66,4 +76,6 @@ public sealed record PaddingCase(
 	}
 
 	class DerivedFrom : ContentView { }
+
+	class DerivedFromScrollView : ScrollView { }
 }

From 3a941b7a46210985b4fbe819d83bea99acceda9a Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Tue, 7 Jul 2026 15:01:10 +0200
Subject: [PATCH 07/17] Avoid typed binding source feedback loops

Track source-originated target updates so manual typed-binding write-back does not ConvertBack and overwrite the source during normal source-to-target binding updates.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../TypedBindingExtensionsTests.cs            | 32 +++++++++
 .../TypedBindingsExtensions.Handlers.cs       | 70 +++++++++++++++++--
 2 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
index ff458bd0..32eb2651 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
@@ -452,6 +452,31 @@ void HandleSliderPropertyChanged(object? sender, PropertyChangedEventArgs e)
 		}
 	}
 
+	[Test]
+	public void SourceUpdateWithNonReversibleConverterDoesNotWriteBackToSource()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var slider = new Slider
+		{
+			BindingContext = viewModel
+		}.Bind<Slider, ViewModel, double, object?, double>(
+			Slider.ValueProperty,
+			static viewModel => viewModel.Percentage,
+			static (viewModel, percentage) => viewModel.Percentage = percentage,
+			converter: new NonReversibleConverter());
+
+		Assert.That(slider.Value, Is.EqualTo(ViewModel.DefaultPercentage / 2));
+
+		viewModel.Percentage = 0.6;
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(slider.Value, Is.EqualTo(0.3));
+			Assert.That(viewModel.Percentage, Is.EqualTo(0.6));
+		});
+	}
+
 	[TestCase(false, false)]
 	[TestCase(false, true)]
 	[TestCase(true, false)]
@@ -889,6 +914,13 @@ sealed class ThrowingConvertBackConverter : IValueConverter
 		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new FormatException();
 	}
 
+	sealed class NonReversibleConverter : IValueConverter
+	{
+		public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) => value is double sourceValue ? sourceValue / 2 : value;
+
+		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => value is double targetValue ? targetValue / 10 : value;
+	}
+
 	class ViewModel : INotifyPropertyChanged
 	{
 		public const double DefaultPercentage = 0.5;
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index ce69a333..324b4179 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -246,6 +246,9 @@ static TBindable SetTypedBinding<TBindable, TBindingContext, TSource, TParam, TD
 		var resolvedMode = ResolveBindingMode(targetProperty, mode);
 		var updatesTarget = UpdatesTarget(resolvedMode);
 		var isApplyingBinding = false;
+		var targetUpdateTracker = setter is not null && UpdatesSource(resolvedMode) && updatesTarget
+			? new TargetUpdateTracker()
+			: null;
 
 		void ApplyBinding()
 		{
@@ -258,10 +261,13 @@ void ApplyBinding()
 			try
 			{
 				isApplyingBinding = true;
+				var bindingConverter = path is null
+					? new GetterValueConverter<TBindingContext, TSource>(getter, converter, targetUpdateTracker)
+					: targetUpdateTracker is null ? converter : new TargetUpdateTrackingConverter(converter, targetUpdateTracker);
 				var binding = new Binding(
 					path ?? Binding.SelfPath,
 					GetTargetUpdateBindingMode(resolvedMode),
-					path is null ? new GetterValueConverter<TBindingContext, TSource>(getter, converter) : converter,
+					bindingConverter,
 					converterParameter,
 					stringFormat,
 					source)
@@ -282,7 +288,7 @@ void ApplyBinding()
 
 		if (setter is not null && UpdatesSource(resolvedMode))
 		{
-			var sourceUpdateHandler = CreateSourceUpdateHandler(bindable, targetProperty, getter, setter, converter, converterParameter, source, () => isApplyingBinding, ApplyBinding);
+			var sourceUpdateHandler = CreateSourceUpdateHandler(bindable, targetProperty, getter, setter, converter, converterParameter, source, () => isApplyingBinding, targetUpdateTracker, ApplyBinding);
 			var bindingContextChangedHandler = source is null && !updatesTarget
 				? CreateBindingContextChangedHandler(bindable, targetProperty, getter, setter, converter, converterParameter, source)
 				: null;
@@ -319,6 +325,7 @@ static PropertyChangedEventHandler CreateSourceUpdateHandler<TBindingContext, TS
 		TParam? converterParameter,
 		TBindingContext? source,
 		Func<bool> isApplyingBinding,
+		TargetUpdateTracker? targetUpdateTracker,
 		Action applyBinding)
 		where TBindingContext : class?
 	{
@@ -329,6 +336,18 @@ static PropertyChangedEventHandler CreateSourceUpdateHandler<TBindingContext, TS
 				return;
 			}
 
+			var targetValue = bindable.GetValue(targetProperty);
+			if (isApplyingBinding())
+			{
+				targetUpdateTracker?.TryConsume(targetValue);
+				return;
+			}
+
+			if (targetUpdateTracker?.TryConsume(targetValue) is true)
+			{
+				return;
+			}
+
 			if (!UpdateSourceFromTarget(bindable, targetProperty, getter, setter, converter, converterParameter, source))
 			{
 				return;
@@ -460,7 +479,48 @@ static void RemoveSourceUpdateHandler(BindableObject bindable, BindableProperty
 
 	sealed record SourceUpdateHandlers(PropertyChangedEventHandler PropertyChangedHandler, EventHandler? BindingContextChangedHandler);
 
-	sealed class GetterValueConverter<TBindingContext, TSource>(Func<TBindingContext, TSource> getter, IValueConverter? converter) : IValueConverter
+	sealed class TargetUpdateTracker
+	{
+		bool hasPendingTargetValue;
+		object? pendingTargetValue;
+
+		public void Track(object? targetValue)
+		{
+			pendingTargetValue = targetValue;
+			hasPendingTargetValue = true;
+		}
+
+		public bool TryConsume(object? targetValue)
+		{
+			if (!hasPendingTargetValue)
+			{
+				return false;
+			}
+
+			var isPendingUpdate = Equals(pendingTargetValue, targetValue);
+			pendingTargetValue = null;
+			hasPendingTargetValue = false;
+
+			return isPendingUpdate;
+		}
+	}
+
+	sealed class TargetUpdateTrackingConverter(IValueConverter? converter, TargetUpdateTracker targetUpdateTracker) : IValueConverter
+	{
+		public object? Convert(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
+		{
+			var targetValue = converter?.Convert(value, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? value;
+			targetUpdateTracker.Track(targetValue);
+			return targetValue;
+		}
+
+		public object? ConvertBack(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
+			=> converter?.ConvertBack(value, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? value;
+
+		public override string? ToString() => converter?.ToString();
+	}
+
+	sealed class GetterValueConverter<TBindingContext, TSource>(Func<TBindingContext, TSource> getter, IValueConverter? converter, TargetUpdateTracker? targetUpdateTracker) : IValueConverter
 		where TBindingContext : class?
 	{
 		public object? Convert(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
@@ -471,7 +531,9 @@ sealed class GetterValueConverter<TBindingContext, TSource>(Func<TBindingContext
 			}
 
 			var sourceValue = getter(sourceObject);
-			return converter?.Convert(sourceValue, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? sourceValue;
+			var targetValue = converter?.Convert(sourceValue, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? sourceValue;
+			targetUpdateTracker?.Track(targetValue);
+			return targetValue;
 		}
 
 		public object? ConvertBack(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)

From 1ba9df652b9979a82636f353c8155d76cce82c7f Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 16 Jul 2026 21:12:32 +0200
Subject: [PATCH 08/17] Update CI Xcode pin

Use Xcode 26.6 for the latest .NET iOS and MacCatalyst workload used by the macOS sample build.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/dotnet-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
index 29997c23..6e23a60d 100644
--- a/.github/workflows/dotnet-build.yml
+++ b/.github/workflows/dotnet-build.yml
@@ -26,7 +26,7 @@ env:
   PathToCommunityToolkitSampleCsproj: 'samples/CommunityToolkit.Maui.Markup.Sample/CommunityToolkit.Maui.Markup.Sample.csproj'
   PathToCommunityToolkitUnitTestCsproj: 'src/CommunityToolkit.Maui.Markup.UnitTests/CommunityToolkit.Maui.Markup.UnitTests.csproj'
   PathToCommunityToolkitSourceGeneratorsCsproj: 'src/CommunityToolkit.Maui.Markup.SourceGenerators/CommunityToolkit.Maui.Markup.SourceGenerators.csproj'
-  Xcode_Version: '26.5'
+  Xcode_Version: '26.6'
   ShouldCheckDependencies: true
 
 concurrency:

From a9dfb9340e6729e3daff7c02e4e881f0a7b38a99 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 16 Jul 2026 21:31:11 +0200
Subject: [PATCH 09/17] Address latest review feedback

Restore compile-time constraints for font helpers, ensure ScrollView padding uses its public property, and consume tracked binding target updates before returning during binding application.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../BindablePropertyHelpers.cs                            | 2 +-
 src/CommunityToolkit.Maui.Markup/ElementExtensions.cs     | 8 ++++----
 .../TypedBindingsExtensions.Handlers.cs                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs b/src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs
index fea9fb1a..2e08535d 100644
--- a/src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs
+++ b/src/CommunityToolkit.Maui.Markup/BindablePropertyHelpers.cs
@@ -9,9 +9,9 @@ static class BindablePropertyHelpers
 		ContentPresenter => ContentPresenter.PaddingProperty,
 		ImageButton => ImageButton.PaddingProperty,
 		Label => Label.PaddingProperty,
+		ScrollView => ScrollView.PaddingProperty,
 		Layout => Layout.PaddingProperty,
 		Page => Page.PaddingProperty,
-		ScrollView => ScrollView.PaddingProperty,
 		TemplatedView => TemplatedView.PaddingProperty,
 		_ => throw CreateUnsupportedException(bindable, "Padding")
 	};
diff --git a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
index 442e22f4..2a0b0afb 100644
--- a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
@@ -149,7 +149,7 @@ public static TElement Effects<TElement>(this TElement element, params ReadOnlyS
 	/// <param name="fontElement"></param>
 	/// <param name="size"></param>
 	/// <returns></returns>
-	public static TBindable FontSize<TBindable>(this TBindable fontElement, double size) where TBindable : BindableObject
+	public static TBindable FontSize<TBindable>(this TBindable fontElement, double size) where TBindable : BindableObject, ITextStyle
 	{
 		fontElement.SetValue(BindablePropertyHelpers.GetFontSizeProperty(fontElement), size);
 		return fontElement;
@@ -161,7 +161,7 @@ public static TBindable FontSize<TBindable>(this TBindable fontElement, double s
 	/// <typeparam name="TBindable"></typeparam>
 	/// <param name="fontElement"></param>
 	/// <returns>Font element with added Bold</returns>
-	public static TBindable Bold<TBindable>(this TBindable fontElement) where TBindable : BindableObject
+	public static TBindable Bold<TBindable>(this TBindable fontElement) where TBindable : BindableObject, ITextStyle
 	{
 		fontElement.SetValue(BindablePropertyHelpers.GetFontAttributesProperty(fontElement), FontAttributes.Bold);
 		return fontElement;
@@ -173,7 +173,7 @@ public static TBindable Bold<TBindable>(this TBindable fontElement) where TBinda
 	/// <typeparam name="TBindable"></typeparam>
 	/// <param name="fontElement"></param>
 	/// <returns>Font element with added Italic</returns>
-	public static TBindable Italic<TBindable>(this TBindable fontElement) where TBindable : BindableObject
+	public static TBindable Italic<TBindable>(this TBindable fontElement) where TBindable : BindableObject, ITextStyle
 	{
 		fontElement.SetValue(BindablePropertyHelpers.GetFontAttributesProperty(fontElement), FontAttributes.Italic);
 		return fontElement;
@@ -194,7 +194,7 @@ public static TBindable Font<TBindable>(
 		string? family = null,
 		double? size = null,
 		bool? bold = null,
-		bool? italic = null) where TBindable : BindableObject
+		bool? italic = null) where TBindable : BindableObject, ITextStyle
 	{
 		if (family != null)
 		{
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index 324b4179..7ca9b7ad 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -331,7 +331,7 @@ static PropertyChangedEventHandler CreateSourceUpdateHandler<TBindingContext, TS
 	{
 		return (_, args) =>
 		{
-			if (isApplyingBinding() || !string.Equals(args.PropertyName, targetProperty.PropertyName, StringComparison.Ordinal))
+			if (!string.Equals(args.PropertyName, targetProperty.PropertyName, StringComparison.Ordinal))
 			{
 				return;
 			}

From 45a9975927f48909cb33b4b97b103e25032c244b Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 16 Jul 2026 21:53:20 +0200
Subject: [PATCH 10/17] Narrow image and placeholder helpers

Use supported public MAUI control overloads for image and placeholder helpers so unsupported receivers fail at compile time instead of through helper lookup at runtime.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../ImageExtensionTests.cs                    | 15 +++++
 .../PaceholderExtensionsTests.cs              | 15 +++++
 .../ImageExtensions.cs                        | 59 +++++++++++++++----
 .../PlaceholderExtensions.cs                  | 55 +++++++++++++----
 4 files changed, 121 insertions(+), 23 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs
index b7c676bc..2a83e2ff 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/ImageExtensionTests.cs
@@ -32,6 +32,21 @@ public void SetAspectTest()
 	public void SetIsOpaqueTest()
 		=> TestPropertiesSet(i => i.IsOpaque(true), (Image.IsOpaqueProperty, true));
 
+	[Test]
+	public void SupportsImageButton()
+	{
+		var imageButton = new ImageButton().Source(resourceToLoad);
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(imageButton.Source, Is.InstanceOf<FileImageSource>());
+			Assert.That(((FileImageSource)imageButton.Source).File, Is.EqualTo(resourceToLoad));
+		});
+
+		TestPropertiesSet(new ImageButton(), imageButton => imageButton.Aspect(Aspect.Center), (ImageButton.AspectProperty, Aspect.Center));
+		TestPropertiesSet(new ImageButton(), imageButton => imageButton.IsOpaque(true), (ImageButton.IsOpaqueProperty, true));
+	}
+
 	[Test]
 	public void SupportDerivedFromImage()
 	{
diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs
index b220f8b3..6889b5d7 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/PaceholderExtensionsTests.cs
@@ -16,6 +16,21 @@ public void SetPlaceholderAndColorTest()
 	public void SetPlaceholderColorTest()
 		=> TestPropertiesSet(e => e.PlaceholderColor(Colors.Red), (Entry.PlaceholderColorProperty, Colors.Red));
 
+	[Test]
+	public void SupportsSearchBar()
+	{
+		var searchBar = new SearchBar()
+			.Placeholder("Hello World")
+			.PlaceholderColor(Colors.Blue)
+			.Placeholder("Hello World 2", Colors.Red);
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(searchBar.Placeholder, Is.EqualTo("Hello World 2"));
+			Assert.That(searchBar.PlaceholderColor, Is.EqualTo(Colors.Red));
+		});
+	}
+
 	[Test]
 	public void SupportDerivedFromEditor()
 	{
diff --git a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
index de8373d3..548a4a7b 100644
--- a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
@@ -1,5 +1,4 @@
-using IImage = Microsoft.Maui.IImage;
-namespace CommunityToolkit.Maui.Markup;
+namespace CommunityToolkit.Maui.Markup;
 
 /// <summary>
 /// Extension methods for IImage
@@ -9,37 +8,73 @@ public static class ImageExtensions
 	/// <summary>
 	/// Sets the <see cref="IImageSourcePart.Source" /> Property/>
 	/// </summary>
-	/// <typeparam name="TBindable"><see cref="BindableObject"/> : <see cref="IImageSourcePart"/></typeparam>
+	/// <typeparam name="TImage">The <see cref="Image"/> type.</typeparam>
 	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="IImageSourcePart.Source"/> Property</param>
 	/// <param name="imageSource">The <see cref="Microsoft.Maui.Controls.ImageSource"/> value</param>
+	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
-	public static TBindable Source<TBindable>(this TBindable bindable, ImageSource? imageSource) where TBindable : BindableObject, IImageSourcePart
+	public static TImage Source<TImage>(this TImage bindable, ImageSource? imageSource, Image? overload = null) where TImage : Image
 	{
-		bindable.SetValue(BindablePropertyHelpers.GetImageSourceProperty(bindable), imageSource);
-		return bindable;
+		return SetSource(bindable, imageSource);
+	}
+
+	/// <inheritdoc />
+	public static TImageButton Source<TImageButton>(this TImageButton bindable, ImageSource? imageSource, ImageButton? overload = null) where TImageButton : ImageButton
+	{
+		return SetSource(bindable, imageSource);
 	}
 
 	/// <summary>
 	/// Sets the <see cref="Microsoft.Maui.IImage.Aspect" /> Property/>
 	/// </summary>
-	/// <typeparam name="TBindable"><see cref="BindableObject"/> : <see cref="Microsoft.Maui.IImage"/></typeparam>
+	/// <typeparam name="TImage">The <see cref="Image"/> type.</typeparam>
 	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="Microsoft.Maui.IImage.Aspect"/> Property</param>
 	/// <param name="aspect">The <see cref="Microsoft.Maui.Aspect"/> vaue</param>
+	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
-	public static TBindable Aspect<TBindable>(this TBindable bindable, Aspect aspect) where TBindable : BindableObject, IImage
+	public static TImage Aspect<TImage>(this TImage bindable, Aspect aspect, Image? overload = null) where TImage : Image
 	{
-		bindable.SetValue(BindablePropertyHelpers.GetImageAspectProperty(bindable), aspect);
-		return bindable;
+		return SetAspect(bindable, aspect);
+	}
+
+	/// <inheritdoc />
+	public static TImageButton Aspect<TImageButton>(this TImageButton bindable, Aspect aspect, ImageButton? overload = null) where TImageButton : ImageButton
+	{
+		return SetAspect(bindable, aspect);
 	}
 
 	/// <summary>
 	/// Sets the <see cref="Microsoft.Maui.IImage.IsOpaque" /> Property/>
 	/// </summary>
-	/// <typeparam name="TBindable"><see cref="BindableObject"/> : <see cref="Microsoft.Maui.IImage"/></typeparam>
+	/// <typeparam name="TImage">The <see cref="Image"/> type.</typeparam>
 	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="Microsoft.Maui.IImage.IsOpaque"/> Property</param>
 	/// <param name="isOpaque">The <see cref="bool"/> vaue</param>
+	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
-	public static TBindable IsOpaque<TBindable>(this TBindable bindable, bool isOpaque) where TBindable : BindableObject, IImage
+	public static TImage IsOpaque<TImage>(this TImage bindable, bool isOpaque, Image? overload = null) where TImage : Image
+	{
+		return SetIsOpaque(bindable, isOpaque);
+	}
+
+	/// <inheritdoc />
+	public static TImageButton IsOpaque<TImageButton>(this TImageButton bindable, bool isOpaque, ImageButton? overload = null) where TImageButton : ImageButton
+	{
+		return SetIsOpaque(bindable, isOpaque);
+	}
+
+	static TBindable SetSource<TBindable>(TBindable bindable, ImageSource? imageSource) where TBindable : BindableObject
+	{
+		bindable.SetValue(BindablePropertyHelpers.GetImageSourceProperty(bindable), imageSource);
+		return bindable;
+	}
+
+	static TBindable SetAspect<TBindable>(TBindable bindable, Aspect aspect) where TBindable : BindableObject
+	{
+		bindable.SetValue(BindablePropertyHelpers.GetImageAspectProperty(bindable), aspect);
+		return bindable;
+	}
+
+	static TBindable SetIsOpaque<TBindable>(TBindable bindable, bool isOpaque) where TBindable : BindableObject
 	{
 		bindable.SetValue(BindablePropertyHelpers.GetImageIsOpaqueProperty(bindable), isOpaque);
 		return bindable;
diff --git a/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs b/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
index c6cd74f2..9b5eb167 100644
--- a/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
@@ -8,39 +8,72 @@ public static class PlaceholderExtensions
 	/// <summary>
 	/// Sets the <see cref="IPlaceholder.PlaceholderColor"/> Property
 	/// </summary>
-	/// <typeparam name="TBindable">Bindable Object</typeparam>
+	/// <typeparam name="TInputView">The <see cref="InputView"/> type.</typeparam>
 	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.PlaceholderColor"/></param>
 	/// <param name="textColor">The <see cref="Color"/> for <see cref="IPlaceholder.PlaceholderColor"/></param>
+	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
-	public static TBindable PlaceholderColor<TBindable>(this TBindable bindable, Color? textColor) where TBindable : BindableObject, IPlaceholder
+	public static TInputView PlaceholderColor<TInputView>(this TInputView bindable, Color? textColor, InputView? overload = null) where TInputView : InputView
 	{
-		bindable.SetValue(BindablePropertyHelpers.GetPlaceholderColorProperty(bindable), textColor);
-		return bindable;
+		return SetPlaceholderColor(bindable, textColor);
+	}
+
+	/// <inheritdoc />
+	public static TSearchHandler PlaceholderColor<TSearchHandler>(this TSearchHandler bindable, Color? textColor, SearchHandler? overload = null) where TSearchHandler : SearchHandler
+	{
+		return SetPlaceholderColor(bindable, textColor);
 	}
 
 	/// <summary>
 	/// Sets the <see cref="IPlaceholder.Placeholder" /> Property/>
 	/// </summary>
-	/// <typeparam name="TBindable">Bindable Object</typeparam>
+	/// <typeparam name="TInputView">The <see cref="InputView"/> type.</typeparam>
 	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.PlaceholderColor"/></param>
 	/// <param name="text">The <see cref="string"/> for the <see cref="IPlaceholder.Placeholder"/> text</param>
+	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
-	public static TBindable Placeholder<TBindable>(this TBindable bindable, string? text) where TBindable : BindableObject, IPlaceholder
+	public static TInputView Placeholder<TInputView>(this TInputView bindable, string? text, InputView? overload = null) where TInputView : InputView
 	{
-		bindable.SetValue(BindablePropertyHelpers.GetPlaceholderProperty(bindable), text);
-		return bindable;
+		return SetPlaceholder(bindable, text);
+	}
+
+	/// <inheritdoc />
+	public static TSearchHandler Placeholder<TSearchHandler>(this TSearchHandler bindable, string? text, SearchHandler? overload = null) where TSearchHandler : SearchHandler
+	{
+		return SetPlaceholder(bindable, text);
 	}
 
 	/// <summary>
 	/// Sets the <see cref="IPlaceholder.Placeholder" /> and <see cref="IPlaceholder.PlaceholderColor" /> Properties/>
 	/// </summary>
-	/// <typeparam name="TBindable">Bindable Object</typeparam>
+	/// <typeparam name="TInputView">The <see cref="InputView"/> type.</typeparam>
 	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.PlaceholderColor"/></param>
 	/// <param name="text">The <see cref="string"/> for the <see cref="IPlaceholder.Placeholder"/> text</param>
 	/// <param name="textColor">The <see cref="Color"/> for <see cref="IPlaceholder.PlaceholderColor"/></param>
+	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
-	public static TBindable Placeholder<TBindable>(this TBindable bindable, string? text, Color? textColor) where TBindable : BindableObject, IPlaceholder
+	public static TInputView Placeholder<TInputView>(this TInputView bindable, string? text, Color? textColor, InputView? overload = null) where TInputView : InputView
 	{
-		return bindable.Placeholder(text).PlaceholderColor(textColor);
+		SetPlaceholder(bindable, text);
+		return SetPlaceholderColor(bindable, textColor);
+	}
+
+	/// <inheritdoc />
+	public static TSearchHandler Placeholder<TSearchHandler>(this TSearchHandler bindable, string? text, Color? textColor, SearchHandler? overload = null) where TSearchHandler : SearchHandler
+	{
+		SetPlaceholder(bindable, text);
+		return SetPlaceholderColor(bindable, textColor);
+	}
+
+	static TBindable SetPlaceholderColor<TBindable>(TBindable bindable, Color? textColor) where TBindable : BindableObject
+	{
+		bindable.SetValue(BindablePropertyHelpers.GetPlaceholderColorProperty(bindable), textColor);
+		return bindable;
+	}
+
+	static TBindable SetPlaceholder<TBindable>(TBindable bindable, string? text) where TBindable : BindableObject
+	{
+		bindable.SetValue(BindablePropertyHelpers.GetPlaceholderProperty(bindable), text);
+		return bindable;
 	}
 }
\ No newline at end of file

From 3b6e2505cdffbbdd1fde3f628940efe6ff235891 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 16 Jul 2026 22:09:46 +0200
Subject: [PATCH 11/17] Clean image and placeholder docs

Fix malformed XML doc comments introduced while narrowing image and placeholder helper overloads.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../ImageExtensions.cs                        | 16 +++++++--------
 .../PlaceholderExtensions.cs                  | 20 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
index 548a4a7b..1c99c4e8 100644
--- a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
@@ -6,10 +6,10 @@
 public static class ImageExtensions
 {
 	/// <summary>
-	/// Sets the <see cref="IImageSourcePart.Source" /> Property/>
+	/// Sets the <see cref="IImageSourcePart.Source" /> property.
 	/// </summary>
 	/// <typeparam name="TImage">The <see cref="Image"/> type.</typeparam>
-	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="IImageSourcePart.Source"/> Property</param>
+	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="IImageSourcePart.Source"/> property.</param>
 	/// <param name="imageSource">The <see cref="Microsoft.Maui.Controls.ImageSource"/> value</param>
 	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
@@ -25,11 +25,11 @@ public static TImageButton Source<TImageButton>(this TImageButton bindable, Imag
 	}
 
 	/// <summary>
-	/// Sets the <see cref="Microsoft.Maui.IImage.Aspect" /> Property/>
+	/// Sets the <see cref="Microsoft.Maui.IImage.Aspect" /> property.
 	/// </summary>
 	/// <typeparam name="TImage">The <see cref="Image"/> type.</typeparam>
-	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="Microsoft.Maui.IImage.Aspect"/> Property</param>
-	/// <param name="aspect">The <see cref="Microsoft.Maui.Aspect"/> vaue</param>
+	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="Microsoft.Maui.IImage.Aspect"/> property.</param>
+	/// <param name="aspect">The <see cref="Microsoft.Maui.Aspect"/> value.</param>
 	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
 	public static TImage Aspect<TImage>(this TImage bindable, Aspect aspect, Image? overload = null) where TImage : Image
@@ -44,11 +44,11 @@ public static TImageButton Aspect<TImageButton>(this TImageButton bindable, Aspe
 	}
 
 	/// <summary>
-	/// Sets the <see cref="Microsoft.Maui.IImage.IsOpaque" /> Property/>
+	/// Sets the <see cref="Microsoft.Maui.IImage.IsOpaque" /> property.
 	/// </summary>
 	/// <typeparam name="TImage">The <see cref="Image"/> type.</typeparam>
-	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="Microsoft.Maui.IImage.IsOpaque"/> Property</param>
-	/// <param name="isOpaque">The <see cref="bool"/> vaue</param>
+	/// <param name="bindable">The <see cref="BindableObject"/> on which to set the <see cref="Microsoft.Maui.IImage.IsOpaque"/> property.</param>
+	/// <param name="isOpaque">The <see cref="bool"/> value.</param>
 	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
 	public static TImage IsOpaque<TImage>(this TImage bindable, bool isOpaque, Image? overload = null) where TImage : Image
diff --git a/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs b/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
index 9b5eb167..65d20534 100644
--- a/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/PlaceholderExtensions.cs
@@ -6,11 +6,11 @@
 public static class PlaceholderExtensions
 {
 	/// <summary>
-	/// Sets the <see cref="IPlaceholder.PlaceholderColor"/> Property
+	/// Sets the <see cref="IPlaceholder.PlaceholderColor"/> property.
 	/// </summary>
 	/// <typeparam name="TInputView">The <see cref="InputView"/> type.</typeparam>
-	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.PlaceholderColor"/></param>
-	/// <param name="textColor">The <see cref="Color"/> for <see cref="IPlaceholder.PlaceholderColor"/></param>
+	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.PlaceholderColor"/>.</param>
+	/// <param name="textColor">The <see cref="Color"/> for <see cref="IPlaceholder.PlaceholderColor"/>.</param>
 	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
 	public static TInputView PlaceholderColor<TInputView>(this TInputView bindable, Color? textColor, InputView? overload = null) where TInputView : InputView
@@ -25,11 +25,11 @@ public static TSearchHandler PlaceholderColor<TSearchHandler>(this TSearchHandle
 	}
 
 	/// <summary>
-	/// Sets the <see cref="IPlaceholder.Placeholder" /> Property/>
+	/// Sets the <see cref="IPlaceholder.Placeholder" /> property.
 	/// </summary>
 	/// <typeparam name="TInputView">The <see cref="InputView"/> type.</typeparam>
-	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.PlaceholderColor"/></param>
-	/// <param name="text">The <see cref="string"/> for the <see cref="IPlaceholder.Placeholder"/> text</param>
+	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.Placeholder"/>.</param>
+	/// <param name="text">The <see cref="string"/> for the <see cref="IPlaceholder.Placeholder"/> text.</param>
 	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
 	public static TInputView Placeholder<TInputView>(this TInputView bindable, string? text, InputView? overload = null) where TInputView : InputView
@@ -44,12 +44,12 @@ public static TSearchHandler Placeholder<TSearchHandler>(this TSearchHandler bin
 	}
 
 	/// <summary>
-	/// Sets the <see cref="IPlaceholder.Placeholder" /> and <see cref="IPlaceholder.PlaceholderColor" /> Properties/>
+	/// Sets the <see cref="IPlaceholder.Placeholder" /> and <see cref="IPlaceholder.PlaceholderColor" /> properties.
 	/// </summary>
 	/// <typeparam name="TInputView">The <see cref="InputView"/> type.</typeparam>
-	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.PlaceholderColor"/></param>
-	/// <param name="text">The <see cref="string"/> for the <see cref="IPlaceholder.Placeholder"/> text</param>
-	/// <param name="textColor">The <see cref="Color"/> for <see cref="IPlaceholder.PlaceholderColor"/></param>
+	/// <param name="bindable">The element on which to set <see cref="IPlaceholder.Placeholder"/> and <see cref="IPlaceholder.PlaceholderColor"/>.</param>
+	/// <param name="text">The <see cref="string"/> for the <see cref="IPlaceholder.Placeholder"/> text.</param>
+	/// <param name="textColor">The <see cref="Color"/> for <see cref="IPlaceholder.PlaceholderColor"/>.</param>
 	/// <param name="overload">Unused overload discriminator.</param>
 	/// <returns></returns>
 	public static TInputView Placeholder<TInputView>(this TInputView bindable, string? text, Color? textColor, InputView? overload = null) where TInputView : InputView

From fb353f7cc1b67bba7213cc649a48d7d8ac2fb632 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Thu, 16 Jul 2026 22:25:11 +0200
Subject: [PATCH 12/17] Fix nested gesture binding paths

Extract full member paths from typed gesture expressions so nested command and command-parameter bindings target the correct public properties.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../GesturesExtensionsTests.cs                | 57 +++++++++++++++++++
 .../TypedGesturesExtensions.cs                | 43 +++++++++-----
 2 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs
index 1d6f5d9c..f14653f1 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/GesturesExtensionsTests.cs
@@ -232,6 +232,29 @@ public void BindTapGestureDefaultsWithNestedBindings()
 		});
 
 		BindingHelpers.AssertTypedBindingExists((TapGestureRecognizer)gestureElement.GestureRecognizers[0], TapGestureRecognizer.CommandProperty, BindingMode.OneTime, gestureElement.BindingContext);
+		Assert.That(BindingHelpers.GetBinding((TapGestureRecognizer)gestureElement.GestureRecognizers[0], TapGestureRecognizer.CommandProperty)?.Path, Is.EqualTo("NestedCommand.SetGuidCommand"));
+	}
+
+	[Test]
+	public void BindTapGestureExpressionOverloadUsesNestedBindingPaths()
+	{
+		var gestureElement = new TGestureElement
+		{
+			BindingContext = new ViewModel()
+		};
+
+		gestureElement.BindTapGesture(
+			getter: static (ViewModel vm) => vm.NestedCommand.SetGuidCommand,
+			commandBindingMode: BindingMode.OneTime,
+			parameterGetter: static (ViewModel vm) => vm.NestedCommand.Id);
+
+		var tapGestureRecognizer = (TapGestureRecognizer)gestureElement.GestureRecognizers[0];
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(BindingHelpers.GetBinding(tapGestureRecognizer, TapGestureRecognizer.CommandProperty)?.Path, Is.EqualTo("NestedCommand.SetGuidCommand"));
+			Assert.That(BindingHelpers.GetBinding(tapGestureRecognizer, TapGestureRecognizer.CommandParameterProperty)?.Path, Is.EqualTo("NestedCommand.Id"));
+		});
 	}
 
 	[Test]
@@ -309,6 +332,11 @@ public void BindTapGesturePositionalParametersWithNestedBindings()
 
 		BindingHelpers.AssertTypedBindingExists(tapGestureRecognizer, TapGestureRecognizer.CommandProperty, BindingMode.OneTime, gestureElement.BindingContext);
 		BindingHelpers.AssertTypedBindingExists(tapGestureRecognizer, TapGestureRecognizer.CommandParameterProperty, BindingMode.OneWay, gestureElement.BindingContext);
+		Assert.Multiple(() =>
+		{
+			Assert.That(BindingHelpers.GetBinding(tapGestureRecognizer, TapGestureRecognizer.CommandProperty)?.Path, Is.EqualTo("NestedCommand.SetGuidCommand"));
+			Assert.That(BindingHelpers.GetBinding(tapGestureRecognizer, TapGestureRecognizer.CommandParameterProperty)?.Path, Is.EqualTo("NestedCommand.Id"));
+		});
 	}
 
 	[Test]
@@ -349,6 +377,29 @@ public void BindSwipeGestureWithNestedBindings()
 		});
 
 		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandProperty, BindingMode.OneTime, gestureElement.BindingContext);
+		Assert.That(BindingHelpers.GetBinding((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandProperty)?.Path, Is.EqualTo("NestedCommand.SetGuidCommand"));
+	}
+
+	[Test]
+	public void BindSwipeGestureExpressionOverloadUsesNestedBindingPaths()
+	{
+		var gestureElement = new TGestureElement
+		{
+			BindingContext = new ViewModel()
+		};
+
+		gestureElement.BindSwipeGesture(
+			getter: static (ViewModel vm) => vm.NestedCommand.SetGuidCommand,
+			commandBindingMode: BindingMode.OneTime,
+			parameterGetter: static (ViewModel vm) => vm.NestedCommand.Id);
+
+		var swipeGestureRecognizer = (SwipeGestureRecognizer)gestureElement.GestureRecognizers[0];
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(BindingHelpers.GetBinding(swipeGestureRecognizer, SwipeGestureRecognizer.CommandProperty)?.Path, Is.EqualTo("NestedCommand.SetGuidCommand"));
+			Assert.That(BindingHelpers.GetBinding(swipeGestureRecognizer, SwipeGestureRecognizer.CommandParameterProperty)?.Path, Is.EqualTo("NestedCommand.Id"));
+		});
 	}
 
 	[Test]
@@ -430,6 +481,12 @@ public void BindSwipeGesturePositionalParametersWithNestedBindings()
 
 		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandProperty, BindingMode.OneTime, gestureElement.BindingContext);
 		BindingHelpers.AssertTypedBindingExists((SwipeGestureRecognizer)gestureElement.GestureRecognizers[0], SwipeGestureRecognizer.CommandParameterProperty, BindingMode.OneWay, gestureElement.BindingContext);
+		Assert.Multiple(() =>
+		{
+			var swipeGestureRecognizer = (SwipeGestureRecognizer)gestureElement.GestureRecognizers[0];
+			Assert.That(BindingHelpers.GetBinding(swipeGestureRecognizer, SwipeGestureRecognizer.CommandProperty)?.Path, Is.EqualTo("NestedCommand.SetGuidCommand"));
+			Assert.That(BindingHelpers.GetBinding(swipeGestureRecognizer, SwipeGestureRecognizer.CommandParameterProperty)?.Path, Is.EqualTo("NestedCommand.Id"));
+		});
 	}
 
 	[Test]
diff --git a/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs b/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
index 2f7db0c2..9d68d0ef 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
@@ -57,17 +57,17 @@ public static TGestureElement BindSwipeGesture<TGestureElement, TCommandBindingC
 			_ => ConvertExpressionToFunc(parameterGetter)
 		};
 
-		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberNameOrNullForCapturedValue(parameterGetter) switch
+		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberPathOrNullForCapturedValue(parameterGetter) switch
 		{
 			null => null,
-			var memberName => [(b => b, memberName)]
+			var memberPath => [(b => b, memberPath)]
 		};
 
 		return BindSwipeGesture(
 			gestureElement,
 			getterFunc,
 			[
-				(b => b, GetMemberNameOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
+				(b => b, GetMemberPathOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
 			],
 			setter,
 			source,
@@ -182,17 +182,17 @@ public static TGestureElement BindTapGesture<TGestureElement, TCommandBindingCon
 			_ => ConvertExpressionToFunc(parameterGetter)
 		};
 
-		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberNameOrNullForCapturedValue(parameterGetter) switch
+		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberPathOrNullForCapturedValue(parameterGetter) switch
 		{
 			null => null,
-			var memberName => [(b => b, memberName)]
+			var memberPath => [(b => b, memberPath)]
 		};
 
 		return BindTapGesture(
 			gestureElement,
 			getterFunc,
 			[
-				(b => b, GetMemberNameOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
+				(b => b, GetMemberPathOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
 			],
 			setter,
 			source,
@@ -261,26 +261,41 @@ public static TGestureElement BindTapGesture<TGestureElement, TCommandBindingCon
 
 	static Func<TBindingContext, TSource> ConvertExpressionToFunc<TBindingContext, TSource>(in Expression<Func<TBindingContext, TSource>> expression) => expression.Compile();
 
-	static string? GetMemberNameOrNullForCapturedValue<T>(in Expression<T>? expression)
+	static string? GetMemberPathOrNullForCapturedValue<T>(in Expression<T>? expression)
 	{
 		if (expression is null)
 		{
 			return null;
 		}
 
-		var body = expression.Body is UnaryExpression { Operand: MemberExpression unaryMemberExpression }
-			? unaryMemberExpression
-			: expression.Body;
+		var members = new Stack<string>();
+		var currentExpression = UnwrapConvertExpression(expression.Body);
 
-		return body switch
+		while (currentExpression is MemberExpression memberExpression)
 		{
-			MemberExpression { Expression: ConstantExpression } => null,
-			MemberExpression { Expression: null } => null,
-			MemberExpression memberExpression => memberExpression.Member.Name,
+			members.Push(memberExpression.Member.Name);
+			currentExpression = UnwrapConvertExpression(memberExpression.Expression);
+		}
+
+		return currentExpression switch
+		{
+			ParameterExpression when members.Count > 0 => string.Join(".", members),
+			ConstantExpression when members.Count > 0 => null,
+			null when members.Count > 0 => null,
 			_ => throw CreateInvalidGetterException()
 		};
 	}
 
+	static Expression? UnwrapConvertExpression(Expression? expression)
+	{
+		while (expression is UnaryExpression { NodeType: ExpressionType.Convert or ExpressionType.ConvertChecked } unaryExpression)
+		{
+			expression = unaryExpression.Operand;
+		}
+
+		return expression;
+	}
+
 	static InvalidOperationException CreateInvalidGetterException()
 		=> new("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic");
 

From 12a6fd5a6af35d9203d85a869e786ff2d65e8560 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Fri, 17 Jul 2026 20:32:47 +0200
Subject: [PATCH 13/17] Use floating Xcode 26 selector

Avoid brittle exact Xcode patch selection while still selecting a 26.x Xcode version required by the current .NET iOS and MacCatalyst workloads.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/dotnet-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
index 6e23a60d..711c8c9e 100644
--- a/.github/workflows/dotnet-build.yml
+++ b/.github/workflows/dotnet-build.yml
@@ -26,7 +26,7 @@ env:
   PathToCommunityToolkitSampleCsproj: 'samples/CommunityToolkit.Maui.Markup.Sample/CommunityToolkit.Maui.Markup.Sample.csproj'
   PathToCommunityToolkitUnitTestCsproj: 'src/CommunityToolkit.Maui.Markup.UnitTests/CommunityToolkit.Maui.Markup.UnitTests.csproj'
   PathToCommunityToolkitSourceGeneratorsCsproj: 'src/CommunityToolkit.Maui.Markup.SourceGenerators/CommunityToolkit.Maui.Markup.SourceGenerators.csproj'
-  Xcode_Version: '26.6'
+  Xcode_Version: '^26'
   ShouldCheckDependencies: true
 
 concurrency:

From 24cd30006832859a4f03e58c2afe543ca621464e Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Fri, 17 Jul 2026 20:42:17 +0200
Subject: [PATCH 14/17] Address typed binding review feedback

Share expression path parsing between typed bindings and gestures, and track final target values for source-driven typed binding updates that use string formatting, target null values, or fallback values.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../TypedBindingExtensionsTests.cs            | 93 +++++++++++++++++++
 .../ExpressionPathHelpers.cs                  | 63 +++++++++++++
 .../ImageExtensions.cs                        |  2 +-
 .../TypedBindingExtensions.cs                 | 61 +-----------
 .../TypedBindingsExtensions.Handlers.cs       | 84 ++++++++++++-----
 .../TypedGesturesExtensions.cs                | 56 ++---------
 6 files changed, 229 insertions(+), 130 deletions(-)
 create mode 100644 src/CommunityToolkit.Maui.Markup/ExpressionPathHelpers.cs

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
index 32eb2651..38e5f056 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
@@ -477,6 +477,86 @@ public void SourceUpdateWithNonReversibleConverterDoesNotWriteBackToSource()
 		});
 	}
 
+	[Test]
+	public void SourceUpdateWithStringFormatDoesNotWriteBackToSource()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		var converter = new ConvertBackCountingConverter(0.1);
+		var entry = new Entry
+		{
+			BindingContext = viewModel
+		}.Bind<Entry, ViewModel, double, object?, string>(
+			Entry.TextProperty,
+			static viewModel => viewModel.Percentage,
+			static (viewModel, percentage) => viewModel.Percentage = percentage,
+			converter: converter,
+			stringFormat: "{0}%");
+
+		viewModel.Percentage = 0.6;
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(entry.Text, Is.EqualTo("0.6%"));
+			Assert.That(viewModel.Percentage, Is.EqualTo(0.6));
+			Assert.That(converter.ConvertBackCount, Is.Zero);
+		});
+	}
+
+	[Test]
+	public void SourceUpdateWithTargetNullValueDoesNotWriteBackToSource()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		viewModel.Age = 1;
+		var converter = new ConvertBackCountingConverter(42);
+		var entry = new Entry
+		{
+			BindingContext = viewModel
+		}.Bind<Entry, ViewModel, int?, object?, string>(
+			Entry.TextProperty,
+			static viewModel => viewModel.Age,
+			static (viewModel, age) => viewModel.Age = age,
+			converter: converter,
+			targetNullValue: "(none)");
+
+		viewModel.Age = null;
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(entry.Text, Is.EqualTo("(none)"));
+			Assert.That(viewModel.Age, Is.Null);
+			Assert.That(converter.ConvertBackCount, Is.Zero);
+		});
+	}
+
+	[Test]
+	public void SourceUpdateWithFallbackValueDoesNotWriteBackToSource()
+	{
+		ArgumentNullException.ThrowIfNull(viewModel);
+
+		viewModel.Age = 1;
+		var converter = new ConvertBackCountingConverter(42, static value => value is null ? BindableProperty.UnsetValue : value);
+		var entry = new Entry
+		{
+			BindingContext = viewModel
+		}.Bind<Entry, ViewModel, int?, object?, string>(
+			Entry.TextProperty,
+			static viewModel => viewModel.Age,
+			static (viewModel, age) => viewModel.Age = age,
+			converter: converter,
+			fallbackValue: "(fallback)");
+
+		viewModel.Age = null;
+
+		Assert.Multiple(() =>
+		{
+			Assert.That(entry.Text, Is.EqualTo("(fallback)"));
+			Assert.That(viewModel.Age, Is.Null);
+			Assert.That(converter.ConvertBackCount, Is.Zero);
+		});
+	}
+
 	[TestCase(false, false)]
 	[TestCase(false, true)]
 	[TestCase(true, false)]
@@ -921,6 +1001,19 @@ sealed class NonReversibleConverter : IValueConverter
 		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => value is double targetValue ? targetValue / 10 : value;
 	}
 
+	sealed class ConvertBackCountingConverter(object? convertBackValue, Func<object?, object?>? convert = null) : IValueConverter
+	{
+		public int ConvertBackCount { get; private set; }
+
+		public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) => convert?.Invoke(value) ?? value;
+
+		public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+		{
+			ConvertBackCount++;
+			return convertBackValue;
+		}
+	}
+
 	class ViewModel : INotifyPropertyChanged
 	{
 		public const double DefaultPercentage = 0.5;
diff --git a/src/CommunityToolkit.Maui.Markup/ExpressionPathHelpers.cs b/src/CommunityToolkit.Maui.Markup/ExpressionPathHelpers.cs
new file mode 100644
index 00000000..635f0a89
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Markup/ExpressionPathHelpers.cs
@@ -0,0 +1,63 @@
+using System.Linq.Expressions;
+
+namespace CommunityToolkit.Maui.Markup;
+
+static class ExpressionPathHelpers
+{
+	public static Func<TBindingContext, TSource> ConvertExpressionToFunc<TBindingContext, TSource>(Expression<Func<TBindingContext, TSource>> expression)
+	{
+		ArgumentNullException.ThrowIfNull(expression);
+
+		return expression.Compile();
+	}
+
+	public static string GetMemberPath<TBindingContext>((Func<TBindingContext, object?>, string)[] handlers)
+	{
+		ArgumentNullException.ThrowIfNull(handlers);
+
+		if (handlers.Length is 0 || handlers.Any(static handler => string.IsNullOrWhiteSpace(handler.Item2)))
+		{
+			throw CreateInvalidGetterException();
+		}
+
+		return string.Join(".", handlers.Select(static handler => handler.Item2));
+	}
+
+	public static string? GetMemberPathOrNullForCapturedValue<T>(Expression<T>? expression)
+	{
+		if (expression is null)
+		{
+			return null;
+		}
+
+		var members = new Stack<string>();
+		var currentExpression = UnwrapConvertExpression(expression.Body);
+
+		while (currentExpression is MemberExpression memberExpression)
+		{
+			members.Push(memberExpression.Member.Name);
+			currentExpression = UnwrapConvertExpression(memberExpression.Expression);
+		}
+
+		return currentExpression switch
+		{
+			ParameterExpression when members.Count > 0 => string.Join(".", members),
+			ConstantExpression when members.Count > 0 => null,
+			null when members.Count > 0 => null,
+			_ => throw CreateInvalidGetterException()
+		};
+	}
+
+	public static InvalidOperationException CreateInvalidGetterException()
+		=> new("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic");
+
+	static Expression? UnwrapConvertExpression(Expression? expression)
+	{
+		while (expression is UnaryExpression { NodeType: ExpressionType.Convert or ExpressionType.ConvertChecked } unaryExpression)
+		{
+			expression = unaryExpression.Operand;
+		}
+
+		return expression;
+	}
+}
diff --git a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
index 1c99c4e8..56b4eddd 100644
--- a/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ImageExtensions.cs
@@ -1,7 +1,7 @@
 namespace CommunityToolkit.Maui.Markup;
 
 /// <summary>
-/// Extension methods for IImage
+/// Extension methods for <see cref="Image"/> and <see cref="ImageButton"/>
 /// </summary>
 public static class ImageExtensions
 {
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs
index d2860299..6db9e6f7 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingExtensions.cs
@@ -198,8 +198,8 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 		where TBindingContext : class?
 
 	{
-		var getterFunc = ConvertExpressionToFunc(getter);
-		var path = GetMemberPathOrNullForCapturedValue(getter);
+		var getterFunc = ExpressionPathHelpers.ConvertExpressionToFunc(getter);
+		var path = ExpressionPathHelpers.GetMemberPathOrNullForCapturedValue(getter);
 		var converter = (convert, convertBack) switch
 		{
 			(null, null) => null,
@@ -238,8 +238,8 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 		where TBindingContext : class?
 
 	{
-		var getterFunc = ConvertExpressionToFunc(getter);
-		var path = GetMemberPathOrNullForCapturedValue(getter);
+		var getterFunc = ExpressionPathHelpers.ConvertExpressionToFunc(getter);
+		var path = ExpressionPathHelpers.GetMemberPathOrNullForCapturedValue(getter);
 
 		return SetTypedBinding(
 			bindable,
@@ -256,57 +256,4 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 			fallbackValue);
 	}
 
-	static Func<TBindingContext, TSource> ConvertExpressionToFunc<TBindingContext, TSource>(in Expression<Func<TBindingContext, TSource>> expression)
-	{
-		ArgumentNullException.ThrowIfNull(expression);
-
-		return expression.Compile();
-	}
-
-	static string GetMemberPath<TBindingContext>((Func<TBindingContext, object?>, string)[] handlers)
-	{
-		ArgumentNullException.ThrowIfNull(handlers);
-
-		if (handlers.Length is 0 || handlers.Any(static handler => string.IsNullOrWhiteSpace(handler.Item2)))
-		{
-			throw CreateInvalidGetterException();
-		}
-
-		return string.Join(".", handlers.Select(static handler => handler.Item2));
-	}
-
-	static string? GetMemberPathOrNullForCapturedValue<T>(in Expression<T> expression)
-	{
-		ArgumentNullException.ThrowIfNull(expression);
-
-		var members = new Stack<string>();
-		var currentExpression = UnwrapConvertExpression(expression.Body);
-
-		while (currentExpression is MemberExpression memberExpression)
-		{
-			members.Push(memberExpression.Member.Name);
-			currentExpression = UnwrapConvertExpression(memberExpression.Expression);
-		}
-
-		return currentExpression switch
-		{
-			ParameterExpression when members.Count > 0 => string.Join(".", members),
-			ConstantExpression when members.Count > 0 => null,
-			null when members.Count > 0 => null,
-			_ => throw CreateInvalidGetterException()
-		};
-	}
-
-	static Expression? UnwrapConvertExpression(Expression? expression)
-	{
-		while (expression is UnaryExpression { NodeType: ExpressionType.Convert or ExpressionType.ConvertChecked } unaryExpression)
-		{
-			expression = unaryExpression.Operand;
-		}
-
-		return expression;
-	}
-
-	static InvalidOperationException CreateInvalidGetterException()
-		=> new("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic");
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index 7ca9b7ad..f2a2f9c0 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Globalization;
 using System.Windows.Input;
 
 namespace CommunityToolkit.Maui.Markup;
@@ -56,7 +57,7 @@ public static TBindable BindCommand<TBindable, TCommandBindingContext, TParamete
 		SetTypedBinding<TBindable, TCommandBindingContext, ICommand, object?, object?>(bindable,
 			commandProperty,
 			getter,
-			GetMemberPath(handlers),
+			ExpressionPathHelpers.GetMemberPath(handlers),
 			setter,
 			commandBindingMode,
 			source: source);
@@ -67,7 +68,7 @@ public static TBindable BindCommand<TBindable, TCommandBindingContext, TParamete
 				bindable,
 				parameterProperty,
 				parameterGetter,
-				parameterHandlers is null ? null : GetMemberPath(parameterHandlers),
+				parameterHandlers is null ? null : ExpressionPathHelpers.GetMemberPath(parameterHandlers),
 				parameterSetter,
 				parameterBindingMode,
 				source: parameterSource);
@@ -163,7 +164,7 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 		return SetTypedBinding(bindable,
 			targetProperty,
 			getter,
-			GetMemberPath(handlers),
+			ExpressionPathHelpers.GetMemberPath(handlers),
 			setter,
 			mode,
 			converter,
@@ -194,7 +195,7 @@ public static TBindable Bind<TBindable, TBindingContext, TSource, TParam, TDest>
 		return SetTypedBinding(bindable,
 			targetProperty,
 			getter,
-			GetMemberPath(handlers),
+			ExpressionPathHelpers.GetMemberPath(handlers),
 			setter,
 			mode,
 			converter,
@@ -238,7 +239,7 @@ static TBindable SetTypedBinding<TBindable, TBindingContext, TSource, TParam, TD
 
 		if (path is null && setter is not null)
 		{
-			throw CreateInvalidGetterException();
+			throw ExpressionPathHelpers.CreateInvalidGetterException();
 		}
 
 		RemoveSourceUpdateHandler(bindable, targetProperty);
@@ -262,19 +263,21 @@ void ApplyBinding()
 			{
 				isApplyingBinding = true;
 				var bindingConverter = path is null
-					? new GetterValueConverter<TBindingContext, TSource>(getter, converter, targetUpdateTracker)
-					: targetUpdateTracker is null ? converter : new TargetUpdateTrackingConverter(converter, targetUpdateTracker);
+					? new GetterValueConverter<TBindingContext, TSource>(getter, converter, targetUpdateTracker, stringFormat, targetNullValue, fallbackValue)
+					: targetUpdateTracker is null ? converter : new TargetUpdateTrackingConverter(converter, targetUpdateTracker, stringFormat, targetNullValue, fallbackValue);
 				var binding = new Binding(
 					path ?? Binding.SelfPath,
 					GetTargetUpdateBindingMode(resolvedMode),
 					bindingConverter,
 					converterParameter,
-					stringFormat,
-					source)
+					targetUpdateTracker is null ? stringFormat : null,
+					source);
+
+				if (targetUpdateTracker is null)
 				{
-					TargetNullValue = targetNullValue,
-					FallbackValue = fallbackValue
-				};
+					binding.TargetNullValue = targetNullValue;
+					binding.FallbackValue = fallbackValue;
+				}
 
 				bindable.SetBinding(targetProperty, binding);
 			}
@@ -505,38 +508,71 @@ public bool TryConsume(object? targetValue)
 		}
 	}
 
-	sealed class TargetUpdateTrackingConverter(IValueConverter? converter, TargetUpdateTracker targetUpdateTracker) : IValueConverter
+	static object? ApplyTargetValueHandlers(object? targetValue, string? stringFormat, object? targetNullValue, object? fallbackValue, CultureInfo culture)
+	{
+		if (ReferenceEquals(targetValue, Binding.DoNothing))
+		{
+			return Binding.DoNothing;
+		}
+
+		if (ReferenceEquals(targetValue, BindableProperty.UnsetValue))
+		{
+			targetValue = fallbackValue;
+		}
+
+		targetValue ??= targetNullValue;
+
+		return stringFormat is null
+			? targetValue
+			: string.Format(culture, stringFormat, targetValue);
+	}
+
+	static void TrackTargetValue(TargetUpdateTracker? targetUpdateTracker, object? targetValue)
 	{
-		public object? Convert(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
+		if (!ReferenceEquals(targetValue, Binding.DoNothing))
 		{
-			var targetValue = converter?.Convert(value, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? value;
-			targetUpdateTracker.Track(targetValue);
+			targetUpdateTracker?.Track(targetValue);
+		}
+	}
+
+	sealed class TargetUpdateTrackingConverter(IValueConverter? converter, TargetUpdateTracker targetUpdateTracker, string? stringFormat, object? targetNullValue, object? fallbackValue) : IValueConverter
+	{
+		public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
+		{
+			var targetCulture = culture ?? CultureInfo.CurrentUICulture;
+			var convertedValue = converter?.Convert(value, targetType ?? typeof(object), parameter, targetCulture) ?? value;
+			var targetValue = ApplyTargetValueHandlers(convertedValue, stringFormat, targetNullValue, fallbackValue, targetCulture);
+			TrackTargetValue(targetUpdateTracker, targetValue);
 			return targetValue;
 		}
 
-		public object? ConvertBack(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
-			=> converter?.ConvertBack(value, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? value;
+		public object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
+			=> converter?.ConvertBack(value, targetType ?? typeof(object), parameter, culture ?? CultureInfo.CurrentUICulture) ?? value;
 
 		public override string? ToString() => converter?.ToString();
 	}
 
-	sealed class GetterValueConverter<TBindingContext, TSource>(Func<TBindingContext, TSource> getter, IValueConverter? converter, TargetUpdateTracker? targetUpdateTracker) : IValueConverter
+	sealed class GetterValueConverter<TBindingContext, TSource>(Func<TBindingContext, TSource> getter, IValueConverter? converter, TargetUpdateTracker? targetUpdateTracker, string? stringFormat, object? targetNullValue, object? fallbackValue) : IValueConverter
 		where TBindingContext : class?
 	{
-		public object? Convert(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
+		public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (value is not TBindingContext sourceObject)
 			{
-				return BindableProperty.UnsetValue;
+				var fallbackTargetValue = ApplyTargetValueHandlers(BindableProperty.UnsetValue, stringFormat, targetNullValue, fallbackValue, culture ?? CultureInfo.CurrentUICulture);
+				TrackTargetValue(targetUpdateTracker, fallbackTargetValue);
+				return fallbackTargetValue;
 			}
 
+			var targetCulture = culture ?? CultureInfo.CurrentUICulture;
 			var sourceValue = getter(sourceObject);
-			var targetValue = converter?.Convert(sourceValue, targetType ?? typeof(object), parameter, culture ?? System.Globalization.CultureInfo.CurrentUICulture) ?? sourceValue;
-			targetUpdateTracker?.Track(targetValue);
+			var convertedValue = converter?.Convert(sourceValue, targetType ?? typeof(object), parameter, targetCulture) ?? sourceValue;
+			var targetValue = ApplyTargetValueHandlers(convertedValue, stringFormat, targetNullValue, fallbackValue, targetCulture);
+			TrackTargetValue(targetUpdateTracker, targetValue);
 			return targetValue;
 		}
 
-		public object? ConvertBack(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
+		public object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 			=> BindableProperty.UnsetValue;
 
 		public override string? ToString() => converter?.ToString() ?? base.ToString();
diff --git a/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs b/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
index 9d68d0ef..d05025ad 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedGesturesExtensions.cs
@@ -50,14 +50,14 @@ public static TGestureElement BindSwipeGesture<TGestureElement, TCommandBindingC
 		where TCommandBindingContext : class
 		where TParameterBindingContext : class
 	{
-		var getterFunc = ConvertExpressionToFunc(getter);
+		var getterFunc = ExpressionPathHelpers.ConvertExpressionToFunc(getter);
 		var parameterGetterFunc = parameterGetter switch
 		{
 			null => null,
-			_ => ConvertExpressionToFunc(parameterGetter)
+			_ => ExpressionPathHelpers.ConvertExpressionToFunc(parameterGetter)
 		};
 
-		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberPathOrNullForCapturedValue(parameterGetter) switch
+		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = ExpressionPathHelpers.GetMemberPathOrNullForCapturedValue(parameterGetter) switch
 		{
 			null => null,
 			var memberPath => [(b => b, memberPath)]
@@ -67,7 +67,7 @@ public static TGestureElement BindSwipeGesture<TGestureElement, TCommandBindingC
 			gestureElement,
 			getterFunc,
 			[
-				(b => b, GetMemberPathOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
+				(b => b, ExpressionPathHelpers.GetMemberPathOrNullForCapturedValue(getter) ?? throw ExpressionPathHelpers.CreateInvalidGetterException())
 			],
 			setter,
 			source,
@@ -175,14 +175,14 @@ public static TGestureElement BindTapGesture<TGestureElement, TCommandBindingCon
 		where TCommandBindingContext : class
 		where TParameterBindingContext : class
 	{
-		var getterFunc = ConvertExpressionToFunc(getter);
+		var getterFunc = ExpressionPathHelpers.ConvertExpressionToFunc(getter);
 		var parameterGetterFunc = parameterGetter switch
 		{
 			null => null,
-			_ => ConvertExpressionToFunc(parameterGetter)
+			_ => ExpressionPathHelpers.ConvertExpressionToFunc(parameterGetter)
 		};
 
-		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = GetMemberPathOrNullForCapturedValue(parameterGetter) switch
+		(Func<TParameterBindingContext, object?>, string)[]? parameterGetterHandlers = ExpressionPathHelpers.GetMemberPathOrNullForCapturedValue(parameterGetter) switch
 		{
 			null => null,
 			var memberPath => [(b => b, memberPath)]
@@ -192,7 +192,7 @@ public static TGestureElement BindTapGesture<TGestureElement, TCommandBindingCon
 			gestureElement,
 			getterFunc,
 			[
-				(b => b, GetMemberPathOrNullForCapturedValue(getter) ?? throw CreateInvalidGetterException())
+				(b => b, ExpressionPathHelpers.GetMemberPathOrNullForCapturedValue(getter) ?? throw ExpressionPathHelpers.CreateInvalidGetterException())
 			],
 			setter,
 			source,
@@ -259,46 +259,6 @@ public static TGestureElement BindTapGesture<TGestureElement, TCommandBindingCon
 		return gestureElement.ConfigureTapGesture(tapGesture, numberOfTapsRequired);
 	}
 
-	static Func<TBindingContext, TSource> ConvertExpressionToFunc<TBindingContext, TSource>(in Expression<Func<TBindingContext, TSource>> expression) => expression.Compile();
-
-	static string? GetMemberPathOrNullForCapturedValue<T>(in Expression<T>? expression)
-	{
-		if (expression is null)
-		{
-			return null;
-		}
-
-		var members = new Stack<string>();
-		var currentExpression = UnwrapConvertExpression(expression.Body);
-
-		while (currentExpression is MemberExpression memberExpression)
-		{
-			members.Push(memberExpression.Member.Name);
-			currentExpression = UnwrapConvertExpression(memberExpression.Expression);
-		}
-
-		return currentExpression switch
-		{
-			ParameterExpression when members.Count > 0 => string.Join(".", members),
-			ConstantExpression when members.Count > 0 => null,
-			null when members.Count > 0 => null,
-			_ => throw CreateInvalidGetterException()
-		};
-	}
-
-	static Expression? UnwrapConvertExpression(Expression? expression)
-	{
-		while (expression is UnaryExpression { NodeType: ExpressionType.Convert or ExpressionType.ConvertChecked } unaryExpression)
-		{
-			expression = unaryExpression.Operand;
-		}
-
-		return expression;
-	}
-
-	static InvalidOperationException CreateInvalidGetterException()
-		=> new("Invalid getter. The `getter` parameter must point directly to a property in the ViewModel and cannot add additional logic");
-
 	static TGestureRecognizer BindGesture<TGestureRecognizer, TGestureElement, TCommandBindingContext, TParameterBindingContext, TParameterSource>(
 		this TGestureElement gestureElement,
 		Func<TCommandBindingContext, ICommand> getter,

From f3ba4ec46da0286c6be7c33a1f8d55b4abd25f90 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Fri, 17 Jul 2026 20:44:40 +0200
Subject: [PATCH 15/17] Clarify pathless command parameter binding mode

Default command parameter typed bindings without parameter handlers or setters to OneTime so the public binding behavior matches the non-observable pathless getter semantics, while preserving explicit caller binding modes.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../TypedBindingExtensionsTests.cs            | 21 +++++++++++++++++++
 .../TypedBindingsExtensions.Handlers.cs       |  6 +++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
index 38e5f056..c74fe952 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
@@ -48,6 +48,27 @@ public void BindCommandSupportsParameterGetterWithoutHandlers()
 			],
 			parameterGetter: _ => Colors.Black);
 
+		BindingHelpers.AssertTypedBindingExists(button, Button.CommandParameterProperty, BindingMode.OneTime, viewModel);
+		Assert.That(button.CommandParameter, Is.EqualTo(Colors.Black));
+	}
+
+	[Test]
+	public void BindCommandSupportsExplicitParameterBindingModeWithoutHandlers()
+	{
+		var button = new Button
+		{
+			BindingContext = viewModel
+		};
+
+		button.BindCommand<Button, ViewModel, object?, Color>(
+			vm => vm.Command,
+			[
+				(vm => vm, nameof(ViewModel.Command))
+			],
+			parameterGetter: _ => Colors.Black,
+			parameterBindingMode: BindingMode.OneWay);
+
+		BindingHelpers.AssertTypedBindingExists(button, Button.CommandParameterProperty, BindingMode.OneWay, viewModel);
 		Assert.That(button.CommandParameter, Is.EqualTo(Colors.Black));
 	}
 
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index f2a2f9c0..4c83880e 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -64,13 +64,17 @@ public static TBindable BindCommand<TBindable, TCommandBindingContext, TParamete
 
 		if (parameterGetter is not null)
 		{
+			var resolvedParameterBindingMode = parameterHandlers is null && parameterSetter is null && parameterBindingMode is BindingMode.Default
+				? BindingMode.OneTime
+				: parameterBindingMode;
+
 			SetTypedBinding<TBindable, TParameterBindingContext, TParameterSource, object?, object?>(
 				bindable,
 				parameterProperty,
 				parameterGetter,
 				parameterHandlers is null ? null : ExpressionPathHelpers.GetMemberPath(parameterHandlers),
 				parameterSetter,
-				parameterBindingMode,
+				resolvedParameterBindingMode,
 				source: parameterSource);
 		}
 

From d8c534860ae8e657cc4125d9ed643574aecd5473 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Fri, 17 Jul 2026 20:52:41 +0200
Subject: [PATCH 16/17] Update element dynamic resource docs

Correct XML documentation return text for dynamic resource helpers now constrained to Element rather than Layout.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../DynamicResourceHandlerExtensions.cs                       | 4 ++--
 src/CommunityToolkit.Maui.Markup/ElementExtensions.cs         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs b/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs
index aa141d37..4ff80951 100644
--- a/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/DynamicResourceHandlerExtensions.cs
@@ -12,7 +12,7 @@ public static class DynamicResourceHandlerExtensions
 	/// <param name="dynamicResourceHandler"></param>
 	/// <param name="property"></param>
 	/// <param name="key"></param>
-	/// <returns>Layout with added Dynamic Resource</returns>
+	/// <returns>Element with added Dynamic Resource</returns>
 	public static TDynamicResourceHandler DynamicResource<TDynamicResourceHandler>(this TDynamicResourceHandler dynamicResourceHandler, BindableProperty property, string key)
 		where TDynamicResourceHandler : Element
 	{
@@ -27,7 +27,7 @@ public static TDynamicResourceHandler DynamicResource<TDynamicResourceHandler>(t
 	/// <typeparam name="TDynamicResourceHandler"></typeparam>
 	/// <param name="dynamicResourceHandler"></param>
 	/// <param name="resources"></param>
-	/// <returns>Layout with added Dynamic Resource</returns>
+	/// <returns>Element with added Dynamic Resource</returns>
 	public static TDynamicResourceHandler DynamicResources<TDynamicResourceHandler>(this TDynamicResourceHandler dynamicResourceHandler, params ReadOnlySpan<(BindableProperty property, string key)> resources)
 		where TDynamicResourceHandler : Element
 	{
diff --git a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
index 2a0b0afb..9e9fa467 100644
--- a/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
+++ b/src/CommunityToolkit.Maui.Markup/ElementExtensions.cs
@@ -114,7 +114,7 @@ static TElement SetPadding<TElement>(TElement paddingElement, Thickness padding)
 	/// <typeparam name="TElement"></typeparam>
 	/// <param name="bindable"></param>
 	/// <param name="properties"></param>
-	/// <returns>Layout without Dynamic Resource</returns>
+	/// <returns>Element without Dynamic Resource</returns>
 	public static TElement RemoveDynamicResources<TElement>(this TElement bindable, params ReadOnlySpan<BindableProperty> properties) where TElement : Element
 	{
 		foreach (var property in properties)

From 05d7fce4e49c8ce7a3a98639b1d0c06c450b37a3 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Fri, 17 Jul 2026 20:59:39 +0200
Subject: [PATCH 17/17] Harden pathless typed command parameters

Handle common compiled getter traversal failures for pathless typed bindings by returning fallback target values, and fail fast when command parameter write-back omits required parameter handlers.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../TypedBindingExtensionsTests.cs            | 38 +++++++++++++++++++
 .../TypedBindingsExtensions.Handlers.cs       | 18 ++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
index c74fe952..236e8322 100644
--- a/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
+++ b/src/CommunityToolkit.Maui.Markup.UnitTests/TypedBindingExtensionsTests.cs
@@ -72,6 +72,44 @@ public void BindCommandSupportsExplicitParameterBindingModeWithoutHandlers()
 		Assert.That(button.CommandParameter, Is.EqualTo(Colors.Black));
 	}
 
+	[Test]
+	public void BindCommandParameterGetterWithoutHandlersDoesNotThrowForNullPath()
+	{
+		var button = new Button
+		{
+			BindingContext = new NestedViewModel()
+		};
+
+		Assert.DoesNotThrow(() => button.BindCommand<Button, NestedViewModel, NestedViewModel, Guid>(
+			vm => vm.Command,
+			[
+				(vm => vm, nameof(ViewModel.Command))
+			],
+			parameterGetter: vm => vm.Model!.Id));
+
+		BindingHelpers.AssertTypedBindingExists(button, Button.CommandParameterProperty, BindingMode.OneTime, button.BindingContext);
+		Assert.That(button.CommandParameter, Is.Null);
+	}
+
+	[Test]
+	public void BindCommandParameterSetterWithoutHandlersThrows()
+	{
+		var button = new Button
+		{
+			BindingContext = viewModel
+		};
+
+		var exception = Assert.Throws<ArgumentNullException>(() => button.BindCommand<Button, ViewModel, ViewModel, Guid>(
+			vm => vm.Command,
+			[
+				(vm => vm, nameof(ViewModel.Command))
+			],
+			parameterGetter: vm => vm.Id,
+			parameterSetter: static (_, _) => { }));
+
+		Assert.That(exception?.ParamName, Is.EqualTo("parameterHandlers"));
+	}
+
 	[Test]
 	public void BindCommandWithDefaults()
 	{
diff --git a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
index 4c83880e..62a0c2a5 100644
--- a/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
+++ b/src/CommunityToolkit.Maui.Markup/TypedBindingsExtensions.Handlers.cs
@@ -64,6 +64,11 @@ public static TBindable BindCommand<TBindable, TCommandBindingContext, TParamete
 
 		if (parameterGetter is not null)
 		{
+			if (parameterSetter is not null && parameterHandlers is null)
+			{
+				throw new ArgumentNullException(nameof(parameterHandlers));
+			}
+
 			var resolvedParameterBindingMode = parameterHandlers is null && parameterSetter is null && parameterBindingMode is BindingMode.Default
 				? BindingMode.OneTime
 				: parameterBindingMode;
@@ -569,7 +574,18 @@ sealed class GetterValueConverter<TBindingContext, TSource>(Func<TBindingContext
 			}
 
 			var targetCulture = culture ?? CultureInfo.CurrentUICulture;
-			var sourceValue = getter(sourceObject);
+			TSource sourceValue;
+			try
+			{
+				sourceValue = getter(sourceObject);
+			}
+			catch (Exception ex) when (ex is NullReferenceException or KeyNotFoundException or IndexOutOfRangeException or ArgumentOutOfRangeException)
+			{
+				var fallbackTargetValue = ApplyTargetValueHandlers(BindableProperty.UnsetValue, stringFormat, targetNullValue, fallbackValue, targetCulture);
+				TrackTargetValue(targetUpdateTracker, fallbackTargetValue);
+				return fallbackTargetValue;
+			}
+
 			var convertedValue = converter?.Convert(sourceValue, targetType ?? typeof(object), parameter, targetCulture) ?? sourceValue;
 			var targetValue = ApplyTargetValueHandlers(convertedValue, stringFormat, targetNullValue, fallbackValue, targetCulture);
 			TrackTargetValue(targetUpdateTracker, targetValue);