Fixed DatePicker can select disabled date if focused

radzenhq · Oct 3, 2024 · 343afff · 343afff
1 parent 163eac9
commit 343afff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Radzen.Blazor/RadzenDatePicker.razor.cs b/Radzen.Blazor/RadzenDatePicker.razor.cs
@@ -1174,10 +1174,13 @@ async Task OnCalendarKeyPress(KeyboardEventArgs args)
             {
                 preventKeyPress = true;
 
-                await SetDay(FocusedDate);
+                if (!DateAttributes(FocusedDate).Disabled)
+                {
+                    await SetDay(FocusedDate);
 
-                await ClosePopup();
-                await FocusAsync();
+                    await ClosePopup();
+                    await FocusAsync();
+                }
             }
             else if (key == "Escape")
             {

diff --git a/RadzenBlazorDemos/Pages/DatePickerSpecialDates.razor b/RadzenBlazorDemos/Pages/DatePickerSpecialDates.razor
@@ -9,11 +9,12 @@
 
     void DateRender(DateRenderEventArgs args)
     {
-        if (dates.Contains(args.Date))
+        var special = dates.Select(d => d.Date).Contains(args.Date.Date);
+        if (special)
         {
             args.Attributes.Add("style", "background-color: #ff6d41; border-color: white;");
         }
 
-        args.Disabled = args.Disabled || args.Date.DayOfWeek == DayOfWeek.Sunday || args.Date.DayOfWeek == DayOfWeek.Saturday;
+        args.Disabled = special || args.Disabled || args.Date.DayOfWeek == DayOfWeek.Sunday || args.Date.DayOfWeek == DayOfWeek.Saturday;
     }
 }