Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
16 changes: 8 additions & 8 deletions src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
@namespace BootstrapBlazor.Components
@inherits BootstrapComponentBase

<CascadingValue Value=this>
<nav @attributes="@AdditionalAttributes" aria-label="breadcrumb">
<ol class="breadcrumb">
<nav @attributes="@AdditionalAttributes" aria-label="breadcrumb">
<ol class="breadcrumb">
<CascadingValue Value="this" IsFixed="true">
@foreach (var item in Value)
{
@RenderItem(item)
}
</ol>
</nav>
</CascadingValue>
</CascadingValue>
</ol>
</nav>

@code {
RenderFragment<BreadcrumbItem> RenderItem => item =>
@<li class="@GetItemClassName(item)" aria-current="@CurrentPage(item)">
@<li class="@GetItemClassString(item)">
@if (!string.IsNullOrEmpty(item.Url))
{
<a href="@item.Url">@item.Text</a>
Expand All @@ -24,4 +24,4 @@
@item.Text
}
</li>;
}
}
17 changes: 13 additions & 4 deletions src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,20 @@ public sealed partial class Breadcrumb
/// 获得/设置 数据集
/// </summary>
[Parameter]
public IEnumerable<BreadcrumbItem> Value { get; set; } = Enumerable.Empty<BreadcrumbItem>();
[NotNull]
public IEnumerable<BreadcrumbItem>? Value { get; set; }

private string? GetItemClassName(BreadcrumbItem item) => CssBuilder.Default("breadcrumb-item")
private static string? GetItemClassString(BreadcrumbItem item) => CssBuilder.Default("breadcrumb-item")
.AddClass(item.CssClass)
.Build();

private string? CurrentPage(BreadcrumbItem item) => CssBuilder.Default()
.Build();
/// <summary>
/// <inheritdoc/>
/// </summary>
protected override void OnParametersSet()
{
base.OnParametersSet();

Value ??= [];
}
}
25 changes: 11 additions & 14 deletions src/BootstrapBlazor/Components/Breadcrumb/BreadcrumbItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,25 @@
namespace BootstrapBlazor.Components;

/// <summary>
/// BreadcrumbItem 实体类
/// 构造函数
/// </summary>
public class BreadcrumbItem
/// <param name="text"></param>
/// <param name="url"></param>
/// <param name="cssClass"></param>
public class BreadcrumbItem(string text, string? url = null, string? cssClass = null)
{
/// <summary>
/// 获得/设置 导航地址
/// 获得/设置 显示文字
/// </summary>
public string? Url { get; }
public string Text { get; } = text;

/// <summary>
/// 获得/设置 显示文字
/// 获得/设置 导航地址
/// </summary>
public string Text { get; }
public string? Url { get; } = url;

/// <summary>
/// 构造函数
/// 获得/设置 样式名称
/// </summary>
/// <param name="text"></param>
/// <param name="url"></param>
public BreadcrumbItem(string text, string? url = null)
{
Text = text;
Url = url;
}
public string? CssClass { get; } = cssClass;
}
4 changes: 1 addition & 3 deletions src/BootstrapBlazor/Components/Button/Button.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ public partial class Button : ButtonBase
protected ElementReference ButtonElement { get; set; }

/// <summary>
/// OnAfterRenderAsync 方法
/// <inheritdoc/>
/// </summary>
/// <param name="firstRender"></param>
/// <returns></returns>
protected override async Task OnAfterRenderAsync(bool firstRender)
{
await base.OnAfterRenderAsync(firstRender);
Expand Down
10 changes: 9 additions & 1 deletion test/UnitTest/Components/BreadcrumbsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ public void ButtonStyle_Ok()
var DataSource = new List<BreadcrumbItem>
{
new("Library"),
new("Data")
new("Data", "", "cssClass")
};

var cut = Context.RenderComponent<Breadcrumb>(pb =>
{
pb.Add(b => b.Value, DataSource);
});
Assert.Contains("Library", cut.Markup);
Assert.Contains("class=\"breadcrumb-item cssClass\"", cut.Markup);
Assert.DoesNotContain("href", cut.Markup);

DataSource.Add(new BreadcrumbItem("Home", "https://www.blazor.zone/"));
Expand All @@ -35,5 +36,12 @@ public void ButtonStyle_Ok()
{
pb.Add(b => b.AdditionalAttributes, new Dictionary<string, object>() { ["tag"] = "tagok" });
});
cut.Contains("tag=\"tagok\"");

cut.SetParametersAndRender(pb =>
{
pb.Add(b => b.Value, null);
});
Assert.DoesNotContain("li", cut.Markup);
}
}
Loading