From c7c11a1c1e9074cf3482d221d9c8abf43e4f52a2 Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@gmail.com>
Date: Thu, 29 Aug 2024 09:17:23 +0300
Subject: [PATCH] DropDownDataGrid keyboard navigation fixed

---
 Radzen.Blazor/RadzenDropDownDataGrid.razor.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs b/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs
index f29765cef16..ac7a9c41555 100644
--- a/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs
+++ b/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs
@@ -362,11 +362,13 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
                 }
 
                 StateHasChanged();
-            }
 
-            if (!Multiple && grid != null)
-            {
-                await grid.SelectRow(SelectedItem, false);
+                if (!Multiple && grid != null && SelectedItem != null)
+                {
+                    var items = (LoadData.HasDelegate ? Data != null ? Data : Enumerable.Empty<object>() : (pagedData != null ? pagedData : Enumerable.Empty<object>())).OfType<object>().ToList();
+                    selectedIndex = items.IndexOf(SelectedItem);
+                    await JSRuntime.InvokeAsync<int[]>("Radzen.focusTableRow", grid.GridId(), "ArrowDown", selectedIndex - 1, null);
+                }
             }
 
             await base.OnAfterRenderAsync(firstRender);