MudDateWheelPicker fix (#64)

* fix #63

* MudDateWheelPicker example update

* Select Last Day If Needed

Co-authored-by: mckaragoz <[email protected]>

Author: GioviQ

CodeBeam.MudExtensions/Components/DateWheelPicker/MudDateWheelPicker.razor

@@ -43,19 +43,19 @@
                             @if (yearIndex < dayIndex)
                             {
                                 <MudWheel Class="mud-width-full" @bind-Value="_year" ItemCollection="Years" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Year : null)" Dense="@Dense" Color="@Color" Disabled="FixYear" />
-                                <MudWheel Class="mud-width-full" @bind-Value="_month" ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
+                                <MudWheel Class="mud-width-full" Value="_month" ValueChanged=@((int m) => OnMonthChanged(m)) ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
                                 <MudWheel Class="mud-width-full" @bind-Value="_day" ItemCollection="Days" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Day : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixDay" />
                             }
                             else if (monthIndex < dayIndex && dayIndex < yearIndex )
                             {
-                                <MudWheel Class="mud-width-full" @bind-Value="_month" ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
+                                <MudWheel Class="mud-width-full" Value="_month" ValueChanged=@((int m) => OnMonthChanged(m)) ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
                                 <MudWheel Class="mud-width-full" @bind-Value="_day" ItemCollection="Days" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Day : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixDay" />
                                 <MudWheel Class="mud-width-full" @bind-Value="_year" ItemCollection="Years" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Year : null)" Dense="@Dense" Color="@Color" Disabled="FixYear" />
                             }
                             else
                             {
                                 <MudWheel Class="mud-width-full" @bind-Value="_day" ItemCollection="Days" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Day : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixDay" />
-                                <MudWheel Class="mud-width-full" @bind-Value="_month" ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
+                                <MudWheel Class="mud-width-full" Value="_month" ValueChanged=@((int m) => OnMonthChanged(m)) ItemCollection="Months" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Month : null)" ToStringFunc="new Func<int, string>(NumberToString)" Dense="@Dense" Color="@Color" Disabled="FixMonth" />
                                 <MudWheel Class="mud-width-full" @bind-Value="_year" ItemCollection="Years" Sensitivity="@Sensitivity" Label="@(ShowHeader ? LocalizedStrings.Year : null)" Dense="@Dense" Color="@Color" Disabled="FixYear" />
                             }
                         }

CodeBeam.MudExtensions/Components/DateWheelPicker/MudDateWheelPicker.razor.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Data;
-using System.Threading.Tasks;
-using MudExtensions.Utilities;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.Extensions.DependencyInjection;
 using MudBlazor;
 using MudBlazor.Utilities;
 using MudExtensions.Enums;
-using static MudBlazor.CategoryTypes;
+using MudExtensions.Utilities;
 
 namespace MudExtensions
 {
@@ -300,6 +295,34 @@ protected void ToggleDateView()
             }
         }
 
+        private void RefreshDays()
+        {
+            var month = _month;
+            var year = _year;
+            var day = _day;
+
+            ++month;
+
+            if (month == 13)
+            {
+                month = 1;
+                ++year;
+            }
+
+            Days = Enumerable.Range(1, new DateTime(year, month, 1).AddDays(-1).Day).ToList();
+            if (Days.Last() < _day)
+            {
+                _day = Days.Last();
+            }
+        }
+
+        private void OnMonthChanged(int month)
+        {
+            _month = month;
+
+            RefreshDays();
+        }
+
         protected void SetWheelValues()
         {
             if (Value == null)
@@ -312,6 +335,8 @@ protected void SetWheelValues()
             _hour = Value.Value.Hour;
             _minute = Value.Value.Minute;
             _second = Value.Value.Second;
+
+            RefreshDays();
         }
 
         public override ValueTask FocusAsync()

ComponentViewer.Docs/Pages/Examples/DateWheelPickerExample1.razor

@@ -45,15 +45,15 @@
 </MudGrid>
 
 @code {
-    DateTime? _date = new DateTime(2000, 1, 1);
+    DateTime? _date = DateTime.Now;
     DateView _dateView = DateView.Date;
     bool _editable = false;
     bool _showToolbar = false;
     bool _showHeader = false;
     bool _submitOnClose = true;
     Color _color;
     Color _colorTime = Color.Inherit;
-    string _dateFormat = "dd.MM.yyyy";
+    string _dateFormat = System.Globalization.CultureInfo.CurrentUICulture.DateTimeFormat.ShortDatePattern;
     bool _fixYear;
     bool _fixMonth;
     bool _fixDay;