MudDatePicker: Fix GoToDate with Persian calendar (MudBlazor#8909)

Co-authored-by: PALIZ-DEVOPS\ajr <[email protected]>
Yomodo · May 8, 2024 · 4e271a6 · 4e271a6
1 parent 6dfefb3
commit 4e271a6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/MudBlazor.UnitTests/Components/DatePickerTests.cs b/src/MudBlazor.UnitTests/Components/DatePickerTests.cs
@@ -575,6 +575,22 @@ public async Task PersianCalendar()
             datePicker.Instance.Text.Should().Be("1399/11/26");
         }
 
+        [Test]
+        public async Task PersianCalendarTest_GoToDate()
+        {
+            var cal = new PersianCalendar();
+            var comp = Context.RenderComponent<PersianDatePickerTest>();
+            var datePicker = comp.FindComponent<MudDatePicker>().Instance;
+            await comp.InvokeAsync(() => datePicker.OpenAsync());
+            datePicker.Text.Should().Be("1399/11/26");
+            await comp.InvokeAsync(() => datePicker.GoToDate(new DateTime(2024, 5, 8)));
+            comp.WaitForAssertion(() => datePicker.Text.Should().Be("1403/02/19"));
+            var button = comp
+                .FindAll(".mud-button-root.mud-icon-button.mud-ripple.mud-ripple-icon.mud-picker-calendar-day.mud-day")
+                .Single(x => x.GetAttribute("style") == "--day-id: 1;");
+            button.TextContent.Should().Be("1");
+        }
+
         [Test]
         public void SetPickerValue_CheckText()
         {

diff --git a/src/MudBlazor/Components/DatePicker/MudDatePicker.cs b/src/MudBlazor/Components/DatePicker/MudDatePicker.cs
@@ -317,7 +317,8 @@ public void GoToDate()
         {
             if (Date.HasValue)
             {
-                PickerMonth = new DateTime(Date.Value.Year, Date.Value.Month, 1);
+                PickerMonth = new DateTime(Culture.Calendar.GetYear(Date.Value), Culture.Calendar.GetMonth(Date.Value),
+                    1, Culture.Calendar);
                 ScrollToYear();
             }
         }
@@ -327,7 +328,8 @@ public void GoToDate()
         /// </summary>
         public async Task GoToDate(DateTime date, bool submitDate = true)
         {
-            PickerMonth = new DateTime(date.Year, date.Month, 1);
+            PickerMonth = new DateTime(Culture.Calendar.GetYear(date), Culture.Calendar.GetMonth(date), 1,
+                Culture.Calendar);
             if (submitDate)
             {
                 await SetDateAsync(date, true);