added tests

Author: Vignesh-SF3580

src/Controls/src/Core/BindableProperty.cs

@@ -47,7 +47,9 @@ public sealed class BindableProperty
 			{ typeof(Maui.Graphics.Color), new ColorTypeConverter() },
 			{ typeof(ImageSource), new ImageSourceConverter() },
 #if NET6_0_OR_GREATER
+			{ typeof(DateTime), new DateTimeTypeConverter() },
 			{ typeof(DateTime?), new DateTimeTypeConverter() },
+			{ typeof(TimeSpan), new TimeSpanTypeConverter() },
 			{ typeof(TimeSpan?), new TimeSpanTypeConverter() }
 #endif
 		};
@@ -229,6 +231,11 @@ internal bool TryConvert(ref object value)
 				return true;
 			}
 			if (KnownTypeConverters.TryGetValue(returnType, out TypeConverter typeConverterTo) && typeConverterTo.CanConvertFrom(valueType))
+			{
+				value = typeConverterTo.ConvertFrom(value);
+				return true;
+			}
+			if (KnownTypeConverters.TryGetValue(returnType, out typeConverterTo) && typeConverterTo.CanConvertFrom(typeof(string)))
 			{
 				value = typeConverterTo.ConvertFromInvariantString(value.ToString());
 				return true;

src/Controls/tests/Core.UnitTests/DateOnlyTypeConverterTests.cs

@@ -50,6 +50,21 @@ public void DateOnlyToDatePickerBinding()
 		Assert.Equal(expectedDateTime, datePicker.Date);
 	}
 
+	[Fact]
+	public void DateOnlyToNonNullableBinding()
+	{
+		var dateProperty = BindableProperty.Create("Date", typeof(DateTime), typeof(DatePicker), null, BindingMode.TwoWay);
+		var source = new Issue20438DatePickerViewModel
+		{
+			SelectedDate = new DateOnly(2025, 3, 15)
+		};
+		var bo = new MockBindable { BindingContext = source };
+
+		bo.SetBinding(dateProperty, "SelectedDate");
+		var expectedDateTime = new DateTime(2025, 3, 15);
+		Assert.Equal(expectedDateTime, bo.GetValue(dateProperty));
+	}
+
 	public class Issue20438DatePickerViewModel
 	{
 		public DateOnly SelectedDate { get; set; }

src/Controls/tests/Core.UnitTests/TimeOnlyTypeConverterTests.cs

@@ -49,6 +49,21 @@ public void TimeOnlyToTimePickerBinding()
 		Assert.Equal(expectedTimeSpan, timePicker.Time);
 	}
 
+	[Fact]
+	public void TimeOnlyToNonNullableBinding()
+	{
+		var timeProperty = BindableProperty.Create("Time", typeof(TimeSpan), typeof(TimePicker), null, BindingMode.TwoWay);
+		var source = new Issue20438TimePickerViewModel
+		{
+			SelectedTime = new TimeOnly(14, 30, 0)
+		};
+		var bo = new MockBindable { BindingContext = source };
+
+		bo.SetBinding(timeProperty, "SelectedTime");
+		var expectedTimeSpan = new TimeSpan(14, 30, 0);
+		Assert.Equal(expectedTimeSpan, bo.GetValue(timeProperty));
+	}
+
 	public class Issue20438TimePickerViewModel
 	{
 		public TimeOnly SelectedTime { get; set; }

src/Controls/tests/Xaml.UnitTests/Issues/Issue20438.xaml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.Issue20438"
+             xmlns:local="clr-namespace:Microsoft.Maui.Controls.Xaml.UnitTests"
+             x:Name="page">
+    <ContentPage.BindingContext>
+        <local:Issue20438ViewModel/>
+    </ContentPage.BindingContext>
+    <StackLayout>
+        <DatePicker x:Name="datePicker"
+                    Date="{Binding SelectedDate}"/>
+        <TimePicker x:Name="timePicker"
+                    Time="{Binding SelectedTime}"/>
+        <local:Issue20438CustomDatePicker x:Name="customDatePicker"
+                                          NonNullableDateTime="{Binding SelectedDate}"/>
+        <local:Issue20438CustomTimePicker x:Name="customTimePicker"
+                                          NonNullableTimeSpan="{Binding SelectedTime}"/>
+    </StackLayout>
+</ContentPage>

src/Controls/tests/Xaml.UnitTests/Issues/Issue20438.xaml.cs

@@ -0,0 +1,80 @@
+#if NET6_0_OR_GREATER
+using System;
+using System.ComponentModel;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests;
+
+[XamlProcessing(XamlInflator.Default, true)]
+public partial class Issue20438 : ContentPage
+{
+    public Issue20438()
+    {
+        InitializeComponent();
+    }
+
+    [TestFixture]
+    public class Tests
+    {
+        [Test]
+        public void DateOnlyBinding([Values] XamlInflator inflator)
+        {
+            var page = new Issue20438(inflator);
+            Assert.That(page.datePicker.Date, Is.EqualTo(new DateTime(2025, 3, 15)));
+        }
+
+        [Test]
+        public void TimeOnlyBinding([Values] XamlInflator inflator)
+        {
+            var page = new Issue20438(inflator);
+            Assert.That(page.timePicker.Time, Is.EqualTo(new TimeSpan(14, 30, 0)));
+        }
+
+        [Test]
+        public void DateOnlyToNonNullableDateTime([Values] XamlInflator inflator)
+        {
+            var page = new Issue20438(inflator);
+            Assert.That(page.customDatePicker.NonNullableDateTime, Is.EqualTo(new DateTime(2025, 3, 15)));
+        }
+
+        [Test]
+        public void TimeOnlyToNonNullableTimeSpan([Values] XamlInflator inflator)
+        {
+            var page = new Issue20438(inflator);
+            Assert.That(page.customTimePicker.NonNullableTimeSpan, Is.EqualTo(new TimeSpan(14, 30, 0)));
+        }
+    }
+}
+
+public class Issue20438CustomDatePicker : DatePicker
+{
+    public static readonly BindableProperty NonNullableDateTimeProperty =
+        BindableProperty.Create(nameof(NonNullableDateTime), typeof(DateTime), typeof(Issue20438CustomDatePicker), default(DateTime));
+
+    [TypeConverter(typeof(DateTimeTypeConverter))]
+    public DateTime NonNullableDateTime
+    {
+        get => (DateTime)GetValue(NonNullableDateTimeProperty);
+        set => SetValue(NonNullableDateTimeProperty, value);
+    }
+}
+
+public class Issue20438CustomTimePicker : TimePicker
+{
+    public static readonly BindableProperty NonNullableTimeSpanProperty =
+        BindableProperty.Create(nameof(NonNullableTimeSpan), typeof(TimeSpan), typeof(Issue20438CustomTimePicker), default(TimeSpan));
+
+    [TypeConverter(typeof(TimeSpanTypeConverter))]
+    public TimeSpan NonNullableTimeSpan
+    {
+        get => (TimeSpan)GetValue(NonNullableTimeSpanProperty);
+        set => SetValue(NonNullableTimeSpanProperty, value);
+    }
+}
+
+public class Issue20438ViewModel
+{
+    public DateOnly SelectedDate { get; set; } = new DateOnly(2025, 3, 15);
+    public TimeOnly SelectedTime { get; set; } = new TimeOnly(14, 30, 0);
+}
+#endif