Merge branch 'main' of https://github.com/dotnetcore/BootstrapBlazor

Author: actions-user

src/BootstrapBlazor/Components/Toolbar/Toolbar.razor

@@ -2,7 +2,5 @@
 @inherits IdComponentBase
 
 <div @attributes="AdditionalAttributes" class="@ClassString" role="toolbar" aria-label="toolbar" style="@StyleString">
-    <CascadingValue Value="this" IsFixed="true">
-        @ChildContent
-    </CascadingValue>
+    @ChildContent
 </div>

src/BootstrapBlazor/Components/Toolbar/Toolbar.razor.cs

@@ -30,16 +30,4 @@ public partial class Toolbar
         .AddStyle("flex-wrap", "wrap", IsWrap)
         .AddStyleFromAttributes(AdditionalAttributes)
         .Build();
-
-    private readonly List<ComponentBase> _components = [];
-
-    /// <summary>
-    /// 添加按钮到工具栏方法
-    /// </summary>
-    public void Add(ComponentBase component) => _components.Add(component);
-
-    /// <summary>
-    /// 移除按钮到工具栏方法
-    /// </summary>
-    public void Remove(ComponentBase component) => _components.Remove(component);
 }

src/BootstrapBlazor/Components/Toolbar/ToolbarButtonGroup.razor

@@ -1,5 +1,6 @@
 @namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
 
-<div class="bb-toolbar-group btn-group">
+<div  @attributes="AdditionalAttributes" class="@ClassString">
     @ChildContent
 </div>

src/BootstrapBlazor/Components/Toolbar/ToolbarButtonGroup.razor.cs

@@ -8,43 +8,15 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// ToolbarGroup 组件用于在工具栏中添加一组按钮
 /// </summary>
-public partial class ToolbarButtonGroup : IAsyncDisposable
+public partial class ToolbarButtonGroup
 {
-    [CascadingParameter]
-    private Toolbar? Toolbar { get; set; }
-
     /// <summary>
     /// 获得/设置 子组件模板
     /// </summary>
     [Parameter]
     public RenderFragment? ChildContent { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-
-        Toolbar?.Add(this);
-    }
-
-    private ValueTask DisposeAsync(bool disposing)
-    {
-        if (disposing)
-        {
-            Toolbar?.Remove(this);
-        }
-
-        return ValueTask.CompletedTask;
-    }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public async ValueTask DisposeAsync()
-    {
-        await DisposeAsync(true);
-        GC.SuppressFinalize(this);
-    }
+    private string? ClassString => CssBuilder.Default("bb-toolbar-group btn-group")
+        .AddClassFromAttributes(AdditionalAttributes)
+        .Build();
 }

src/BootstrapBlazor/Components/Toolbar/ToolbarItem.razor

@@ -1,5 +1,6 @@
 @namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
 
-<div class="bb-toolbar-item">
+<div @attributes="AdditionalAttributes" class="@ClassString">
     @ChildContent
 </div>

src/BootstrapBlazor/Components/Toolbar/ToolbarItem.razor.cs

@@ -8,12 +8,15 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// ToolbarItem 组件用于在工具栏中添加子组件
 /// </summary>
-public partial class ToolbarItem : ComponentBase
+public partial class ToolbarItem
 {
     /// <summary>
     /// 获得/设置 子组件模板
     /// </summary>
     [Parameter]
     public RenderFragment? ChildContent { get; set; }
-}
 
+    private string? ClassString => CssBuilder.Default("bb-toolbar-item")
+        .AddClassFromAttributes(AdditionalAttributes)
+        .Build();
+}

src/BootstrapBlazor/Components/Toolbar/ToolbarSeparator.razor

@@ -1,3 +1,4 @@
 @namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
 
-<div class="bb-toolbar-vr vr"></div>
+<div @attributes="AdditionalAttributes" class="@ClassString"></div>

src/BootstrapBlazor/Components/Toolbar/ToolbarSeparator.razor.cs

@@ -10,5 +10,7 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public partial class ToolbarSeparator
 {
+    private string? ClassString => CssBuilder.Default("bb-toolbar-vr vr")
+        .AddClassFromAttributes(AdditionalAttributes)
+        .Build();
 }
-

src/BootstrapBlazor/Components/Toolbar/ToolbarSpace.razor

@@ -1,3 +1,4 @@
 @namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
 
-<div class="bb-toolbar-space"></div>
+<div @attributes="AdditionalAttributes" class="@ClassString"></div>

src/BootstrapBlazor/Components/Toolbar/ToolbarSpace.razor.cs

@@ -10,5 +10,8 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public partial class ToolbarSpace
 {
+    private string? ClassString => CssBuilder.Default("bb-toolbar-space")
+        .AddClassFromAttributes(AdditionalAttributes)
+        .Build();
 }