From 3fcc09169a721e06f9c8873cbb38f8fe0fe74a49 Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Tue, 22 Jul 2025 11:55:52 +0200
Subject: [PATCH] Update the existing date/time property editor to provide a
 kind of unspecified (#19727)

* Update the existing date/time property editor to provide a Kind of Unspecified

* Added unit tests
---
 .../DatePickerValueConverter.cs               | 17 ++++++-------
 .../DatePickerValueConverterTests.cs          | 25 +++++++++++++++++++
 2 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverterTests.cs

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
index 6f9238f01f..f1deef76fb 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
@@ -20,19 +20,16 @@ public class DatePickerValueConverter : PropertyValueConverterBase
 
     internal static DateTime ParseDateTimeValue(object? source)
     {
-        if (source is null)
-        {
-            return DateTime.MinValue;
-        }
-
         if (source is DateTime dateTimeValue)
         {
-            return dateTimeValue;
+            return DateTime.SpecifyKind(dateTimeValue, DateTimeKind.Unspecified);
         }
 
-        Attempt<DateTime> attempt = source.TryConvertTo<DateTime>();
-        return attempt.Success
-            ? attempt.Result
-            : DateTime.MinValue;
+        if (source.TryConvertTo<DateTime>() is { Success: true } attempt)
+        {
+            return DateTime.SpecifyKind(attempt.Result, DateTimeKind.Unspecified);
+        }
+
+        return DateTime.MinValue;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverterTests.cs
new file mode 100644
index 0000000000..4c04723718
--- /dev/null
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverterTests.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
+
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors.ValueConverters;
+
+[TestFixture]
+public class DatePickerValueConverterTests
+{
+    private static object[] _parseDateTimeValueCases =
+    [
+        new object[] { null, DateTime.MinValue },
+        new object[] { DateTime.MinValue, DateTime.MinValue },
+        new object[] { new DateTime(2021, 01, 20, 9, 0, 36), new DateTime(2021, 01, 20, 9, 0, 36) },
+        new object[] { "2021-01-20T09:00:36", new DateTime(2021, 01, 20, 9, 0, 36) },
+        new object[] { "test", DateTime.MinValue },
+    ];
+
+    [TestCaseSource(nameof(_parseDateTimeValueCases))]
+    public void Can_Parse_DateTime_Value(object? input, DateTime expected)
+    {
+        var result = DatePickerValueConverter.ParseDateTimeValue(input);
+        Assert.AreEqual(expected, result);
+        Assert.AreEqual(DateTimeKind.Unspecified, result.Kind);
+    }
+}