Skip to content

Commit db34239

Browse files
ArgoZhangHarpunDK
andauthored
refactor(Tab): remove tabs-body-content-wrap html node (#6310)
* refactor: 移除 tabs-body-content-wrap 恢复老版本结构 * revert: 恢复单元测试 * chore: bump version 9.8.0-beta05 Co-Authored-By: Kim Kokholm <[email protected]> --------- Co-authored-by: Kim Kokholm <[email protected]>
1 parent 560bb21 commit db34239

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

src/BootstrapBlazor/BootstrapBlazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.8.0-beta04</Version>
4+
<Version>9.8.0-beta05</Version>
55
</PropertyGroup>
66

77
<ItemGroup>

src/BootstrapBlazor/Components/Tab/TabItemContent.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,10 @@ private void RenderContent()
5050
private Guid _key = Guid.NewGuid();
5151

5252
private void BuildRenderTree(RenderTreeBuilder builder)
53-
{
54-
builder.OpenElement(0, "div");
55-
builder.SetKey(_key);
56-
builder.AddAttribute(5, "class", "tabs-body-content-wrap");
57-
builder.AddContent(10, RenderItemContent(Item.ChildContent));
58-
builder.CloseElement();
59-
}
60-
61-
private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
6253
{
6354
builder.OpenComponent<ErrorLogger>(0);
64-
builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), content);
55+
builder.SetKey(_key);
56+
builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), Item.ChildContent);
6557

6658
var enableErrorLogger = TabSet.EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
6759
builder.AddAttribute(2, nameof(ErrorLogger.EnableErrorLogger), enableErrorLogger);
@@ -76,7 +68,7 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
7668
return Task.CompletedTask;
7769
}));
7870
builder.CloseComponent();
79-
};
71+
}
8072

8173
/// <summary>
8274
/// Render method

test/UnitTest/Components/TabTest.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,20 +191,20 @@ public async Task IsLoopSwitchTabItem_Ok()
191191
pb.Add(a => a.ChildContent, "Tab2-Content");
192192
});
193193
});
194-
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
194+
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
195195

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

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

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

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

245245
// Click TabItem
246246
cut.Find(".tabs-item").Click();
@@ -251,14 +251,14 @@ public void ClickTab_Ok()
251251
button.Click();
252252
button.Click();
253253
button.Click();
254-
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
254+
Assert.Equal("Tab1-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
255255

256256
// Click Next
257257
button = cut.Find(".nav-link-bar.right .nav-link-bar-button");
258258
button.Click();
259259
button.Click();
260260
button.Click();
261-
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
261+
Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
262262

263263
// Close
264264
Assert.Null(closedItem);
@@ -342,7 +342,7 @@ public void AddTab_Ok()
342342

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

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

0 commit comments

Comments
 (0)