From 59ed630411bea9053e97f18ec30191500a64539e Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 26 Jun 2025 08:43:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20tabs-body-?= =?UTF-8?q?content-wrap=20=E6=81=A2=E5=A4=8D=E8=80=81=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Tab/TabItemContent.cs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/BootstrapBlazor/Components/Tab/TabItemContent.cs b/src/BootstrapBlazor/Components/Tab/TabItemContent.cs index 72bf49a2232..49d981eb3ef 100644 --- a/src/BootstrapBlazor/Components/Tab/TabItemContent.cs +++ b/src/BootstrapBlazor/Components/Tab/TabItemContent.cs @@ -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(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); @@ -76,7 +68,7 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder => return Task.CompletedTask; })); builder.CloseComponent(); - }; + } /// /// Render method From fc40eb2a24da66f3f3ef7b84fd07b2043c01b5c0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 26 Jun 2025 08:43:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?revert:=20=E6=81=A2=E5=A4=8D=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/TabTest.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/UnitTest/Components/TabTest.cs b/test/UnitTest/Components/TabTest.cs index fb18a2cb51f..a34a83185bf 100644 --- a/test/UnitTest/Components/TabTest.cs +++ b/test/UnitTest/Components/TabTest.cs @@ -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] @@ -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(); @@ -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); @@ -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)); From 5b9877ee93fe73eab0d4c81564ac6fa8be86f078 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 26 Jun 2025 08:47:16 +0800 Subject: [PATCH 3/3] chore: bump version 9.8.0-beta05 Co-Authored-By: Kim Kokholm --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 536c74f936a..96248a6ef6e 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.8.0-beta04 + 9.8.0-beta05