From e654d66cf3316701614af204fe00a2f069c018d2 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 2 Feb 2025 11:08:29 +0800
Subject: [PATCH] feat(Toast): support DialogCloseButton component (#5276)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 增加 AddStyle 方法

* test: 增加单元测试

* refactor: use AddStyle method

* doc: 重构代码

* refactor: 重构代码

* Revert "refactor: 重构代码"

This reverts commit 37653dc4f1752f41e20b34745cda383c295fdcde.

* feat: 增加 BootstrapLabelSetting 组件

* feat: 增加 LabelWidth 参数

* feat: 实现 LabelWidth 逻辑

* test: 增加单元测试

* doc: 移除 IsHtml 参数说明

* doc: 更新 Content 说明文档

* feat: 增加级联参数
---
 .../Components/Samples/Toasts.razor.cs         |  8 --------
 src/BootstrapBlazor.Server/Locales/en-US.json  |  2 +-
 src/BootstrapBlazor.Server/Locales/zh-CN.json  |  2 +-
 .../Components/Toast/Toast.razor               | 18 ++++++++++--------
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Toasts.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Toasts.razor.cs
index c4176703cbf..f9154087c81 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Toasts.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Toasts.razor.cs
@@ -197,14 +197,6 @@ private AttributeItem[] GetAttributes() =>
             DefaultValue = "true"
         },
         new()
-        {
-            Name = "IsHtml",
-            Description = Localizer["ToastsAttrIsHtml"],
-            Type = "boolean",
-            ValueList = "",
-            DefaultValue = "false"
-        },
-        new()
         {
             Name = "Placement",
             Description = Localizer["ToastsAttrPlacement"],
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
index cc8885e1e3b..f9025b8a899 100644
--- a/src/BootstrapBlazor.Server/Locales/en-US.json
+++ b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -152,7 +152,7 @@
     "ToastsHeaderTemplateIntro": "set <code>HeaderTemplate</code> custom the header content",
     "ToastsAttrCategory": "Toast type",
     "ToastsAttrTitle": "Toast title",
-    "ToastsAttrContent": "Toast content",
+    "ToastsAttrContent": "Toast content support HTML",
     "ToastsAttrDelay": "Auto hide interval",
     "ToastsAttrIsAutoHide": "Whether to automatically hide",
     "ToastsAttrIsHtml": "Whether the content contains Html code",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
index 48b48103b02..ad47873db8b 100644
--- a/src/BootstrapBlazor.Server/Locales/zh-CN.json
+++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -152,7 +152,7 @@
     "ToastsHeaderTemplateIntro": "通过设置 <code>HeaderTemplate</code> 自定义标题栏内容",
     "ToastsAttrCategory": "Toast 类型",
     "ToastsAttrTitle": "Toast 标题",
-    "ToastsAttrContent": "Toast 内容",
+    "ToastsAttrContent": "Toast 内容，支持 Html 标签",
     "ToastsAttrDelay": "自动关闭时间",
     "ToastsAttrIsAutoHide": "是否自动关闭提示框",
     "ToastsAttrIsHtml": "内容是否包含 HTML",
diff --git a/src/BootstrapBlazor/Components/Toast/Toast.razor b/src/BootstrapBlazor/Components/Toast/Toast.razor
index a78feeef36c..d85d7e5ca52 100644
--- a/src/BootstrapBlazor/Components/Toast/Toast.razor
+++ b/src/BootstrapBlazor/Components/Toast/Toast.razor
@@ -24,14 +24,16 @@
         </div>
     }
     <div class="toast-body">
-        @if (Options.ChildContent != null)
-        {
-            @Options.ChildContent
-        }
-        else if (!string.IsNullOrEmpty(Options.Content))
-        {
-            @((MarkupString)Options.Content)
-        }
+        <CascadingValue Value="Close" IsFixed="true">
+            @if (Options.ChildContent != null)
+            {
+                @Options.ChildContent
+            }
+            else if (!string.IsNullOrEmpty(Options.Content))
+            {
+                @((MarkupString)Options.Content)
+            }
+        </CascadingValue>
     </div>
     <div class="@ProgressClass"></div>
 </div>