Prevent modal closing if clicked on backdrop

pull/8081/head
Mladen Macanovic 5 years ago
parent 1b31b11bb3
commit b5a5c9239d

@ -321,12 +321,18 @@ namespace Volo.Abp.BlazoriseUI
return InvokeAsync(CreateModal.Hide);
}
protected virtual void ClosingCreateModal(ModalClosingEventArgs eventArgs)
{
// cancel close if clicked outside of modal area
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
}
protected virtual async Task OpenEditModalAsync(TListViewModel entity)
{
try
{
EditValidationsRef?.ClearAll();
await CheckUpdatePolicyAsync();
var entityDto = await AppService.GetAsync(entity.Id);
@ -377,6 +383,12 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
protected virtual void ClosingEditModal(ModalClosingEventArgs eventArgs)
{
// cancel close if clicked outside of modal area
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
}
protected virtual async Task CreateEntityAsync()
{
try

@ -3,7 +3,7 @@
@inherits AbpFeatureManagementComponentBase
<Modal @ref="Modal">
<Modal @ref="Modal" Closing="@ClosingModal">
<ModalContent Size="ModalSize.Large" IsCentered="true">
<ModalHeader>
<ModalTitle>@L["Features"]</ModalTitle>

@ -136,5 +136,10 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
var resource = LocalizationOptions.Value.Resources.Values.FirstOrDefault(x => x.ResourceName == resourceName);
return HtmlLocalizerFactory.Create(resource != null ? resource.ResourceType : LocalizationOptions.Value.DefaultResourceType);
}
protected virtual void ClosingModal( ModalClosingEventArgs eventArgs )
{
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
}
}
}

@ -75,7 +75,7 @@
@* ************************* CREATE MODAL ************************* *@
@if (HasCreatePermission)
{
<Modal @ref="CreateModal">
<Modal @ref="CreateModal" Closing="@ClosingCreateModal">
<ModalContent Centered="true">
<Form>
<ModalHeader>
@ -111,7 +111,7 @@
@* ************************* EDIT MODAL ************************* *@
@if (HasUpdatePermission)
{
<Modal @ref="EditModal">
<Modal @ref="EditModal" Closing="@ClosingEditModal">
<ModalContent Centered="true">
<Form>
<ModalHeader>

@ -75,7 +75,7 @@
@* ************************* CREATE MODAL ************************* *@
@if ( HasCreatePermission )
{
<Modal @ref="CreateModal">
<Modal @ref="CreateModal" Closing="@ClosingCreateModal">
<ModalContent Centered="true">
<Form>
<ModalHeader>
@ -183,7 +183,7 @@
@* ************************* EDIT MODAL ************************* *@
@if ( HasUpdatePermission )
{
<Modal @ref="EditModal">
<Modal @ref="EditModal" Closing="@ClosingEditModal">
<ModalContent Centered="true">
<Form>
<ModalHeader>

@ -1,7 +1,7 @@
@using Microsoft.Extensions.Localization
@using Volo.Abp.PermissionManagement.Localization
@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
<Modal @ref="_modal">
<Modal @ref="_modal" Closing="@ClosingModal">
<ModalContent Size="ModalSize.Large" IsCentered="true">
<ModalHeader>
<ModalTitle>@L["Permissions"] - @_entityDisplayName</ModalTitle>

@ -230,5 +230,10 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
.JoinAsString(", ")
);
}
protected virtual void ClosingModal(ModalClosingEventArgs eventArgs)
{
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
}
}
}

@ -66,7 +66,7 @@
@* ************************* CREATE MODAL ************************* *@
@if ( HasCreatePermission )
{
<Modal @ref="CreateModal">
<Modal @ref="CreateModal" Closing="@ClosingCreateModal">
<ModalContent Centered="true">
<Form>
<ModalHeader>
@ -119,7 +119,7 @@
@* ************************* EDIT MODAL ************************* *@
@if ( HasUpdatePermission )
{
<Modal @ref="EditModal">
<Modal @ref="EditModal" Closing="@ClosingEditModal">
<ModalContent Centered="true">
<Form>
<ModalHeader>

Loading…
Cancel
Save