From 36940fdd053412909b41fe373255979bd2560273 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 8 May 2025 14:50:01 -0700 Subject: [PATCH 1/7] =?UTF-8?q?style:=20=E6=9B=B4=E6=96=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/FullScreen/FullScreenButton.razor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss index db5692c7a8f..3fdaefd12d9 100644 --- a/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss +++ b/src/BootstrapBlazor/Components/FullScreen/FullScreenButton.razor.scss @@ -6,7 +6,7 @@ display: inline-block; } -:not(:root):fullscreen { +:fullscreen { .bb-fs-on { display: inline-block; } From 01c6e572c320cb5e40ae2b6916b7c06d5b5e4cdf Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 8 May 2025 14:50:23 -0700 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=20Id=20=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Tab/Tab.razor | 5 ++--- src/BootstrapBlazor/Components/Tab/Tab.razor.cs | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor index c029317034c..b7b4796c7c7 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor @@ -87,8 +87,7 @@ else @if (ShowFullscreenToolbarButton) {
-
@@ -194,7 +193,7 @@ else { @if (ShowFullScreen && item.ShowFullScreen) { - + } @if (ShowClose && item.Closable) { diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs index b7ddb2237a3..49fd1d762e8 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs @@ -1059,8 +1059,6 @@ public async Task DragItemCallback(int originIndex, int currentIndex) } } - private string GetIdByTabItem(TabItem item) => ComponentIdGenerator.Generate(item); - private async Task OnRefreshAsync() { // refresh the active tab item @@ -1120,10 +1118,7 @@ private Task OnCloseAll(ContextMenuItem item, object? context) private async Task OnFullScreen(ContextMenuItem item, object? context) { - if (context is TabItem tabItem) - { - await FullScreenService.ToggleById(GetIdByTabItem(tabItem)); - } + await FullScreenService.ToggleById(); } private async Task OnContextMenu(MouseEventArgs e, TabItem item) From 6e1a67990071f28bbb10677d255e9c72ee045f9f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 8 May 2025 14:53:03 -0700 Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs b/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs index 22dacc58911..308a7b95d6a 100644 --- a/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs +++ b/src/BootstrapBlazor/Extensions/FullScreenServiceExtensions.cs @@ -24,5 +24,5 @@ public static class FullScreenServiceExtensions /// /// /// - public static Task ToggleById(this FullScreenService service, string id) => service.Toggle(new() { Id = id }); + public static Task ToggleById(this FullScreenService service, string? id = null) => service.Toggle(new() { Id = id }); } From c6375aa861d196e72a909310d52f8def7901d940 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 8 May 2025 14:53:10 -0700 Subject: [PATCH 4/7] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=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/Services/FullScreenServiceTest.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/UnitTest/Services/FullScreenServiceTest.cs b/test/UnitTest/Services/FullScreenServiceTest.cs index 1068c8aab8b..b984d1a3f92 100644 --- a/test/UnitTest/Services/FullScreenServiceTest.cs +++ b/test/UnitTest/Services/FullScreenServiceTest.cs @@ -58,14 +58,13 @@ public async Task ToggleById_Ok() var cut = Context.Render(builder => { builder.OpenElement(0, "div"); - builder.AddAttribute(1, "id", "test-id"); builder.CloseElement(); builder.OpenComponent(0); builder.CloseComponent(); }); var fs = cut.FindComponent(); - await cut.InvokeAsync(() => fs.Instance.TestById("test-id")); + await cut.InvokeAsync(() => fs.Instance.TestById()); } [Fact] @@ -105,7 +104,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder) public Task Test(ElementReference ele) => FullScreenService.ToggleByElement(ele); - public Task TestById(string id) => FullScreenService.ToggleById(id); + public Task TestById() => FullScreenService.ToggleById(); public Task Toggle() => FullScreenService.Toggle(); } From fd58860693256b2d3a3203b9f95ffc0ebe4a3906 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 8 May 2025 14:59:26 -0700 Subject: [PATCH 5/7] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=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/Services/FullScreenServiceTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/UnitTest/Services/FullScreenServiceTest.cs b/test/UnitTest/Services/FullScreenServiceTest.cs index b984d1a3f92..58ab858eb72 100644 --- a/test/UnitTest/Services/FullScreenServiceTest.cs +++ b/test/UnitTest/Services/FullScreenServiceTest.cs @@ -58,13 +58,14 @@ public async Task ToggleById_Ok() var cut = Context.Render(builder => { builder.OpenElement(0, "div"); + builder.AddAttribute(1, "id", "test-id"); builder.CloseElement(); builder.OpenComponent(0); builder.CloseComponent(); }); var fs = cut.FindComponent(); - await cut.InvokeAsync(() => fs.Instance.TestById()); + await cut.InvokeAsync(() => fs.Instance.TestById("test-id")); } [Fact] From 76c4badd6a78746a304b1fe196af8b73edf82b53 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 8 May 2025 15:07:05 -0700 Subject: [PATCH 6/7] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=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/Services/FullScreenServiceTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/UnitTest/Services/FullScreenServiceTest.cs b/test/UnitTest/Services/FullScreenServiceTest.cs index 58ab858eb72..1068c8aab8b 100644 --- a/test/UnitTest/Services/FullScreenServiceTest.cs +++ b/test/UnitTest/Services/FullScreenServiceTest.cs @@ -105,7 +105,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder) public Task Test(ElementReference ele) => FullScreenService.ToggleByElement(ele); - public Task TestById() => FullScreenService.ToggleById(); + public Task TestById(string id) => FullScreenService.ToggleById(id); public Task Toggle() => FullScreenService.Toggle(); } From f3aeaf51d24b5de6f5cd66fe2cb0e28cda8604ed Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 8 May 2025 15:17:39 -0700 Subject: [PATCH 7/7] chore: bump version 9.6.1 Co-Authored-By: UnicronOrigin <49175555+unicronorigin@users.noreply.github.com> --- 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 d7b84e4d7b4..18b67acd46e 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1-beta03 + 9.6.1