diff --git a/src/Compatibility/Core/src/Android/Renderers/DatePickerRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/DatePickerRenderer.cs
index 2c6a6526ddd0..43eb5f0d63d3 100644
--- a/src/Compatibility/Core/src/Android/Renderers/DatePickerRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/DatePickerRenderer.cs
@@ -136,7 +136,11 @@ void IPickerRenderer.OnClick()
DatePicker view = Element;
((IElementController)view).SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, true);
- ShowPickerDialog(view.Date.Year, view.Date.Month - 1, view.Date.Day);
+ var year = view.Date?.Year ?? DateTime.Today.Year;
+ var month = (view.Date?.Month ?? DateTime.Today.Month) - 1;
+ var day = view.Date?.Day ?? DateTime.Today.Day;
+
+ ShowPickerDialog(year, month, day);
}
void ShowPickerDialog(int year, int month, int day)
@@ -164,19 +168,19 @@ void OnCancelButtonClicked(object sender, EventArgs e)
Element.Unfocus();
}
- void SetDate(DateTime date)
+ void SetDate(DateTime? date)
{
if (String.IsNullOrWhiteSpace(Element.Format))
{
- EditText.Text = date.ToShortDateString();
+ EditText.Text = date?.ToShortDateString();
}
else if (Element.Format.Contains('/', StringComparison.Ordinal))
{
- EditText.Text = date.ToString(Element.Format, CultureInfo.InvariantCulture);
+ EditText.Text = date?.ToString(Element.Format, CultureInfo.InvariantCulture);
}
else
{
- EditText.Text = date.ToString(Element.Format);
+ EditText.Text = date?.ToString(Element.Format);
}
}
@@ -198,7 +202,16 @@ void UpdateMaximumDate()
{
if (_dialog != null)
{
- _dialog.DatePicker.MaxDate = (long)Element.MaximumDate.ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+ if (Element.MaximumDate is null)
+ {
+ _dialog.DatePicker.MaxDate = (long)DateTime.MaxValue.ToUniversalTime()
+ .Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+
+ return;
+ }
+
+ _dialog.DatePicker.MaxDate = (long)Element.MaximumDate.Value
+ .ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
}
}
@@ -207,7 +220,16 @@ void UpdateMinimumDate()
{
if (_dialog != null)
{
- _dialog.DatePicker.MinDate = (long)Element.MinimumDate.ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+ if (Element.MinimumDate is null)
+ {
+ _dialog.DatePicker.MinDate = (long)DateTime.MinValue.ToUniversalTime()
+ .Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+
+ return;
+ }
+
+ _dialog.DatePicker.MinDate = (long)Element.MinimumDate.Value
+ .ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
}
}
diff --git a/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs b/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs
index 77b7f04b7b0d..1164c66771d6 100644
--- a/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs
+++ b/src/Compatibility/Core/src/Windows/DatePickerRenderer.cs
@@ -127,9 +127,9 @@ void OnControlDateChanged(object sender, DatePickerValueChangedEventArgs e)
if (Element == null)
return;
- if (Element.Date.CompareTo(e.NewDate.Date) != 0)
+ if (Element.Date == null || Element.Date?.CompareTo(e.NewDate.Date) != 0)
{
- var date = e.NewDate.Date.Clamp(Element.MinimumDate, Element.MaximumDate);
+ var date = e.NewDate.Date.Clamp(Element.MinimumDate ?? DateTime.MinValue, Element.MaximumDate ?? DateTime.MaxValue);
Element.Date = date;
// set the control date-time to clamped value, if it exceeded the limits at the time of installation.
@@ -148,10 +148,10 @@ bool CheckDateFormat()
}
[PortHandler]
- void UpdateDate(DateTime date)
+ void UpdateDate(DateTime? date)
{
if (Control != null)
- Control.Date = new DateTimeOffset(new DateTime(date.Ticks, DateTimeKind.Unspecified));
+ Control.Date = new DateTimeOffset(new DateTime(date?.Ticks ?? 0, DateTimeKind.Unspecified));
UpdateDay();
UpdateMonth();
@@ -288,18 +288,18 @@ void UpdateFont()
void UpdateMaximumDate()
{
if (Element != null && Control != null)
- Control.MaxYear = new DateTimeOffset(new DateTime(Element.MaximumDate.Ticks, DateTimeKind.Unspecified));
+ Control.MaxYear = new DateTimeOffset(new DateTime(Element.MaximumDate?.Ticks ?? DateTime.MaxValue.Ticks, DateTimeKind.Unspecified));
}
[PortHandler]
void UpdateMinimumDate()
{
- DateTime mindate = Element.MinimumDate;
+ DateTime mindate = Element.MinimumDate ?? DateTime.MinValue;
try
{
if (Element != null && Control != null)
- Control.MinYear = new DateTimeOffset(new DateTime(Element.MinimumDate.Ticks, DateTimeKind.Unspecified));
+ Control.MinYear = new DateTimeOffset(new DateTime(Element.MinimumDate?.Ticks ?? DateTime.MinValue.Ticks, DateTimeKind.Unspecified));
}
catch (ArgumentOutOfRangeException)
{
diff --git a/src/Compatibility/Core/src/iOS/Renderers/DatePickerRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/DatePickerRenderer.cs
index 4e8cf6d1bdfa..e97fc197f131 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/DatePickerRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/DatePickerRenderer.cs
@@ -176,8 +176,8 @@ void OnStarted(object sender, EventArgs eventArgs)
[PortHandler]
void UpdateDateFromModel(bool animate)
{
- if (_picker.Date.ToDateTime().Date != Element.Date.Date)
- _picker.SetDate(Element.Date.ToNSDate(), animate);
+ if (_picker.Date.ToDateTime().Date != Element.Date?.Date)
+ _picker.SetDate(Element.Date?.ToNSDate(), animate);
// Can't use Element.Format because it won't display the correct format if the region and language are set differently
if (string.IsNullOrWhiteSpace(Element.Format) || Element.Format.Equals("d", StringComparison.OrdinalIgnoreCase))
@@ -200,11 +200,11 @@ void UpdateDateFromModel(bool animate)
}
else if (Element.Format.Contains('/', StringComparison.Ordinal))
{
- Control.Text = Element.Date.ToString(Element.Format, CultureInfo.InvariantCulture);
+ Control.Text = Element.Date?.ToString(Element.Format, CultureInfo.InvariantCulture);
}
else
{
- Control.Text = Element.Date.ToString(Element.Format);
+ Control.Text = Element.Date?.ToString(Element.Format);
}
}
@@ -237,13 +237,13 @@ void UpdateCharacterSpacing()
[PortHandler]
void UpdateMaximumDate()
{
- _picker.MaximumDate = Element.MaximumDate.ToNSDate();
+ _picker.MaximumDate = Element.MaximumDate?.ToNSDate();
}
[PortHandler]
void UpdateMinimumDate()
{
- _picker.MinimumDate = Element.MinimumDate.ToNSDate();
+ _picker.MinimumDate = Element.MinimumDate?.ToNSDate();
}
[PortHandler]
diff --git a/src/Controls/docs/Microsoft.Maui.Controls/DateChangedEventArgs.xml b/src/Controls/docs/Microsoft.Maui.Controls/DateChangedEventArgs.xml
deleted file mode 100644
index 43d07adf02c0..000000000000
--- a/src/Controls/docs/Microsoft.Maui.Controls/DateChangedEventArgs.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
- Microsoft.Maui.Controls.Core
- 0.0.0.0
- 1.0.0.0
- 1.1.0.0
- 1.2.0.0
- 1.3.0.0
- 1.4.0.0
- 1.5.0.0
- 2.0.0.0
-
-
- System.EventArgs
-
-
-
- Event arguments for event.
-
-
-
-
-
-
-
- Constructor
-
- 0.0.0.0
- 1.0.0.0
- 1.1.0.0
- 1.2.0.0
- 1.3.0.0
- 1.4.0.0
- 1.5.0.0
- 2.0.0.0
- Microsoft.Maui.Controls.Core
-
-
-
-
-
-
- The old date.
- The new date.
- Creates a new object that represents a change from to .
-
-
-
-
-
-
-
- Property
-
- 0.0.0.0
- 1.0.0.0
- 1.1.0.0
- 1.2.0.0
- 1.3.0.0
- 1.4.0.0
- 1.5.0.0
- 2.0.0.0
- Microsoft.Maui.Controls.Core
-
-
- System.DateTime
-
-
- The date that the user entered.
-
-
-
-
-
-
-
- Property
-
- 0.0.0.0
- 1.0.0.0
- 1.1.0.0
- 1.2.0.0
- 1.3.0.0
- 1.4.0.0
- 1.5.0.0
- 2.0.0.0
- Microsoft.Maui.Controls.Core
-
-
- System.DateTime
-
-
- The date that was on the element at the time that the user selected it.
-
-
-
-
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml
index d90848035ec2..cc78cae0c9af 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml
@@ -89,6 +89,14 @@
Margin="6, 0"
Style="{StaticResource IsFocusedTextStyle}"/>
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml.cs
index 3e3b30bcd08a..92c417eee9b5 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/DatePickerPage.xaml.cs
@@ -14,12 +14,12 @@ public DatePickerPage()
UpdateDatePickerBackground();
}
- void OnUpdateBackgroundButtonClicked(object sender, System.EventArgs e)
+ void OnUpdateBackgroundButtonClicked(object sender, EventArgs e)
{
UpdateDatePickerBackground();
}
- void OnClearBackgroundButtonClicked(object sender, System.EventArgs e)
+ void OnClearBackgroundButtonClicked(object sender, EventArgs e)
{
BackgroundDatePicker.Background = null;
}
@@ -41,14 +41,24 @@ void UpdateDatePickerBackground()
};
}
- void OnFocusDatePickerFocused(object sender, Microsoft.Maui.Controls.FocusEventArgs e)
+ void OnFocusDatePickerFocused(object sender, FocusEventArgs e)
{
Debug.WriteLine("Focused");
}
- void OnFocusDatePickerUnfocused(object sender, Microsoft.Maui.Controls.FocusEventArgs e)
+ void OnFocusDatePickerUnfocused(object sender, FocusEventArgs e)
{
Debug.WriteLine("Unfocused");
}
- }
+
+ void SetDatePickerToNull(object sender, EventArgs e)
+ {
+ NullDatePicker.Date = null;
+ }
+
+ void SetDatePickerToToday(object sender, EventArgs e)
+ {
+ NullDatePicker.Date = DateTime.Now;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/Controls/src/Core/DateChangedEventArgs.cs b/src/Controls/src/Core/DateChangedEventArgs.cs
index 07fd59a9a2f2..3223399b5855 100644
--- a/src/Controls/src/Core/DateChangedEventArgs.cs
+++ b/src/Controls/src/Core/DateChangedEventArgs.cs
@@ -1,22 +1,30 @@
-#nullable disable
using System;
-namespace Microsoft.Maui.Controls
+namespace Microsoft.Maui.Controls;
+
+///
+/// Event arguments for event.
+///
+public class DateChangedEventArgs : EventArgs
{
- ///
- public class DateChangedEventArgs : EventArgs
+ ///
+ /// Creates a new object that represents a change from to
+ ///
+ /// The old date value.
+ /// The new date value.
+ public DateChangedEventArgs(DateTime? oldDate, DateTime? newDate)
{
- ///
- public DateChangedEventArgs(DateTime oldDate, DateTime newDate)
- {
- OldDate = oldDate;
- NewDate = newDate;
- }
+ OldDate = oldDate;
+ NewDate = newDate;
+ }
- ///
- public DateTime NewDate { get; private set; }
+ ///
+ /// The date that the user entered.
+ ///
+ public DateTime? NewDate { get; private set; }
- ///
- public DateTime OldDate { get; private set; }
- }
+ ///
+ /// The date that was on the element at the time that the user selected it.
+ ///
+ public DateTime? OldDate { get; private set; }
}
\ No newline at end of file
diff --git a/src/Controls/src/Core/DatePicker/DatePicker.cs b/src/Controls/src/Core/DatePicker/DatePicker.cs
index 66a916e989c6..ad05ae0d139d 100644
--- a/src/Controls/src/Core/DatePicker/DatePicker.cs
+++ b/src/Controls/src/Core/DatePicker/DatePicker.cs
@@ -14,17 +14,17 @@ public partial class DatePicker : View, IFontElement, ITextElement, IElementConf
public static readonly BindableProperty FormatProperty = BindableProperty.Create(nameof(Format), typeof(string), typeof(DatePicker), "d");
/// Bindable property for .
- public static readonly BindableProperty DateProperty = BindableProperty.Create(nameof(Date), typeof(DateTime), typeof(DatePicker), default(DateTime), BindingMode.TwoWay,
+ public static readonly BindableProperty DateProperty = BindableProperty.Create(nameof(Date), typeof(DateTime?), typeof(DatePicker), null, BindingMode.TwoWay,
coerceValue: CoerceDate,
propertyChanged: DatePropertyChanged,
defaultValueCreator: (bindable) => DateTime.Today);
/// Bindable property for .
- public static readonly BindableProperty MinimumDateProperty = BindableProperty.Create(nameof(MinimumDate), typeof(DateTime), typeof(DatePicker), new DateTime(1900, 1, 1),
+ public static readonly BindableProperty MinimumDateProperty = BindableProperty.Create(nameof(MinimumDate), typeof(DateTime?), typeof(DatePicker), new DateTime(1900, 1, 1),
validateValue: ValidateMinimumDate, coerceValue: CoerceMinimumDate);
/// Bindable property for .
- public static readonly BindableProperty MaximumDateProperty = BindableProperty.Create(nameof(MaximumDate), typeof(DateTime), typeof(DatePicker), new DateTime(2100, 12, 31),
+ public static readonly BindableProperty MaximumDateProperty = BindableProperty.Create(nameof(MaximumDate), typeof(DateTime?), typeof(DatePicker), new DateTime(2100, 12, 31),
validateValue: ValidateMaximumDate, coerceValue: CoerceMaximumDate);
/// Bindable property for .
@@ -54,9 +54,9 @@ public DatePicker()
}
///
- public DateTime Date
+ public DateTime? Date
{
- get { return (DateTime)GetValue(DateProperty); }
+ get { return (DateTime?)GetValue(DateProperty); }
set { SetValue(DateProperty, value); }
}
@@ -74,16 +74,16 @@ TextTransform ITextElement.TextTransform
}
///
- public DateTime MaximumDate
+ public DateTime? MaximumDate
{
- get { return (DateTime)GetValue(MaximumDateProperty); }
+ get { return (DateTime?)GetValue(MaximumDateProperty); }
set { SetValue(MaximumDateProperty, value); }
}
///
- public DateTime MinimumDate
+ public DateTime? MinimumDate
{
- get { return (DateTime)GetValue(MinimumDateProperty); }
+ get { return (DateTime?)GetValue(MinimumDateProperty); }
set { SetValue(MinimumDateProperty, value); }
}
@@ -123,6 +123,10 @@ public double FontSize
set { SetValue(FontSizeProperty, value); }
}
+ ///
+ /// Gets or sets whether the font size is automatically scaled based on the operating system's accessibility settings.
+ /// This is a bindable property.
+ ///
public bool FontAutoScalingEnabled
{
get => (bool)GetValue(FontAutoScalingEnabledProperty);
@@ -163,33 +167,43 @@ public virtual string UpdateFormsText(string source, TextTransform textTransform
static object CoerceDate(BindableObject bindable, object value)
{
var picker = (DatePicker)bindable;
- DateTime dateValue = ((DateTime)value).Date;
+ DateTime? dateValue = ((DateTime?)value)?.Date;
if (dateValue > picker.MaximumDate)
+ {
dateValue = picker.MaximumDate;
+ }
if (dateValue < picker.MinimumDate)
+ {
dateValue = picker.MinimumDate;
+ }
return dateValue;
}
static object CoerceMaximumDate(BindableObject bindable, object value)
{
- DateTime dateValue = ((DateTime)value).Date;
+ DateTime? dateValue = ((DateTime?)value)?.Date;
var picker = (DatePicker)bindable;
+
if (picker.Date > dateValue)
+ {
picker.Date = dateValue;
+ }
return dateValue;
}
static object CoerceMinimumDate(BindableObject bindable, object value)
{
- DateTime dateValue = ((DateTime)value).Date;
+ DateTime? dateValue = ((DateTime?)value)?.Date;
var picker = (DatePicker)bindable;
+
if (picker.Date < dateValue)
+ {
picker.Date = dateValue;
+ }
return dateValue;
}
@@ -199,18 +213,36 @@ static void DatePropertyChanged(BindableObject bindable, object oldValue, object
var datePicker = (DatePicker)bindable;
EventHandler selected = datePicker.DateSelected;
- if (selected != null)
- selected(datePicker, new DateChangedEventArgs((DateTime)oldValue, (DateTime)newValue));
+ if (selected is not null)
+ {
+ selected(datePicker, new DateChangedEventArgs((DateTime?)oldValue, (DateTime?)newValue));
+ }
}
static bool ValidateMaximumDate(BindableObject bindable, object value)
{
- return ((DateTime)value).Date >= ((DatePicker)bindable).MinimumDate.Date;
+ var newDate = (DateTime?)value;
+ var minimumDate = ((DatePicker)bindable).MinimumDate?.Date;
+
+ if (newDate is null || minimumDate is null)
+ {
+ return true;
+ }
+
+ return newDate.Value.Date >= minimumDate;
}
static bool ValidateMinimumDate(BindableObject bindable, object value)
{
- return ((DateTime)value).Date <= ((DatePicker)bindable).MaximumDate.Date;
+ var newDate = (DateTime?)value;
+ var maximumDate = ((DatePicker)bindable).MaximumDate?.Date;
+
+ if (newDate is null || maximumDate is null)
+ {
+ return true;
+ }
+
+ return newDate.Value.Date <= maximumDate;
}
///
@@ -230,7 +262,7 @@ void ITextElement.OnCharacterSpacingPropertyChanged(double oldValue, double newV
Font ITextStyle.Font => this.ToFont();
- DateTime IDatePicker.Date
+ DateTime? IDatePicker.Date
{
get => Date;
set => SetValue(DateProperty, value, SetterSpecificity.FromHandler);
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 032b6469a32e..d766c163b4dd 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -9,6 +9,18 @@
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.Style.set -> void
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.get -> System.Collections.Generic.IList
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.set -> void
+*REMOVED*Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
+Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target) -> void
Microsoft.Maui.Controls.Internals.TextTransformUtilities
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 33f6c2c5e12d..8772f2e2473e 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,6 +1,18 @@
#nullable enable
Microsoft.Maui.Controls.ShadowTypeConverter
Microsoft.Maui.Controls.ShadowTypeConverter.ShadowTypeConverter() -> void
+*REMOVED*Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
+Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.StyleableElement.Style.get -> Microsoft.Maui.Controls.Style?
Microsoft.Maui.Controls.Internals.TextTransformUtilities
override Microsoft.Maui.Controls.ShadowTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type? sourceType) -> bool
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 7435ba760baa..d45799548a91 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,6 +1,18 @@
#nullable enable
Microsoft.Maui.Controls.ShadowTypeConverter
Microsoft.Maui.Controls.ShadowTypeConverter.ShadowTypeConverter() -> void
+*REMOVED*Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
+Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
Microsoft.Maui.Controls.StyleableElement.Style.get -> Microsoft.Maui.Controls.Style?
Microsoft.Maui.Controls.Internals.TextTransformUtilities
override Microsoft.Maui.Controls.ShadowTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type? sourceType) -> bool
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index b8cc6cb0a38f..bca9f259259d 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -9,6 +9,18 @@
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.Style.set -> void
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.get -> System.Collections.Generic.IList
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.set -> void
+*REMOVED*Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
+Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target) -> void
Microsoft.Maui.Controls.Internals.TextTransformUtilities
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 9ef42960f9a9..e984ccaeb512 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -9,6 +9,18 @@
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.Style.set -> void
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.get -> System.Collections.Generic.IList
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.set -> void
+*REMOVED*Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
+Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target) -> void
Microsoft.Maui.Controls.Internals.TextTransformUtilities
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 2e79dcf232bd..c49bb4427f07 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -9,6 +9,18 @@
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.Style.set -> void
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.get -> System.Collections.Generic.IList
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.set -> void
+*REMOVED*Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
+Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target) -> void
Microsoft.Maui.Controls.Internals.TextTransformUtilities
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index f9c1ba845497..42a2397fb7ae 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -9,6 +9,18 @@
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.Style.set -> void
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.get -> System.Collections.Generic.IList
*REMOVED*~Microsoft.Maui.Controls.NavigableElement.StyleClass.set -> void
+*REMOVED*Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime oldDate, System.DateTime newDate) -> void
+Microsoft.Maui.Controls.DateChangedEventArgs.DateChangedEventArgs(System.DateTime? oldDate, System.DateTime? newDate) -> void
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.NewDate.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime
+Microsoft.Maui.Controls.DateChangedEventArgs.OldDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.Date.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.Controls.DatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.Controls.DatePicker.MinimumDate.get -> System.DateTime?
Microsoft.Maui.Controls.HybridWebView.InvokeJavaScriptAsync(string! methodName, object?[]? paramValues = null, System.Text.Json.Serialization.Metadata.JsonTypeInfo?[]? paramJsonTypeInfos = null) -> System.Threading.Tasks.Task!
Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget(T! target) -> void
Microsoft.Maui.Controls.Internals.TextTransformUtilities
diff --git a/src/Controls/tests/Core.UnitTests/DatePickerUnitTest.cs b/src/Controls/tests/Core.UnitTests/DatePickerUnitTest.cs
index 05ce4cd4012a..1b64c051c6b9 100644
--- a/src/Controls/tests/Core.UnitTests/DatePickerUnitTest.cs
+++ b/src/Controls/tests/Core.UnitTests/DatePickerUnitTest.cs
@@ -20,6 +20,16 @@ public void TestMinimumDate()
Assert.Equal(new DateTime(1950, 1, 1), picker.MinimumDate);
}
+ [Fact]
+ public void TestMinimumDateNull()
+ {
+ DatePicker picker = new DatePicker();
+
+ picker.MinimumDate = null;
+
+ Assert.Null(picker.MinimumDate);
+ }
+
[Fact]
public void TestMaximumDate()
{
@@ -33,6 +43,16 @@ public void TestMaximumDate()
Assert.Equal(new DateTime(2050, 1, 1), picker.MaximumDate);
}
+ [Fact]
+ public void TestMaximumDateNull()
+ {
+ DatePicker picker = new DatePicker();
+
+ picker.MaximumDate = null;
+
+ Assert.Null(picker.MaximumDate);
+ }
+
[Fact]
public void TestMaximumDateClamping()
{
@@ -133,10 +153,12 @@ public void TestDateSelected()
Assert.True(selected);
}
- public static object[] DateTimes = {
+ readonly static object[] DateTimes = {
new object[] { new DateTime (2006, 12, 20), new DateTime (2011, 11, 30) },
new object[] { new DateTime (1900, 1, 1), new DateTime (1999, 01, 15) }, // Minimum Date
- new object[] { new DateTime (2006, 12, 20), new DateTime (2100, 12, 31) } // Maximum Date
+ new object[] { new DateTime (2006, 12, 20), new DateTime (2100, 12, 31) }, // Maximum Date
+ new object[] { new DateTime (2006, 12, 20), null },
+ new object[] { null, new DateTime (2006, 12, 20) },
};
public static IEnumerable DateTimesData()
@@ -148,14 +170,14 @@ public static IEnumerable DateTimesData()
}
[Theory, MemberData(nameof(DateTimesData))]
- public void DatePickerSelectedEventArgs(DateTime initialDate, DateTime finalDate)
+ public void DatePickerSelectedEventArgs(DateTime? initialDate, DateTime? finalDate)
{
var datePicker = new DatePicker();
datePicker.Date = initialDate;
DatePicker pickerFromSender = null;
- DateTime oldDate = new DateTime();
- DateTime newDate = new DateTime();
+ DateTime? oldDate = new DateTime();
+ DateTime? newDate = new DateTime();
datePicker.DateSelected += (s, e) =>
{
@@ -171,13 +193,52 @@ public void DatePickerSelectedEventArgs(DateTime initialDate, DateTime finalDate
Assert.Equal(finalDate, newDate);
}
+ readonly static object[] DateTimesForSelectedTrigger = [
+ new object[] { new DateTime (2006, 12, 20), new DateTime (2011, 11, 30), true },
+ new object[] { new DateTime (1900, 1, 1), new DateTime (1999, 01, 15), true }, // Minimum Date
+ new object[] { new DateTime (2006, 12, 20), new DateTime (2100, 12, 31), true }, // Maximum Date
+ new object[] { new DateTime (2006, 12, 20), null, true },
+ new object[] { null, new DateTime (2006, 12, 20), true },
+ new object[] { new DateTime(2006, 12, 20), new DateTime (2006, 12, 20), false },
+ new object[] { null, null, false },
+ ];
+
+ public static IEnumerable DateTimesForSelectedTriggerData()
+ {
+ foreach (var o in DateTimesForSelectedTrigger)
+ {
+ yield return o as object[];
+ }
+ }
+
+ [Theory, MemberData(nameof(DateTimesForSelectedTriggerData))]
+ public void DatePickerSelectedEventTriggered(DateTime? initialDate, DateTime? finalDate, bool shouldDateSelectedTrigger)
+ {
+ bool isDateSelectedTriggered = false;
+
+ var datePicker = new DatePicker();
+ datePicker.Date = initialDate;
+
+ DateTime? oldDate = new DateTime();
+ DateTime? newDate = new DateTime();
+
+ datePicker.DateSelected += (s, e) =>
+ {
+ isDateSelectedTriggered = true;
+ };
+
+ datePicker.Date = finalDate;
+
+ Assert.Equal(shouldDateSelectedTrigger, isDateSelectedTriggered);
+ }
+
[Fact]
//https://bugzilla.xamarin.com/show_bug.cgi?id=32144
public void SetNullValueDoesNotThrow()
{
var datePicker = new DatePicker();
datePicker.SetValue(DatePicker.DateProperty, null);
- Assert.Equal(DateTime.Today, datePicker.Date);
+ Assert.Null(datePicker.Date);
}
[Fact]
@@ -191,7 +252,7 @@ public void SetNullableDateTime()
}
[Fact]
- //https://github.com/xamarin/Microsoft.Maui.Controls/issues/5784
+ //https://github.com/xamarin/Xamarin.Forms/issues/5784
public void SetMaxAndMinDateTimeToNow()
{
var datePicker = new DatePicker();
diff --git a/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs b/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
index f00ca20ab6fd..4867be4875af 100644
--- a/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
+++ b/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
@@ -89,9 +89,9 @@ public override string DebugName
new PropertyTestCase ("FontSize", v => v.FontSize, (v, o) => v.FontSize = o, () => new Button().GetDefaultFontSize(), 123.0),
new PropertyTestCase ("FontAttributes", v => v.FontAttributes, (v, o) => v.FontAttributes = o, () => FontAttributes.None, FontAttributes.Italic),
new PropertyTestCase ("Height", v => v.Height, (v, o) => v.Height = o, () => -1, 10),
- new PropertyTestCase ("MinimumDate", v => v.MinimumDate, (v, o) => v.MinimumDate = o, () => new DateTime (1900, 1, 1), new DateTime (2014, 02, 05)),
- new PropertyTestCase ("MaximumDate", v => v.MaximumDate, (v, o) => v.MaximumDate = o, () => new DateTime (2100, 12, 31), new DateTime (2014, 02, 05)),
- new PropertyTestCase ("Date", v => v.Date, (v, o) => v.Date = o, () => DateTime.Now.Date, new DateTime (2008, 5, 5)),
+ new PropertyTestCase ("MinimumDate", v => v.MinimumDate, (v, o) => v.MinimumDate = o, () => new DateTime (1900, 1, 1), new DateTime (2014, 02, 05)),
+ new PropertyTestCase ("MaximumDate", v => v.MaximumDate, (v, o) => v.MaximumDate = o, () => new DateTime (2100, 12, 31), new DateTime (2014, 02, 05)),
+ new PropertyTestCase ("Date", v => v.Date, (v, o) => v.Date = o, () => DateTime.Now.Date, new DateTime (2008, 5, 5)),
new PropertyTestCase ("Format", v => v.Format, (v, o) => v.Format = o, () => "d", "D"),
new PropertyTestCase ("Text", v => v.Text, (v, o) => v.Text = o, () => null, "Foo"),
new PropertyTestCase ("Text", v => v.Text, (v, o) => v.Text = o, () => null, "Foo"),
diff --git a/src/Controls/tests/Xaml.UnitTests/Issues/Unreported008.xaml.cs b/src/Controls/tests/Xaml.UnitTests/Issues/Unreported008.xaml.cs
index 410ff8fbab4d..d9c0344d465e 100644
--- a/src/Controls/tests/Xaml.UnitTests/Issues/Unreported008.xaml.cs
+++ b/src/Controls/tests/Xaml.UnitTests/Issues/Unreported008.xaml.cs
@@ -35,7 +35,7 @@ public void PickerDateTimesAndXamlC(bool useCompiledXaml)
{
var page = new Unreported008(useCompiledXaml);
var picker = page.picker0;
- Assert.AreEqual(DateTime.Today, picker.Date.Date);
+ Assert.AreEqual(DateTime.Today, picker.Date?.Date);
Assert.AreEqual(new DateTime(2000, 1, 1), picker.MinimumDate);
Assert.AreEqual(new DateTime(2050, 12, 31), picker.MaximumDate);
diff --git a/src/Core/src/Core/IDatePicker.cs b/src/Core/src/Core/IDatePicker.cs
index 78c1efac26a2..9174dd8ad960 100644
--- a/src/Core/src/Core/IDatePicker.cs
+++ b/src/Core/src/Core/IDatePicker.cs
@@ -1,30 +1,29 @@
using System;
-namespace Microsoft.Maui
+namespace Microsoft.Maui;
+
+///
+/// Represents a that allows the user to select a date.
+///
+public interface IDatePicker : IView, ITextStyle
{
///
- /// Represents a View that allows the user to select a date.
+ /// Gets the format of the date to display to the user.
///
- public interface IDatePicker : IView, ITextStyle
- {
- ///
- /// Gets the format of the date to display to the user.
- ///
- string Format { get; set; }
+ string Format { get; set; }
- ///
- /// Gets the displayed date.
- ///
- DateTime Date { get; set; }
+ ///
+ /// Gets the displayed date.
+ ///
+ DateTime? Date { get; set; }
- ///
- /// Gets the minimum DateTime selectable.
- ///
- DateTime MinimumDate { get; }
+ ///
+ /// Gets the minimum selectable .
+ ///
+ DateTime? MinimumDate { get; }
- ///
- /// Gets the maximum DateTime selectable.
- ///
- DateTime MaximumDate { get; }
- }
+ ///
+ /// Gets the maximum selectable .
+ ///
+ DateTime? MaximumDate { get; }
}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
index e277fd74c626..fdd7013af8f4 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs
@@ -20,7 +20,9 @@ protected override MauiDatePicker CreatePlatformView()
var date = VirtualView?.Date;
if (date != null)
+ {
_dialog = CreateDatePickerDialog(date.Value.Year, date.Value.Month - 1, date.Value.Day);
+ }
return mauiDatePicker;
}
@@ -34,12 +36,14 @@ protected override void ConnectHandler(MauiDatePicker platformView)
platformView.ViewDetachedFromWindow += OnViewDetachedFromWindow;
if (platformView.IsAttachedToWindow)
+ {
OnViewAttachedToWindow();
+ }
}
void OnViewDetachedFromWindow(object? sender = null, View.ViewDetachedFromWindowEventArgs? e = null)
{
- // I tested and this is called when an activity is destroyed
+ // This is called when an activity is destroyed
DeviceDisplay.MainDisplayInfoChanged -= OnMainDisplayInfoChanged;
}
@@ -68,7 +72,7 @@ protected virtual DatePickerDialog CreateDatePickerDialog(int year, int month, i
{
var dialog = new DatePickerDialog(Context!, (o, e) =>
{
- if (VirtualView != null)
+ if (VirtualView is not null)
{
VirtualView.Date = e.Date;
}
@@ -124,20 +128,30 @@ public static partial void MapTextColor(IDatePickerHandler handler, IDatePicker
void ShowPickerDialog()
{
- if (VirtualView == null)
+ if (VirtualView is null)
+ {
return;
+ }
- if (_dialog != null && _dialog.IsShowing)
+ if (_dialog is not null && _dialog.IsShowing)
+ {
return;
+ }
var date = VirtualView.Date;
- ShowPickerDialog(date.Year, date.Month - 1, date.Day);
+ ShowPickerDialog(date);
}
- void ShowPickerDialog(int year, int month, int day)
+ void ShowPickerDialog(DateTime? date)
{
- if (_dialog == null)
+ var year = date?.Year ?? DateTime.Today.Year;
+ var month = (date?.Month ?? DateTime.Today.Month) - 1;
+ var day = date?.Day ?? DateTime.Today.Day;
+
+ if (_dialog is null)
+ {
_dialog = CreateDatePickerDialog(year, month, day);
+ }
else
{
EventHandler? setDateLater = null;
@@ -157,11 +171,11 @@ void OnMainDisplayInfoChanged(object? sender, DisplayInfoChangedEventArgs e)
{
DatePickerDialog? currentDialog = _dialog;
- if (currentDialog != null && currentDialog.IsShowing)
+ if (currentDialog is not null && currentDialog.IsShowing)
{
currentDialog.Dismiss();
- ShowPickerDialog(currentDialog.DatePicker.Year, currentDialog.DatePicker.Month, currentDialog.DatePicker.DayOfMonth);
+ ShowPickerDialog(currentDialog.DatePicker.DateTime);
}
}
}
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.MacCatalyst.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.MacCatalyst.cs
index 5a5e86df426e..8b57893e68ab 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.MacCatalyst.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.MacCatalyst.cs
@@ -21,7 +21,7 @@ protected override void ConnectHandler(UIDatePicker platformView)
_proxy.Connect(this, VirtualView, platformView);
var date = VirtualView?.Date;
- if (date is DateTime dt)
+ if (date is not null && date is DateTime dt)
{
platformView.Date = dt.ToNSDate();
}
@@ -77,10 +77,12 @@ public static partial void MapFlowDirection(DatePickerHandler handler, IDatePick
void SetVirtualViewDate()
{
- if (VirtualView == null)
+ if (VirtualView is null)
+ {
return;
+ }
- VirtualView.Date = PlatformView.Date.ToDateTime().Date;
+ VirtualView.Date = PlatformView.Date.ToDateTime();
}
class UIDatePickerProxy
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
index 807af51488de..faf2097fcfb0 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
@@ -1,89 +1,79 @@
-#nullable enable
-using Microsoft.UI.Xaml.Controls;
-using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using Microsoft.UI.Xaml.Controls;
-namespace Microsoft.Maui.Handlers
+namespace Microsoft.Maui.Handlers;
+
+public partial class DatePickerHandler : ViewHandler
{
- public partial class DatePickerHandler : ViewHandler
+ protected override CalendarDatePicker CreatePlatformView() => new CalendarDatePicker();
+
+ protected override void ConnectHandler(CalendarDatePicker platformView)
{
- protected override CalendarDatePicker CreatePlatformView() => new CalendarDatePicker();
+ platformView.DateChanged += DateChanged;
+ }
- protected override void ConnectHandler(CalendarDatePicker platformView)
- {
- platformView.DateChanged += DateChanged;
- }
+ protected override void DisconnectHandler(CalendarDatePicker platformView)
+ {
+ platformView.DateChanged -= DateChanged;
+ }
- protected override void DisconnectHandler(CalendarDatePicker platformView)
- {
- platformView.DateChanged -= DateChanged;
- }
+ public static partial void MapFormat(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ handler.PlatformView.UpdateDate(datePicker);
+ }
- public static partial void MapFormat(IDatePickerHandler handler, IDatePicker datePicker)
- {
- handler.PlatformView.UpdateDate(datePicker);
- }
+ public static partial void MapDate(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ handler.PlatformView.UpdateDate(datePicker);
+ }
- public static partial void MapDate(IDatePickerHandler handler, IDatePicker datePicker)
- {
- handler.PlatformView.UpdateDate(datePicker);
- }
+ public static partial void MapMinimumDate(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ handler.PlatformView.UpdateMinimumDate(datePicker);
+ }
- public static partial void MapMinimumDate(IDatePickerHandler handler, IDatePicker datePicker)
- {
- handler.PlatformView.UpdateMinimumDate(datePicker);
- }
+ public static partial void MapMaximumDate(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ handler.PlatformView.UpdateMaximumDate(datePicker);
+ }
- public static partial void MapMaximumDate(IDatePickerHandler handler, IDatePicker datePicker)
- {
- handler.PlatformView.UpdateMaximumDate(datePicker);
- }
+ public static partial void MapCharacterSpacing(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ handler.PlatformView.UpdateCharacterSpacing(datePicker);
+ }
- public static partial void MapCharacterSpacing(IDatePickerHandler handler, IDatePicker datePicker)
- {
- handler.PlatformView.UpdateCharacterSpacing(datePicker);
- }
+ public static partial void MapFont(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ var fontManager = handler.GetRequiredService();
- public static partial void MapFont(IDatePickerHandler handler, IDatePicker datePicker)
- {
- var fontManager = handler.GetRequiredService();
+ handler.PlatformView.UpdateFont(datePicker, fontManager);
+ }
- handler.PlatformView.UpdateFont(datePicker, fontManager);
- }
+ public static partial void MapTextColor(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ handler.PlatformView.UpdateTextColor(datePicker);
+ }
- public static partial void MapTextColor(IDatePickerHandler handler, IDatePicker datePicker)
+ private void DateChanged(CalendarDatePicker sender, CalendarDatePickerDateChangedEventArgs args)
+ {
+ if (VirtualView is null)
{
- handler.PlatformView.UpdateTextColor(datePicker);
+ return;
}
- private void DateChanged(CalendarDatePicker sender, CalendarDatePickerDateChangedEventArgs args)
+ if (!args.NewDate.HasValue)
{
- if (VirtualView == null)
- return;
-
- if (!args.NewDate.HasValue)
- {
- return;
- }
-
- // TODO ezhart 2021-06-21 For the moment, IDatePicker requires a date to be selected; once that's fixed, we can uncomment these next lines
-
- //if (!args.NewDate.HasValue)
- //{
- // VirtualView.Date = null;
- // return;
- //}
-
- //if (VirtualView.Date == null)
- //{
- // VirtualView.Date = args.NewDate.Value.Date;
- //}
-
- VirtualView.Date = args.NewDate.Value.Date;
+ VirtualView.Date = null;
+ return;
}
- public static partial void MapBackground(IDatePickerHandler handler, IDatePicker datePicker)
+ if (VirtualView.Date is null)
{
- handler.PlatformView?.UpdateBackground(datePicker);
+ VirtualView.Date = args.NewDate.Value.DateTime;
}
}
+
+ public static partial void MapBackground(IDatePickerHandler handler, IDatePicker datePicker)
+ {
+ handler.PlatformView?.UpdateBackground(datePicker);
+ }
}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.iOS.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.iOS.cs
index 8342976a839d..1e5b38d9598b 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.iOS.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.iOS.cs
@@ -23,7 +23,7 @@ protected override void ConnectHandler(MauiDatePicker platformView)
if (DatePickerDialog is UIDatePicker picker)
{
var date = VirtualView?.Date;
- if (date is DateTime dt)
+ if (date is not null && date is DateTime dt)
{
picker.Date = dt.ToNSDate();
}
@@ -121,10 +121,12 @@ static void OnDoneClicked(object? sender)
void SetVirtualViewDate()
{
- if (VirtualView == null || DatePickerDialog == null)
+ if (VirtualView is null || DatePickerDialog is null)
+ {
return;
+ }
- VirtualView.Date = DatePickerDialog.Date.ToDateTime().Date;
+ VirtualView.Date = DatePickerDialog.Date.ToDateTime();
}
class DatePickerDelegate : MauiDatePickerDelegate
diff --git a/src/Core/src/Platform/Android/DatePickerExtensions.cs b/src/Core/src/Platform/Android/DatePickerExtensions.cs
index c2319f51cf82..478167df7576 100644
--- a/src/Core/src/Platform/Android/DatePickerExtensions.cs
+++ b/src/Core/src/Platform/Android/DatePickerExtensions.cs
@@ -20,10 +20,12 @@ public static void UpdateTextColor(this MauiDatePicker platformDatePicker, IDate
{
var textColor = datePicker.TextColor;
- if (textColor != null)
+ if (textColor is not null)
{
if (PlatformInterop.CreateEditTextColorStateList(platformDatePicker.TextColors, textColor.ToPlatform()) is ColorStateList c)
+ {
platformDatePicker.SetTextColor(c);
+ }
}
}
@@ -34,9 +36,18 @@ public static void UpdateMinimumDate(this MauiDatePicker platformDatePicker, IDa
public static void UpdateMinimumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, DatePickerDialog? datePickerDialog)
{
- if (datePickerDialog != null)
+ if (datePickerDialog is not null)
{
- datePickerDialog.DatePicker.MinDate = (long)datePicker.MinimumDate.ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+ if (datePicker.MinimumDate is null)
+ {
+ datePickerDialog.DatePicker.MinDate = (long)DateTime.MinValue.ToUniversalTime()
+ .Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+
+ return;
+ }
+
+ datePickerDialog.DatePicker.MinDate = (long)datePicker.MinimumDate.Value
+ .ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
}
}
@@ -47,15 +58,24 @@ public static void UpdateMaximumDate(this MauiDatePicker platformDatePicker, IDa
public static void UpdateMaximumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, DatePickerDialog? datePickerDialog)
{
- if (datePickerDialog != null)
+ if (datePickerDialog is not null)
{
- datePickerDialog.DatePicker.MaxDate = (long)datePicker.MaximumDate.ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+ if (datePicker.MaximumDate is null)
+ {
+ datePickerDialog.DatePicker.MaxDate = (long)DateTime.MaxValue.ToUniversalTime()
+ .Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
+
+ return;
+ }
+
+ datePickerDialog.DatePicker.MaxDate = (long)datePicker.MaximumDate.Value
+ .ToUniversalTime().Subtract(DateTime.MinValue.AddYears(1969)).TotalMilliseconds;
}
}
internal static void SetText(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
{
- platformDatePicker.Text = datePicker.Date.ToString(datePicker.Format);
+ platformDatePicker.Text = datePicker.Date?.ToString(datePicker.Format) ?? string.Empty;
}
}
}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/DatePickerExtensions.cs b/src/Core/src/Platform/Windows/DatePickerExtensions.cs
index 3533e3983ad2..fc049a7465f7 100644
--- a/src/Core/src/Platform/Windows/DatePickerExtensions.cs
+++ b/src/Core/src/Platform/Windows/DatePickerExtensions.cs
@@ -9,14 +9,16 @@ public static class DatePickerExtensions
{
public static void UpdateDate(this CalendarDatePicker platformDatePicker, IDatePicker datePicker)
{
- var date = datePicker.Date;
+ var date = datePicker.Date ?? DateTime.MinValue;
platformDatePicker.UpdateDate(date);
var format = datePicker.Format;
var dateFormat = format.ToDateFormat();
if (!string.IsNullOrEmpty(dateFormat))
+ {
platformDatePicker.DateFormat = dateFormat;
+ }
platformDatePicker.UpdateTextColor(datePicker);
}
@@ -28,12 +30,12 @@ public static void UpdateDate(this CalendarDatePicker platformDatePicker, DateTi
public static void UpdateMinimumDate(this CalendarDatePicker platformDatePicker, IDatePicker datePicker)
{
- platformDatePicker.MinDate = datePicker.MinimumDate;
+ platformDatePicker.MinDate = datePicker?.MinimumDate ?? DateTime.MinValue;
}
public static void UpdateMaximumDate(this CalendarDatePicker platformDatePicker, IDatePicker datePicker)
{
- platformDatePicker.MaxDate = datePicker.MaximumDate;
+ platformDatePicker.MaxDate = datePicker?.MaximumDate ?? DateTime.MaxValue;
}
public static void UpdateCharacterSpacing(this CalendarDatePicker platformDatePicker, IDatePicker datePicker)
diff --git a/src/Core/src/Platform/iOS/DateExtensions.cs b/src/Core/src/Platform/iOS/DateExtensions.cs
index 4c48171df373..14d260274ee7 100644
--- a/src/Core/src/Platform/iOS/DateExtensions.cs
+++ b/src/Core/src/Platform/iOS/DateExtensions.cs
@@ -1,20 +1,19 @@
using System;
using Foundation;
-namespace Microsoft.Maui.Platform
+namespace Microsoft.Maui.Platform;
+
+public static class DateExtensions
{
- public static class DateExtensions
- {
- internal static DateTime ReferenceDate = new DateTime(2001, 1, 1, 0, 0, 0);
+ internal static DateTime ReferenceDate = new DateTime(2001, 1, 1, 0, 0, 0);
- public static DateTime ToDateTime(this NSDate date)
- {
- return ReferenceDate.AddSeconds(date.SecondsSinceReferenceDate);
- }
+ public static DateTime ToDateTime(this NSDate date)
+ {
+ return ReferenceDate.AddSeconds(date.SecondsSinceReferenceDate);
+ }
- public static NSDate ToNSDate(this DateTime date)
- {
- return NSDate.FromTimeIntervalSinceReferenceDate((date - ReferenceDate).TotalSeconds);
- }
+ public static NSDate ToNSDate(this DateTime date)
+ {
+ return NSDate.FromTimeIntervalSinceReferenceDate((date - ReferenceDate).TotalSeconds);
}
}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/DatePickerExtensions.cs b/src/Core/src/Platform/iOS/DatePickerExtensions.cs
index 0e6cfcff2068..8caee7721d99 100644
--- a/src/Core/src/Platform/iOS/DatePickerExtensions.cs
+++ b/src/Core/src/Platform/iOS/DatePickerExtensions.cs
@@ -34,9 +34,9 @@ public static void UpdateTextColor(this MauiDatePicker platformDatePicker, IDate
{
var textColor = datePicker.TextColor;
- if (textColor == null)
+ if (textColor is null)
{
- if (defaultTextColor != null)
+ if (defaultTextColor is not null)
{
platformDatePicker.TextColor = defaultTextColor;
}
@@ -52,19 +52,23 @@ public static void UpdateTextColor(this MauiDatePicker platformDatePicker, IDate
public static void UpdateDate(this UIDatePicker picker, IDatePicker datePicker)
{
- if (picker != null && picker.Date.ToDateTime().Date != datePicker.Date.Date)
- picker.SetDate(datePicker.Date.ToNSDate(), false);
+ if (picker is not null && picker.Date.ToDateTime() != datePicker.Date)
+ {
+ picker.SetDate(datePicker.Date?.ToNSDate() ?? NSDate.DistantPast, false);
+ }
}
public static void UpdateDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
{
- if (picker != null && picker.Date.ToDateTime().Date != datePicker.Date.Date)
- picker.SetDate(datePicker.Date.ToNSDate(), false);
+ if (picker is not null && picker.Date != NSDate.DistantPast && picker.Date.ToDateTime() != datePicker.Date)
+ {
+ picker.SetDate(datePicker.Date?.ToNSDate() ?? NSDate.DistantPast, false);
+ }
string format = datePicker.Format ?? string.Empty;
// Can't use VirtualView.Format because it won't display the correct format if the region and language are set differently
- if (picker != null && (string.IsNullOrWhiteSpace(format) || format.Equals("d", StringComparison.OrdinalIgnoreCase)))
+ if (picker is not null && (string.IsNullOrWhiteSpace(format) || format.Equals("d", StringComparison.OrdinalIgnoreCase)))
{
NSDateFormatter dateFormatter = new NSDateFormatter
{
@@ -86,11 +90,11 @@ public static void UpdateDate(this MauiDatePicker platformDatePicker, IDatePicke
}
else if (format.Contains('/', StringComparison.Ordinal))
{
- platformDatePicker.Text = datePicker.Date.ToString(format, CultureInfo.InvariantCulture);
+ platformDatePicker.Text = datePicker.Date?.ToString(format, CultureInfo.InvariantCulture) ?? string.Empty;
}
else
{
- platformDatePicker.Text = datePicker.Date.ToString(format);
+ platformDatePicker.Text = datePicker.Date?.ToString(format) ?? string.Empty;
}
platformDatePicker.UpdateCharacterSpacing(datePicker);
@@ -108,9 +112,9 @@ public static void UpdateMinimumDate(this MauiDatePicker platformDatePicker, IDa
public static void UpdateMinimumDate(this UIDatePicker platformDatePicker, IDatePicker datePicker)
{
- if (platformDatePicker != null)
+ if (platformDatePicker is not null)
{
- platformDatePicker.MinimumDate = datePicker.MinimumDate.ToNSDate();
+ platformDatePicker.MinimumDate = datePicker.MinimumDate?.ToNSDate();
}
}
@@ -126,9 +130,9 @@ public static void UpdateMaximumDate(this MauiDatePicker platformDatePicker, IDa
public static void UpdateMaximumDate(this UIDatePicker platformDatePicker, IDatePicker datePicker)
{
- if (platformDatePicker != null)
+ if (platformDatePicker is not null)
{
- platformDatePicker.MaximumDate = datePicker.MaximumDate.ToNSDate();
+ platformDatePicker.MaximumDate = datePicker.MaximumDate?.ToNSDate();
}
}
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 93ca7e357927..24e517eec943 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -39,6 +39,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index c04dc25ca62d..3e411bcc0303 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -38,6 +38,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 0891467308a1..486d4b279528 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -38,6 +38,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 0a1558c901bc..f2fadb76a673 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -37,6 +37,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 929df7085fe2..82f603bb4b91 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -38,6 +38,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 19981094e0a7..fbe7261a4a33 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -38,6 +38,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 19981094e0a7..fbe7261a4a33 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -38,6 +38,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 19981094e0a7..fbe7261a4a33 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -38,6 +38,12 @@ Microsoft.Maui.HybridWebViewRawMessage.HybridWebViewRawMessage() -> void
Microsoft.Maui.HybridWebViewRawMessage.Message.get -> string?
Microsoft.Maui.HybridWebViewRawMessage.Message.set -> void
Microsoft.Maui.IApplication.ActivateWindow(Microsoft.Maui.IWindow! window) -> void
+*REMOVED*Microsoft.Maui.IDatePicker.Date.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime
+*REMOVED*Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime
+Microsoft.Maui.IDatePicker.MaximumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.MinimumDate.get -> System.DateTime?
+Microsoft.Maui.IDatePicker.Date.get -> System.DateTime?
Microsoft.Maui.IHybridWebView
Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
Microsoft.Maui.IHybridWebView.EvaluateJavaScriptAsync(string! script) -> System.Threading.Tasks.Task!
diff --git a/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Android.cs
index 2c1f1a830126..f6f9af889118 100644
--- a/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Android.cs
@@ -90,7 +90,7 @@ public async Task CharacterSpacingInitializesCorrectly()
MauiDatePicker GetNativeDatePicker(DatePickerHandler datePickerHandler) =>
datePickerHandler.PlatformView;
- DateTime GetNativeDate(DatePickerHandler datePickerHandler)
+ DateTime? GetNativeDate(DatePickerHandler datePickerHandler)
{
var dateString = GetNativeDatePicker(datePickerHandler).Text;
DateTime.TryParse(dateString, out DateTime result);
diff --git a/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Windows.cs
index c077a59de555..95935fb50d1e 100644
--- a/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.Windows.cs
@@ -69,7 +69,7 @@ string GetNativeFormat(DatePickerHandler datePickerHandler)
return plaformDatePicker.DateFormat;
}
- DateTime GetNativeDate(DatePickerHandler datePickerHandler)
+ DateTime? GetNativeDate(DatePickerHandler datePickerHandler)
{
var plaformDatePicker = GetNativeDatePicker(datePickerHandler);
var date = plaformDatePicker.Date;
diff --git a/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.iOS.cs
index fc0d91a7330c..a90fd528c2dd 100644
--- a/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/DatePicker/DatePickerHandlerTests.iOS.cs
@@ -88,7 +88,7 @@ public async Task CharacterSpacingInitializesCorrectly()
MauiDatePicker GetNativeDatePicker(DatePickerHandler datePickerHandler) =>
datePickerHandler.PlatformView;
- DateTime GetNativeDate(DatePickerHandler datePickerHandler)
+ DateTime? GetNativeDate(DatePickerHandler datePickerHandler)
{
var dateString = GetNativeDatePicker(datePickerHandler).Text;
DateTime.TryParse(dateString, out DateTime result);
diff --git a/src/Core/tests/DeviceTests/Stubs/DatePickerStub.cs b/src/Core/tests/DeviceTests/Stubs/DatePickerStub.cs
index d099866becc5..84f7f04ffa5c 100644
--- a/src/Core/tests/DeviceTests/Stubs/DatePickerStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/DatePickerStub.cs
@@ -7,11 +7,11 @@ public partial class DatePickerStub : StubBase, IDatePicker
{
public string Format { get; set; }
- public DateTime Date { get; set; }
+ public DateTime? Date { get; set; }
- public DateTime MinimumDate { get; set; }
+ public DateTime? MinimumDate { get; set; }
- public DateTime MaximumDate { get; set; }
+ public DateTime? MaximumDate { get; set; }
public double CharacterSpacing { get; set; }