DropDownDataGrid OpenOnFocus logic fixed

radzenhq · Sep 6, 2024 · aa7306e · aa7306e
1 parent 56cb173
commit aa7306e
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs b/Radzen.Blazor/RadzenDropDownDataGrid.razor.cs
@@ -719,10 +719,7 @@ protected override async Task HandleKeyPress(KeyboardEventArgs args, bool isFilt
                         }
                     }
 
-                    if (!Multiple)
-                    {
-                        await JSRuntime.InvokeVoidAsync("Radzen.closePopup", PopupID);
-                    }
+                    await CloseAndFocus();
                 }
             }
             else if (args.AltKey && key == "ArrowDown")
@@ -891,19 +888,28 @@ protected override async Task OnFilter(ChangeEventArgs args)
         public bool AllowRowSelectOnRowClick { get; set; } = true;
 
         async Task OnRowSelect(object item)
+        {
+            await CloseAndFocus();
+
+            if (AllowRowSelectOnRowClick)
+            {
+                await SelectItem(item);
+            }
+        }
+
+        async Task CloseAndFocus()
         {
             if (!Disabled && !Multiple)
             {
                 await JSRuntime.InvokeVoidAsync("Radzen.closePopup", PopupID);
             }
 
-            await JSRuntime.InvokeVoidAsync("Radzen.focusElement", UniqueID);
+            var of = OpenOnFocus;
+            OpenOnFocus = false;
 
-            if (AllowRowSelectOnRowClick)
-            {
-                await SelectItem(item);
-            }
+            await JSRuntime.InvokeVoidAsync("Radzen.focusElement", UniqueID);
 
+            OpenOnFocus = of;
         }
 
         private async Task OnChipRemove(object item)