Skip to content

refactor(Tab): remove tabs-body-content-wrap html node #6310

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 3 commits into from
Jun 26, 2025
Merged

refactor(Tab): remove tabs-body-content-wrap html node #6310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59ed630
refactor: 移除 tabs-body-content-wrap 恢复老版本结构
ArgoZhang Jun 26, 2025
fc40eb2
revert: 恢复单元测试
ArgoZhang Jun 26, 2025
5b9877e
chore: bump version 9.8.0-beta05
ArgoZhang Jun 26, 2025
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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.8.0-beta04</Version>
<Version>9.8.0-beta05</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
14 changes: 3 additions & 11 deletions src/BootstrapBlazor/Components/Tab/TabItemContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,10 @@ private void RenderContent()
private Guid _key = Guid.NewGuid();

private void BuildRenderTree(RenderTreeBuilder builder)
{
builder.OpenElement(0, "div");
builder.SetKey(_key);
builder.AddAttribute(5, "class", "tabs-body-content-wrap");
builder.AddContent(10, RenderItemContent(Item.ChildContent));
builder.CloseElement();
}

private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
{
builder.OpenComponent<ErrorLogger>(0);
builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), content);
builder.SetKey(_key);
builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), Item.ChildContent);

var enableErrorLogger = TabSet.EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
builder.AddAttribute(2, nameof(ErrorLogger.EnableErrorLogger), enableErrorLogger);
Expand All @@ -76,7 +68,7 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
return Task.CompletedTask;
}));
builder.CloseComponent();
};
}

/// <summary>
/// Render method
Expand Down
16 changes: 8 additions & 8 deletions test/UnitTest/Components/TabTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,20 +191,20 @@ public async Task IsLoopSwitchTabItem_Ok()
pb.Add(a => a.ChildContent, "Tab2-Content");
});
});
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);

// Click Prev
var button = cut.Find(".nav-link-bar.left .nav-link-bar-button");
await cut.InvokeAsync(() => button.Click());
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);

// Click Next
button = cut.Find(".nav-link-bar.right .nav-link-bar-button");
await cut.InvokeAsync(() => button.Click());
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);

await cut.InvokeAsync(() => button.Click());
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
}

[Fact]
Expand Down Expand Up @@ -240,7 +240,7 @@ public void ClickTab_Ok()
pb.Add(a => a.ChildContent, "Tab2-Content");
});
});
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);

// Click TabItem
cut.Find(".tabs-item").Click();
Expand All @@ -251,14 +251,14 @@ public void ClickTab_Ok()
button.Click();
button.Click();
button.Click();
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);

// Click Next
button = cut.Find(".nav-link-bar.right .nav-link-bar-button");
button.Click();
button.Click();
button.Click();
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);

// Close
Assert.Null(closedItem);
Expand Down Expand Up @@ -342,7 +342,7 @@ public void AddTab_Ok()

cut.InvokeAsync(() => tab.AddTab("/", "Tab2", "fa-solid fa-font-awesome", false, true));
cut.InvokeAsync(() => tab.CloseOtherTabs());
Assert.Equal("Tab1-Body", cut.Find(".tabs-body-content .tabs-body-content-wrap").InnerHtml);
Assert.Equal("Tab1-Body", cut.Find(".tabs-body-content").InnerHtml);

// NotFound
cut.InvokeAsync(() => tab.AddTab("/Test", "Tab3", "fa-solid fa-font-awesome", false, true));
Expand Down