Added possibility to define custom close icon

Blazored · Jul 13, 2021 · afb91ae · afb91ae
1 parent 088f348
commit afb91ae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/Blazored.Toast/BlazoredToast.razor b/src/Blazored.Toast/BlazoredToast.razor
@@ -21,10 +21,17 @@
             <h5 class="blazored-toast-heading">@ToastSettings.Heading</h5>
             <button class="blazored-toast-close" @onclick=@Close>
                 <i aria-label="icon: close" class="blazored-toast-close-icon">
-                    <svg viewBox="64 64 896 896" focusable="false" width="1em" height="1em" fill="currentColor" aria-hidden="true">
-                        <path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z">
-                        </path>
-                    </svg>
+                    @if (CloseButtonContent != null)
+                    {
+                        @CloseButtonContent
+                    }
+                    else
+                    {
+                        <svg viewBox="64 64 896 896" focusable="false" width="1em" height="1em" fill="currentColor" aria-hidden="true">
+                            <path d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z">
+                            </path>
+                        </svg>
+                    }
                 </i>
             </button>
         </div>

diff --git a/src/Blazored.Toast/BlazoredToast.razor.cs b/src/Blazored.Toast/BlazoredToast.razor.cs
@@ -12,6 +12,7 @@ public partial class BlazoredToast : IDisposable
         [Parameter] public Guid ToastId { get; set; }
         [Parameter] public ToastSettings ToastSettings { get; set; }
         [Parameter] public int Timeout { get; set; }
+        private RenderFragment CloseButtonContent => ToastsContainer.CloseButtonContent;
 
         private CountdownTimer _countdownTimer;
         private int _progress = 100;
@@ -20,7 +21,7 @@ protected override void OnInitialized()
         {
             _countdownTimer = new CountdownTimer(Timeout);
             _countdownTimer.OnTick += CalculateProgress;
-            _countdownTimer.OnElapsed += () => { Close(); };
+            _countdownTimer.OnElapsed += Close;
             _countdownTimer.Start();
 
         }

diff --git a/src/Blazored.Toast/BlazoredToasts.razor b/src/Blazored.Toast/BlazoredToasts.razor
@@ -1,7 +1,7 @@
 @if (ToastList.Any())
 {
     <div class="blazored-toast-container @PositionClass">
-        <CascadingValue Value=this>
+        <CascadingValue Value=this IsFixed="true">
             @foreach (var toast in ToastList.OrderBy(x=>x.TimeStamp))
             {
                 <BlazoredToast @key="toast" ToastSettings="toast.ToastSettings" ToastId="toast.Id" Timeout="Timeout"/>

diff --git a/src/Blazored.Toast/BlazoredToasts.razor.cs b/src/Blazored.Toast/BlazoredToasts.razor.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Timers;
+using Microsoft.AspNetCore.Components.Rendering;
 
 namespace Blazored.Toast
 {
@@ -29,6 +30,7 @@ public partial class BlazoredToasts
         [Parameter] public int Timeout { get; set; } = 5;
         [Parameter] public bool RemoveToastsOnNavigation { get; set; }
         [Parameter] public bool ShowProgressBar { get; set; }
+        [Parameter] public RenderFragment CloseButtonContent { get; set; }
 
         private string PositionClass { get; set; } = string.Empty;
         internal List<ToastInstance> ToastList { get; set; } = new List<ToastInstance>();