Merge branch 'develop'

Author: michaelstonis

AuroraControls.TestApp/MainPage.cs

@@ -234,7 +234,7 @@ await this.Navigation.PushAsync(new GridImagePage())),
                                 Content =
                                     new CalendarPicker()
                                     {
-                                        UpdateMode = CalendarPickerUpdateMode.Immediately,
+                                        UpdateMode = CalendarPickerUpdateMode.WhenDone,
                                     }
                                         .Assign(out _calendarPicker),
                             },

AuroraControlsMaui/Platforms/iOS/CalendarPickerHandler.cs

@@ -4,8 +4,11 @@
 
 namespace AuroraControls;
 
-public partial class CalendarPickerHandler : DatePickerHandler
+public partial class CalendarPickerHandler : DatePickerHandler, IDisposable
 {
+    private UIBarButtonItem? _clearButton;
+    private UIBarButtonItem? _doneButton;
+
     public static PropertyMapper<CalendarPicker, CalendarPickerHandler> NullableDatePickerPropertyMapper =
         new(ViewMapper)
         {
@@ -52,21 +55,15 @@ protected override void ConnectHandler(MauiDatePicker platformView)
 
         if (platformView.InputAccessoryView is UIToolbar tb)
         {
-            var clearButton = new UIBarButtonItem("Clear", UIBarButtonItemStyle.Plain,
-                (_, _) =>
-                {
-                    if (this.VirtualView is not CalendarPicker el)
-                    {
-                        return;
-                    }
-
-                    el.Unfocus();
-                    el.Date = null;
-                });
-
-            var items = new List<UIBarButtonItem>(tb.Items);
-            items.Insert(0, clearButton);
-            tb.Items = items.ToArray();
+            _clearButton = new UIBarButtonItem();
+            _clearButton.Style = UIBarButtonItemStyle.Plain;
+            _clearButton.Title = "Clear";
+            _clearButton.Clicked += ClearButtonOnClicked;
+
+            _doneButton = new UIBarButtonItem(UIBarButtonSystemItem.Done);
+            _doneButton.Clicked += DoneButtonOnClicked;
+
+            tb.Items = [_clearButton, new UIBarButtonItem(UIBarButtonSystemItem.FlexibleSpace), _doneButton];
         }
     }
 
@@ -77,6 +74,16 @@ protected override void DisconnectHandler(MauiDatePicker platformView)
             dp.ValueChanged -= OnDatePickerValueChanged;
         }
 
+        if (_clearButton != null)
+        {
+            _clearButton.Clicked -= ClearButtonOnClicked;
+        }
+
+        if (_doneButton != null)
+        {
+            _doneButton.Clicked -= DoneButtonOnClicked;
+        }
+
         base.DisconnectHandler(platformView);
     }
 
@@ -95,7 +102,35 @@ private void OnDatePickerValueChanged(object sender, EventArgs e)
         }
     }
 
-    public void TryShowEmptyState()
+    private void DoneButtonOnClicked(object? sender, EventArgs e)
+    {
+        if (
+            this.PlatformView?.InputView?.Subviews.FirstOrDefault() is not UIDatePicker datePicker ||
+            this.VirtualView is not CalendarPicker calendarPicker ||
+            calendarPicker.UpdateMode != CalendarPickerUpdateMode.WhenDone)
+        {
+            return;
+        }
+
+        calendarPicker.Date = datePicker.Date.ToDateTime();
+
+        this.TryShowEmptyState();
+
+        this.PlatformView.ResignFirstResponder();
+    }
+
+    private void ClearButtonOnClicked(object? sender, EventArgs e)
+    {
+        if (this.VirtualView is not CalendarPicker el)
+        {
+            return;
+        }
+
+        el.Unfocus();
+        el.Date = null;
+    }
+
+    private void TryShowEmptyState()
     {
         if (this.VirtualView is not CalendarPicker el)
         {
@@ -111,4 +146,23 @@ public void TryShowEmptyState()
                         : string.Empty;
             });
     }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!disposing)
+        {
+            return;
+        }
+
+        _clearButton?.Dispose();
+        _doneButton?.Dispose();
+    }
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    ~CalendarPickerHandler() => Dispose(false);
 }