DataGrid: prevent submitting form on Enter (#5897)

* Datagrid - prevents submitting form on Enter in Filter if SubmitFormOnEnter is false. closes #5790 * Creates PreventDefaultSubmitBehavior private property * Formating --------- Co-authored-by: Mladen Macanovic <[email protected]>
Megabit · Dec 13, 2024 · 55f6fdc · 55f6fdc
1 parent 5350625
commit 55f6fdc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Source/Extensions/Blazorise.DataGrid/DataGrid.razor b/Source/Extensions/Blazorise.DataGrid/DataGrid.razor
@@ -11,10 +11,8 @@
         @paginationFragment
     }
     <Form>
-
-        @if ( IsCellEdit && ( CommandColumn is null || !CommandColumn.SaveCommandAllowed ) )
+        @if ( PreventDefaultSubmitBehavior )
         {
-            //Disable the default form behaviour where pressing enter submits the form and posts the page which is not expected in typical SPA fashion.
             <Button Type="ButtonType.Submit" PreventDefaultOnSubmit Disabled Display="Display.None"></Button>
         }
 

diff --git a/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs b/Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs
@@ -3135,6 +3135,13 @@ internal bool MultiSelect
     /// </summary>
     protected bool PopupVisible => EditMode == DataGridEditMode.Popup && EditState != DataGridEditState.None;
 
+    /// <summary>
+    /// Disable the default form behaviour where pressing enter submits the form and posts the page which is not expected in typical SPA fashion.
+    /// </summary>
+    private bool PreventDefaultSubmitBehavior =>
+        ( IsCellEdit && ( CommandColumn is null || !CommandColumn.SaveCommandAllowed ) )
+        || ( Filterable && !SubmitFormOnEnter ); //prevents submits on Enter within Filter input
+
     /// <summary>
     /// Defines the size of popup dialog.
     /// </summary>