From 29665ceed1b14daa3252fc361d33802ae41b7308 Mon Sep 17 00:00:00 2001
From: tesar-tech <jan@tesar.tech>
Date: Fri, 14 Mar 2025 17:13:46 +0100
Subject: [PATCH 1/2] Fixes fullscreen modal by applying min-height instead of
 height.

---
 Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor
index 4fd4b26775..4456da348b 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor
@@ -1,7 +1,7 @@
 @typeparam TItem
 @inherits BaseAfterRenderComponent
 
-<Modal @ref="modalRef" Closing="@PopupClosing" Closed="@Cancel">
+<Modal @ref="modalRef" Closing="@PopupClosing" Closed="@Cancel" Style="min-height:100%;height: auto;">
     <ModalContent Size="@PopupSize">
         <Form>
             <ModalHeader>

From fb07d0c1dc5c63fcd29628266233cd64e6dbf7ed Mon Sep 17 00:00:00 2001
From: tesar-tech <jan@tesar.tech>
Date: Fri, 14 Mar 2025 22:14:19 +0100
Subject: [PATCH 2/2] move form to modal body

---
 .../Blazorise.DataGrid/_DataGridModal.razor   | 124 +++++++++---------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor
index 4456da348b..0cab946fb8 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor
@@ -1,27 +1,27 @@
 @typeparam TItem
 @inherits BaseAfterRenderComponent
 
-<Modal @ref="modalRef" Closing="@PopupClosing" Closed="@Cancel" Style="min-height:100%;height: auto;">
+<Modal @ref="modalRef" Closing="@PopupClosing" Closed="@Cancel" >
     <ModalContent Size="@PopupSize">
-        <Form>
-            <ModalHeader>
-                <ModalTitle>
-                    @if ( TitleTemplate != null && EditItem != null )
-                    {
-                        @TitleTemplate( new( EditItem, EditState, EditState == DataGridEditState.Edit
-                            ? Localizer.Localize( ParentDataGrid.Localizers?.EditLocalizer, "Edit" )
-                            : Localizer.Localize( ParentDataGrid.Localizers?.CreateLocalizer, "Create" ) ) )
-                    }
-                    else
-                    {
-                        @(EditState == DataGridEditState.Edit
-                            ? Localizer.Localize( ParentDataGrid.Localizers?.ModalRowEditLocalizer, "Row Edit" )
-                            : Localizer.Localize( ParentDataGrid.Localizers?.ModalRowCreateLocalizer, "Row Create" ))
-                    }
-                </ModalTitle>
-                <CloseButton Clicked="@CloseModal" AutoClose="false" />
-            </ModalHeader>
-            <ModalBody>
+        <ModalHeader>
+            <ModalTitle>
+                @if ( TitleTemplate != null && EditItem != null )
+                {
+                    @TitleTemplate( new( EditItem, EditState, EditState == DataGridEditState.Edit
+                        ? Localizer.Localize( ParentDataGrid.Localizers?.EditLocalizer, "Edit" )
+                        : Localizer.Localize( ParentDataGrid.Localizers?.CreateLocalizer, "Create" ) ) )
+                }
+                else
+                {
+                    @(EditState == DataGridEditState.Edit
+                        ? Localizer.Localize( ParentDataGrid.Localizers?.ModalRowEditLocalizer, "Row Edit" )
+                        : Localizer.Localize( ParentDataGrid.Localizers?.ModalRowCreateLocalizer, "Row Create" ))
+                }
+            </ModalTitle>
+            <CloseButton Clicked="@CloseModal" AutoClose="false" />
+        </ModalHeader>
+        <ModalBody>
+            <Form>
                 <Validations @ref="validations" Mode="ValidationMode.Manual" StatusChanged="@ValidationsStatusChanged" Model="@ValidationItem" HandlerType="@ParentDataGrid?.ValidationsHandlerType">
                     @if ( ParentDataGrid.ShowValidationsSummary )
                     {
@@ -49,58 +49,58 @@
                         }
                     </Fields>
                 </Validations>
-            </ModalBody>
-            <ModalFooter>
-                @if ( ParentDataGrid.CommandColumn is null || ParentDataGrid.CommandColumn.CancelCommandAllowed )
-                {
-                    var cancelButtonString = Localizer.Localize( ParentDataGrid.Localizers?.CancelButtonLocalizer, "Cancel" );
+            </Form>
+        </ModalBody>
+        <ModalFooter>
+            @if ( ParentDataGrid.CommandColumn is null || ParentDataGrid.CommandColumn.CancelCommandAllowed )
+            {
+                var cancelButtonString = Localizer.Localize( ParentDataGrid.Localizers?.CancelButtonLocalizer, "Cancel" );
 
-                    @if ( ParentDataGrid.CommandColumn?.CancelCommandTemplate != null )
-                    {
-                        @ParentDataGrid.CommandColumn.CancelCommandTemplate( new()
-                        {
-                            Clicked = EventCallback.Factory.Create( this, CloseModal ),
-                            LocalizationString = cancelButtonString,
-                            Item = EditItem,
-                        } )
-                    }
-                    else
+                @if ( ParentDataGrid.CommandColumn?.CancelCommandTemplate != null )
+                {
+                    @ParentDataGrid.CommandColumn.CancelCommandTemplate( new()
                     {
-                        <Button Color="Color.Link" Clicked="@CloseModal">
-                            @cancelButtonString
-                        </Button>
-                    }
+                        Clicked = EventCallback.Factory.Create( this, CloseModal ),
+                        LocalizationString = cancelButtonString,
+                        Item = EditItem,
+                    } )
                 }
-                @if ( ParentDataGrid.CommandColumn is null || ParentDataGrid.CommandColumn.SaveCommandAllowed )
+                else
                 {
-                    var saveButtonString = Localizer.Localize( ParentDataGrid.Localizers?.SaveButtonLocalizer, "Save" );
+                    <Button Color="Color.Link" Clicked="@CloseModal">
+                        @cancelButtonString
+                    </Button>
+                }
+            }
+            @if ( ParentDataGrid.CommandColumn is null || ParentDataGrid.CommandColumn.SaveCommandAllowed )
+            {
+                var saveButtonString = Localizer.Localize( ParentDataGrid.Localizers?.SaveButtonLocalizer, "Save" );
 
-                    @if ( ParentDataGrid.CommandColumn?.SaveCommandTemplate != null )
+                @if ( ParentDataGrid.CommandColumn?.SaveCommandTemplate != null )
+                {
+                    @ParentDataGrid.CommandColumn.SaveCommandTemplate( new()
                     {
-                        @ParentDataGrid.CommandColumn.SaveCommandTemplate( new()
-                        {
-                            Clicked = callbackFactory.Create( this, Save ),
-                            LocalizationString = saveButtonString,
-                            Item = EditItem,
-                        } )
+                        Clicked = callbackFactory.Create( this, Save ),
+                        LocalizationString = saveButtonString,
+                        Item = EditItem,
+                    } )
+                }
+                else
+                {
+                    @if ( ParentDataGrid.SubmitFormOnEnter )
+                    {
+                        <Button Type="ButtonType.Submit" PreventDefaultOnSubmit Color="Color.Link" Clicked="@Save">
+                            @saveButtonString
+                        </Button>
                     }
                     else
                     {
-                        @if ( ParentDataGrid.SubmitFormOnEnter )
-                        {
-                            <Button Type="ButtonType.Submit" PreventDefaultOnSubmit Color="Color.Link" Clicked="@Save">
-                                @saveButtonString
-                            </Button>
-                        }
-                        else
-                        {
-                            <Button Color="Color.Link" Clicked="@Save">
-                                @saveButtonString
-                            </Button>
-                        }
+                        <Button Color="Color.Link" Clicked="@Save">
+                            @saveButtonString
+                        </Button>
                     }
                 }
-            </ModalFooter>
-        </Form>
+            }
+        </ModalFooter>
     </ModalContent>
 </Modal>
\ No newline at end of file