Skip to content

refactor(Toolbar): remove cascade value #6575

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 8, 2025
Merged

refactor(Toolbar): remove cascade value #6575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 3 deletions src/BootstrapBlazor/Components/Toolbar/Toolbar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 0 additions & 12 deletions src/BootstrapBlazor/Components/Toolbar/Toolbar.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
34 changes: 1 addition & 33 deletions src/BootstrapBlazor/Components/Toolbar/ToolbarButtonGroup.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ namespace BootstrapBlazor.Components;
/// <summary>
/// ToolbarGroup 组件用于在工具栏中添加一组按钮
/// </summary>
public partial class ToolbarButtonGroup : IAsyncDisposable
public partial class ToolbarButtonGroup
{
[CascadingParameter]
private Toolbar? Toolbar { get; set; }

/// <summary>
/// 获得/设置 子组件模板
/// </summary>
Expand All @@ -22,33 +19,4 @@ public partial class ToolbarButtonGroup : IAsyncDisposable
private string? ClassString => CssBuilder.Default("bb-toolbar-group btn-group")
.AddClassFromAttributes(AdditionalAttributes)
.Build();

/// <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);
}
}
Loading