Skip to content
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.

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

Renamed ActivateFocusTrap to UseFocusTrap #435

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/Blazored.Modal/BlazoredModal.razor
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[Parameter] public string? Class { get; set; }
[Parameter] public ModalAnimationType? AnimationType { get; set; }
[Parameter] public bool? UseCustomLayout { get; set; }
[Parameter] public bool? ActivateFocusTrap { get; set; }
[Parameter] public bool? UseFocusTrap { get; set; }

private readonly Collection<ModalReference> _modals = new();
private readonly ModalOptions _globalModalOptions = new();
Expand Down Expand Up @@ -60,7 +60,7 @@
_globalModalOptions.OverlayCustomClass = OverlayCustomClass;

_globalModalOptions.UseCustomLayout = UseCustomLayout;
_globalModalOptions.ActivateFocusTrap = ActivateFocusTrap;
_globalModalOptions.UseFocusTrap = UseFocusTrap;
}

protected override async Task OnAfterRenderAsync(bool firstRender)
Expand Down
2 changes: 1 addition & 1 deletion src/Blazored.Modal/BlazoredModalInstance.razor
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ else
@ref="_modalReference"
@onclick="HandleBackgroundClick">

<FocusTrap @ref="FocusTrap" IsActive="ActivateFocusTrap">
<FocusTrap @ref="FocusTrap" IsActive="UseFocusTrap">
<div class="@ModalClass" role="dialog" aria-modal="true" @onclick:stopPropagation="true">
@if (!HideHeader)
{
Expand Down
14 changes: 7 additions & 7 deletions src/Blazored.Modal/BlazoredModalInstance.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public partial class BlazoredModalInstance : IDisposable
private string? OverlayAnimationClass { get; set; }
private string? OverlayCustomClass { get; set; }
private ModalAnimationType? AnimationType { get; set; }
private bool ActivateFocusTrap { get; set; }
private bool UseFocusTrap { get; set; }
public bool UseCustomLayout { get; set; }
public FocusTrap? FocusTrap { get; set; }

Expand Down Expand Up @@ -114,7 +114,7 @@ private void ConfigureInstance()
DisableBackgroundCancel = SetDisableBackgroundCancel();
UseCustomLayout = SetUseCustomLayout();
OverlayCustomClass = SetOverlayCustomClass();
ActivateFocusTrap = SetActivateFocusTrap();
UseFocusTrap = SetUseFocusTrap();
OverlayAnimationClass = SetAnimationClass();
Parent.OnModalClosed += AttemptFocus;
}
Expand Down Expand Up @@ -300,13 +300,13 @@ private string SetOverlayCustomClass()
return string.Empty;
}

private bool SetActivateFocusTrap()
private bool SetUseFocusTrap()
{
if (Options.ActivateFocusTrap.HasValue)
return Options.ActivateFocusTrap.Value;
if (Options.UseFocusTrap.HasValue)
return Options.UseFocusTrap.Value;

if (GlobalModalOptions.ActivateFocusTrap.HasValue)
return GlobalModalOptions.ActivateFocusTrap.Value;
if (GlobalModalOptions.UseFocusTrap.HasValue)
return GlobalModalOptions.UseFocusTrap.Value;

return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Blazored.Modal/CascadingBlazoredModal.razor
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
OverlayCustomClass="@OverlayCustomClass"
Size="@Size"
SizeCustomClass="@SizeCustomClass"
ActivateFocusTrap="@ActivateFocusTrap"/>
UseFocusTrap="@UseFocusTrap"/>
@ChildContent
</CascadingValue>

Expand All @@ -28,7 +28,7 @@
[Parameter] public bool? UseCustomLayout { get; set; }
[Parameter] public string? OverlayCustomClass { get; set; }
[Parameter] public bool? ContentScrollable { get; set; }
[Parameter] public bool? ActivateFocusTrap { get; set; }
[Parameter] public bool? UseFocusTrap { get; set; }
[Parameter] public string? PositionCustomClass { get; set; }
[Parameter] public string? SizeCustomClass { get; set; }
}
2 changes: 1 addition & 1 deletion src/Blazored.Modal/Configuration/ModalOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ public class ModalOptions
public bool? HideCloseButton { get; set; }
public ModalAnimationType? AnimationType { get; set; }
public bool? UseCustomLayout { get; set; }
public bool? ActivateFocusTrap { get; set; }
public bool? UseFocusTrap { get; set; }
}