Skip to content

DataGrid Modal: Fixes fullscreen modal by applying min-height instead of height. #6020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: rel-1.7
Choose a base branch
from
Open

DataGrid Modal: Fixes fullscreen modal by applying min-height instead of height. #6020

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29665ce
Fixes fullscreen modal by applying min-height instead of height.
tesar-tech Mar 14, 2025
fb07d0c
move form to modal body
tesar-tech Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 62 additions & 62 deletions Source/Extensions/Blazorise.DataGrid/_DataGridModal.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
@typeparam TItem
@inherits BaseAfterRenderComponent

<Modal @ref="modalRef" Closing="@PopupClosing" Closed="@Cancel">
<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 )
{
Expand Down Expand Up @@ -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>
Loading