feat(datepicker): Added a new [UnoOnly] UseNativeMinMaxDates property on DatePicker & NativeDatePickerFlyout to allow the picker to be restricted to some date instead of just the year. Properties MinYear and MaxYear are still used for that since they are already of type DateTimeOffset.

carldebilly · carldebilly · commit 33ffc121f83a · 2021-08-25T13:28:26.000-04:00
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/DatePicker/DatePicker_Features.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/DatePicker/DatePicker_Features.xaml
@@ -41,6 +41,8 @@
 				<ComboBoxItem Tag="2020">min 2020</ComboBoxItem>
 				<ComboBoxItem Tag="2025">min 2025</ComboBoxItem>
 				<ComboBoxItem Tag="2030">min 2030</ComboBoxItem>
+				<ComboBoxItem Tag="lastweek">lastweek</ComboBoxItem>
+				<ComboBoxItem Tag="today">today</ComboBoxItem>
 			</ComboBox>
 			<ComboBox x:Name="maxYear">
 				<ComboBoxItem Tag="1980">max 1980</ComboBoxItem>
@@ -53,6 +55,8 @@
 				<ComboBoxItem Tag="2035">max 2035</ComboBoxItem>
 				<ComboBoxItem Tag="2040">max 2040</ComboBoxItem>
 				<ComboBoxItem Tag="2045">max 2045</ComboBoxItem>
+				<ComboBoxItem Tag="today">today</ComboBoxItem>
+				<ComboBoxItem Tag="nextweek">nextweek</ComboBoxItem>
 			</ComboBox>
 		</StackPanel>
 		<TextBlock FontSize="16">DatePicker</TextBlock>
@@ -126,13 +130,15 @@
 		</StackPanel>
 		<TextBlock FontSize="16">NativeDatePickerFlyout &amp; (iOS &amp; Android only)</TextBlock>
 		<StackPanel Orientation="Horizontal" Spacing="7">
+			<ToggleButton x:Name="useNativeMinMaxDates">UseNativeMinMaxDates</ToggleButton>
 			<Button x:Name="btnWithNativeFlyout">
 				<Button.Flyout>
 					<android:NativeDatePickerFlyout
 						x:Name="btnNativeFlyout"
 						Date="{x:Bind PickedDate, Mode=TwoWay}"
 						MinYear="{x:Bind DtYear(minYear.SelectedItem), Mode=OneWay}"
 						MaxYear="{x:Bind DtYear(maxYear.SelectedItem), Mode=OneWay}"
+						UseNativeMinMaxDates="{Binding IsChecked, ElementName=useNativeMinMaxDates}"
 						CalendarIdentifier="{Binding SelectedItem.Content, ElementName=calendarIdentifier, FallbackValue=GregorianCalendar}"
 						DayVisible="{Binding IsChecked, ElementName=dayVisible}"
 						MonthVisible="{Binding IsChecked, ElementName=monthVisible}"
@@ -142,6 +148,7 @@
 						Date="{x:Bind PickedDate, Mode=TwoWay}"
 						MinYear="{x:Bind DtYear(minYear.SelectedItem), Mode=OneWay}"
 						MaxYear="{x:Bind DtYear(maxYear.SelectedItem), Mode=OneWay}"
+						UseNativeMinMaxDates="{Binding IsChecked, ElementName=useNativeMinMaxDates}"
 						CalendarIdentifier="{Binding SelectedItem.Content, ElementName=calendarIdentifier, FallbackValue=GregorianCalendar}"
 						DayVisible="{Binding IsChecked, ElementName=dayVisible}"
 						MonthVisible="{Binding IsChecked, ElementName=monthVisible}"
@@ -159,6 +166,7 @@
 		<StackPanel Orientation="Horizontal" Spacing="7">
 			<DatePicker
 				xamarin:UseNativeStyle="True"
+				xamarin:UseNativeMinMaxDates="{Binding IsChecked, ElementName=useNativeMinMaxDates}"
 				x:Name="nativeDatePicker"
 				Date="{x:Bind PickedDate, Mode=TwoWay}"
 				MinYear="{x:Bind DtYear(minYear.SelectedItem), Mode=OneWay}"
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/DatePicker/DatePicker_Features.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/DatePicker/DatePicker_Features.xaml.cs
@@ -30,12 +30,21 @@ public DatePicker_Features()
 
 		public DateTimeOffset DtYear(object o)
 		{
+			var now = DateTimeOffset.Now;
 			if (o is SelectorItem item && item.Tag is string tag && !string.IsNullOrEmpty(tag))
 			{
+				switch (tag)
+				{
+					case "lastweek": return now.AddDays(-7);
+					case "nextweek": return now.AddDays(7);
+					case "today": return now;
+				}
+
 				var year = Convert.ToUInt16(tag);
 				return new DateTime(year, 1, 1, 0, 0, 0);
 			}
-			return DateTimeOffset.Now;
+
+			return now;
 		}
 
 		public string DtString(object o)
diff --git a/src/Uno.Foundation/UnoOnlyAttribute.cs b/src/Uno.Foundation/UnoOnlyAttribute.cs
@@ -5,7 +5,7 @@
 namespace Uno
 {
 	/// <summary>
-	/// This member is only available in Uno and not part of the UWP contract.
+	/// This member is only available in Uno and not part of the UWP/WinUI contract.
 	/// </summary>
 	[System.AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = false)]
 	public sealed class UnoOnlyAttribute : Attribute
diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePicker.Flyout.cs b/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePicker.Flyout.cs
@@ -12,22 +12,44 @@ partial class DatePicker
 		private const bool DEFAULT_NATIVE_STYLE = false;
 #endif
 
+		[UnoOnly]
 		public static DependencyProperty UseNativeStyleProperty { get; } = DependencyProperty.Register(
 			"UseNativeStyle",
 			typeof(bool),
 			typeof(DatePicker),
 			new FrameworkPropertyMetadata(DEFAULT_NATIVE_STYLE));
 
 		/// <summary>
-		/// If we should use the native picker for the platform.
+		/// [UnoOnly] If we should use the native picker for the platform.
 		/// IMPORTANT: must be set before the first time the picker is opened.
 		/// </summary>
+		[UnoOnly]
 		public bool UseNativeStyle
 		{
 			get => (bool)GetValue(UseNativeStyleProperty);
 			set => SetValue(UseNativeStyleProperty, value);
 		}
 
+		[UnoOnly]
+		public static DependencyProperty UseNativeMinMaxDatesProperty { get; } = DependencyProperty.Register(
+			"UseNativeMinMaxDates",
+			typeof(bool),
+			typeof(DatePicker),
+			new FrameworkPropertyMetadata(false));
+
+		/// <summary>
+		/// [UnoOnly] When using native pickers (through the UseNativeStyle property),
+		/// setting this to true will interpret MinYear/MaxYear as MinDate and MaxDate.
+		/// </summary>
+		/// <remarks>
+		/// This property has no effect when not using native pickers.
+		/// </remarks>
+		[UnoOnly]
+		public bool UseNativeMinMaxDates
+		{
+			get => (bool)GetValue(UseNativeMinMaxDatesProperty);
+			set => SetValue(UseNativeMinMaxDatesProperty, value);
+		}
 
 		/// <summary>
 		/// FlyoutPresenterStyle is an Uno-only property to allow the styling of the DatePicker's FlyoutPresenter.
@@ -39,6 +61,7 @@ public Style FlyoutPresenterStyle
 			set => this.SetValue(FlyoutPresenterStyleProperty, value);
 		}
 
+		[UnoOnly]
 		public static DependencyProperty FlyoutPresenterStyleProperty { get; } =
 			DependencyProperty.Register(
 				nameof(FlyoutPresenterStyle),
diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePicker.cs b/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePicker.cs
@@ -858,6 +858,12 @@ void OnFlyoutButtonClick(
 			_flyout.MaxYear = MaxYear;
 			_flyout.Date = SelectedDate ?? Date;
 
+			// UnoOnly
+			if (_flyout is NativeDatePickerFlyout nativeFlyout)
+			{
+				nativeFlyout.UseNativeMinMaxDates = UseNativeMinMaxDates;
+			}
+
 			ShowPickerFlyout();
 		}
 
diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePickerSelector.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePickerSelector.iOS.cs
@@ -14,6 +14,30 @@ namespace Windows.UI.Xaml.Controls
 {
 	public partial class DatePickerSelector
 	{
+		public static DependencyProperty UseNativeMinMaxDatesProperty { get; } = DependencyProperty.Register(
+			"UseNativeMinMaxDates",
+			typeof(bool),
+			typeof(DatePickerSelector),
+			new FrameworkPropertyMetadata(false, propertyChangedCallback: OnUseNativeMinMaxDatesChanged));
+
+		/// <summary>
+		/// Setting this to true will interpret MinYear/MaxYear as MinDate and MaxDate.
+		/// </summary>
+		public bool UseNativeMinMaxDates
+		{
+			get => (bool)GetValue(UseNativeMinMaxDatesProperty);
+			set => SetValue(UseNativeMinMaxDatesProperty, value);
+		}
+
+		private static void OnUseNativeMinMaxDatesChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+		{
+			if (o is DatePickerSelector selector)
+			{
+				selector.UpdateMinMaxYears();
+			}
+		}
+
+
 		private UIDatePicker _picker;
 		private NSDate _initialValue;
 		private NSDate _newValue;
@@ -107,8 +131,11 @@ private void UpdateMinMaxYears()
 			var calendar = new NSCalendar(NSCalendarType.Gregorian);
 
 			winCalendar.SetDateTime(MaxYear);
-			winCalendar.Month = winCalendar.LastMonthInThisYear;
-			winCalendar.Day = winCalendar.LastDayInThisMonth;
+			if (!UseNativeMinMaxDates)
+			{
+				winCalendar.Month = winCalendar.LastMonthInThisYear;
+				winCalendar.Day = winCalendar.LastDayInThisMonth;
+			}
 
 			var maximumDateComponents = new NSDateComponents
 			{
@@ -120,8 +147,11 @@ private void UpdateMinMaxYears()
 			_picker.MaximumDate = calendar.DateFromComponents(maximumDateComponents);
 
 			winCalendar.SetDateTime(MinYear);
-			winCalendar.Month = winCalendar.FirstMonthInThisYear;
-			winCalendar.Day = winCalendar.FirstDayInThisMonth;
+			if (!UseNativeMinMaxDates)
+			{
+				winCalendar.Month = winCalendar.FirstMonthInThisYear;
+				winCalendar.Day = winCalendar.FirstDayInThisMonth;
+			}
 
 			var minimumDateComponents = new NSDateComponents
 			{
diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/NativeDatePickerFlyout.Android.cs b/src/Uno.UI/UI/Xaml/Controls/DatePicker/NativeDatePickerFlyout.Android.cs
@@ -14,6 +14,21 @@ public partial class NativeDatePickerFlyout : DatePickerFlyout
 	{
 		private DatePickerDialog _dialog;
 
+		public static DependencyProperty UseNativeMinMaxDatesProperty { get; } = DependencyProperty.Register(
+			"UseNativeMinMaxDates",
+			typeof(bool),
+			typeof(NativeDatePickerFlyout),
+			new FrameworkPropertyMetadata(false));
+
+		/// <summary>
+		/// Setting this to true will interpret MinYear/MaxYear as MinDate and MaxDate.
+		/// </summary>
+		public bool UseNativeMinMaxDates
+		{
+			get => (bool)GetValue(UseNativeMinMaxDatesProperty);
+			set => SetValue(UseNativeMinMaxDatesProperty, value);
+		}
+
 		public NativeDatePickerFlyout()
 		{
 			this.RegisterPropertyChangedCallback(DateProperty, OnDateChanged);
@@ -49,13 +64,21 @@ protected internal override void Open()
 			//Removes title that is unnecessary as it is a duplicate -> http://stackoverflow.com/questions/33486643/remove-title-from-datepickerdialog 
 			_dialog.SetTitle("");
 
-			var minYearCalendar = Calendar.Instance;
-			minYearCalendar.Set(MinYear.Year, MinYear.Month - 1, MinYear.Day, MinYear.Hour, MinYear.Minute, MinYear.Second);
-			_dialog.DatePicker.MinDate = minYearCalendar.TimeInMillis;
+			if (UseNativeMinMaxDates)
+			{
+				_dialog.DatePicker.MinDate = MinYear.ToUnixTimeMilliseconds();
+				_dialog.DatePicker.MaxDate = MaxYear.ToUnixTimeMilliseconds();
+			}
+			else
+			{
+				var minYearCalendar = Calendar.Instance;
+				minYearCalendar.Set(MinYear.Year, MinYear.Month - 1, MinYear.Day, MinYear.Hour, MinYear.Minute, MinYear.Second);
+				_dialog.DatePicker.MinDate = minYearCalendar.TimeInMillis;
 
-			var maxYearCalendar = Calendar.Instance;
-			maxYearCalendar.Set(MaxYear.Year, MaxYear.Month - 1, MaxYear.Day, MaxYear.Hour, MaxYear.Minute, MaxYear.Second);
-			_dialog.DatePicker.MaxDate = maxYearCalendar.TimeInMillis;
+				var maxYearCalendar = Calendar.Instance;
+				maxYearCalendar.Set(MaxYear.Year, MaxYear.Month - 1, MaxYear.Day, MaxYear.Hour, MaxYear.Minute, MaxYear.Second);
+				_dialog.DatePicker.MaxDate = maxYearCalendar.TimeInMillis;
+			}
 
 			_dialog.DismissEvent += OnDismiss;
 			_dialog.Show();
diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/NativeDatePickerFlyout.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/DatePicker/NativeDatePickerFlyout.iOS.cs
@@ -36,6 +36,28 @@ private NativeDatePickerFlyoutPresenter _presenter
 		}
 		private DatePickerSelector _selector;
 
+		public static DependencyProperty UseNativeMinMaxDatesProperty { get; } = DependencyProperty.Register(
+			"UseNativeMinMaxDates",
+			typeof(bool),
+			typeof(NativeDatePickerFlyout),
+			new FrameworkPropertyMetadata(false, propertyChangedCallback: OnUseNativeMinMaxDatesChanged));
+
+		/// <summary>
+		/// Setting this to true will interpret MinYear/MaxYear as MinDate and MaxDate.
+		/// </summary>
+		public bool UseNativeMinMaxDates
+		{
+			get => (bool)GetValue(UseNativeMinMaxDatesProperty);
+			set => SetValue(UseNativeMinMaxDatesProperty, value);
+		}
+
+		private static void OnUseNativeMinMaxDatesChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+		{
+			if (o is NativeDatePickerFlyout selector)
+			{
+			}
+		}
+
 		public NativeDatePickerFlyout()
 		{
 			Opening += DatePickerFlyout_Opening;
@@ -72,12 +94,9 @@ private void InitializeContent()
 
 			_isInitialized = true;
 
-			Content = _selector = new DatePickerSelector()
-			{
-				MinYear = MinYear,
-				MaxYear = MaxYear
-			};
+			Content = _selector = new DatePickerSelector();
 
+			BindToContent("UseNativeMinMaxDates");
 			BindToContent("MinYear");
 			BindToContent("MaxYear");
 		}
@@ -237,7 +256,7 @@ private IDisposable AttachFlyoutCommand(string targetButtonName, Action<NativeDa
 
 		private void BindToContent(string propertyName)
 		{
-			this.Binding(propertyName, propertyName, Content, BindingMode.TwoWay);
+			Content.Binding(propertyName, propertyName, this, BindingMode.OneWay);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,21 @@ public DatePicker_Features()`
`30`	`30`
`31`	`31`	`public DateTimeOffset DtYear(object o)`
`32`	`32`	`{`
	`33`	`+ var now = DateTimeOffset.Now;`
`33`	`34`	`if (o is SelectorItem item && item.Tag is string tag && !string.IsNullOrEmpty(tag))`
`34`	`35`	`{`
	`36`	`+ switch (tag)`
	`37`	`+ {`
	`38`	`+ case "lastweek": return now.AddDays(-7);`
	`39`	`+ case "nextweek": return now.AddDays(7);`
	`40`	`+ case "today": return now;`
	`41`	`+ }`
	`42`	`+`
`35`	`43`	`var year = Convert.ToUInt16(tag);`
`36`	`44`	`return new DateTime(year, 1, 1, 0, 0, 0);`
`37`	`45`	`}`
`38`		`- return DateTimeOffset.Now;`
	`46`	`+`
	`47`	`+ return now;`
`39`	`48`	`}`
`40`	`49`
`41`	`50`	`public string DtString(object o)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Uno`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`		`- /// This member is only available in Uno and not part of the UWP contract.`
	`8`	`+ /// This member is only available in Uno and not part of the UWP/WinUI contract.`
`9`	`9`	`/// </summary>`
`10`	`10`	`[System.AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = false)]`
`11`	`11`	`public sealed class UnoOnlyAttribute : Attribute`