From ab600d4a2c8792b5cae6772765596999dc0a03cb Mon Sep 17 00:00:00 2001
From: Chris Sainty <chris@chrissainty.com>
Date: Sat, 17 Sep 2022 14:54:08 +0100
Subject: [PATCH] Renamed ActivateFocusTrap to UseFocusTrap

---
 src/Blazored.Modal/BlazoredModal.razor            |  4 ++--
 src/Blazored.Modal/BlazoredModalInstance.razor    |  2 +-
 src/Blazored.Modal/BlazoredModalInstance.razor.cs | 14 +++++++-------
 src/Blazored.Modal/CascadingBlazoredModal.razor   |  4 ++--
 src/Blazored.Modal/Configuration/ModalOptions.cs  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Blazored.Modal/BlazoredModal.razor b/src/Blazored.Modal/BlazoredModal.razor
index 3e668ed1..cbb7413e 100644
--- a/src/Blazored.Modal/BlazoredModal.razor
+++ b/src/Blazored.Modal/BlazoredModal.razor
@@ -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();
@@ -60,7 +60,7 @@
         _globalModalOptions.OverlayCustomClass = OverlayCustomClass;
 
         _globalModalOptions.UseCustomLayout = UseCustomLayout;
-        _globalModalOptions.ActivateFocusTrap = ActivateFocusTrap;
+        _globalModalOptions.UseFocusTrap = UseFocusTrap;
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
diff --git a/src/Blazored.Modal/BlazoredModalInstance.razor b/src/Blazored.Modal/BlazoredModalInstance.razor
index 494208a0..6061744d 100644
--- a/src/Blazored.Modal/BlazoredModalInstance.razor
+++ b/src/Blazored.Modal/BlazoredModalInstance.razor
@@ -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)
                 {
diff --git a/src/Blazored.Modal/BlazoredModalInstance.razor.cs b/src/Blazored.Modal/BlazoredModalInstance.razor.cs
index 1bd0c0b1..7b833c92 100644
--- a/src/Blazored.Modal/BlazoredModalInstance.razor.cs
+++ b/src/Blazored.Modal/BlazoredModalInstance.razor.cs
@@ -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; }
 
@@ -114,7 +114,7 @@ private void ConfigureInstance()
         DisableBackgroundCancel = SetDisableBackgroundCancel();
         UseCustomLayout = SetUseCustomLayout();
         OverlayCustomClass = SetOverlayCustomClass();
-        ActivateFocusTrap = SetActivateFocusTrap();
+        UseFocusTrap = SetUseFocusTrap();
         OverlayAnimationClass = SetAnimationClass();
         Parent.OnModalClosed += AttemptFocus;
     }
@@ -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;
     }
diff --git a/src/Blazored.Modal/CascadingBlazoredModal.razor b/src/Blazored.Modal/CascadingBlazoredModal.razor
index 15357ad6..f66256fe 100644
--- a/src/Blazored.Modal/CascadingBlazoredModal.razor
+++ b/src/Blazored.Modal/CascadingBlazoredModal.razor
@@ -12,7 +12,7 @@
                    OverlayCustomClass="@OverlayCustomClass"
                    Size="@Size"
                    SizeCustomClass="@SizeCustomClass"
-                   ActivateFocusTrap="@ActivateFocusTrap"/>
+                   UseFocusTrap="@UseFocusTrap"/>
     @ChildContent
 </CascadingValue>
 
@@ -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; }
 }
diff --git a/src/Blazored.Modal/Configuration/ModalOptions.cs b/src/Blazored.Modal/Configuration/ModalOptions.cs
index 702284fe..5e687bba 100644
--- a/src/Blazored.Modal/Configuration/ModalOptions.cs
+++ b/src/Blazored.Modal/Configuration/ModalOptions.cs
@@ -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; }
 }
\ No newline at end of file