From 89a1bb17258d9e788bcbb57e4dc50bdca137af88 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 23 Mar 2025 11:35:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Tab/Tab.razor    |  4 +++-
 src/BootstrapBlazor/Components/Tab/Tab.razor.cs | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor
index 37bcab00101..8a67edeae58 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor
@@ -166,7 +166,9 @@ else
 
     RenderFragment RenderHeaderItem(TabItem item) =>
     @<div @key="@item" class="@GetItemWrapClassString(item)" draggable="@DraggableString">
-        <a href="@item.Url" role="tab" tabindex="-1" class="@GetClassString(item)" @onclick="@(() => OnClickTabItem(item))" @onclick:preventDefault="@(!ClickTabToNavigation)">
+        <a href="@item.Url" role="tab" tabindex="-1" class="@GetClassString(item)"
+           @oncontextmenu="e => OnContextMenu(e, item)" @oncontextmenu:preventDefault="IsPreventDefault"
+           @onclick="@(() => OnClickTabItem(item))" @onclick:preventDefault="@(!ClickTabToNavigation)">
             @RenderHeaderItemContent(item)
         </a>
         @if (TabStyle == TabStyle.Chrome)
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs
index 84a50c17829..33aebffd200 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.Localization;
 using System.Collections.Concurrent;
 using System.Reflection;
@@ -370,6 +371,9 @@ public partial class Tab : IHandlerException
     [Inject, NotNull]
     private DialogService? DialogService { get; set; }
 
+    [CascadingParameter]
+    private ContextMenuZone? ContextMenuZone { get; set; }
+
     private ConcurrentDictionary<TabItem, bool> LazyTabCache { get; } = new();
 
     private bool HandlerNavigation { get; set; }
@@ -382,6 +386,8 @@ public partial class Tab : IHandlerException
 
     private readonly ConcurrentDictionary<TabItem, TabItemContent> _cache = [];
 
+    private bool IsPreventDefault => ContextMenuZone != null;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -965,4 +971,12 @@ protected override async ValueTask DisposeAsync(bool disposing)
             ErrorLogger?.UnRegister(this);
         }
     }
+
+    private async Task OnContextMenu(MouseEventArgs e, TabItem item)
+    {
+        if (ContextMenuZone != null)
+        {
+            await ContextMenuZone.OnContextMenu(e, item);
+        }
+    }
 }

From 382aa3436554b5ed82916a09cbcff662976585e9 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 23 Mar 2025 11:35:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Tabs.razor             | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
index ee784ea03f7..cd121165018 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
@@ -496,6 +496,32 @@ private void Navigation()
     </Tab>
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["TabsContextMenuTitle"]" Introduction="@Localizer["TabsContextMenuIntro"]" Name="ContextMenu">
+    <ContextMenuZone>
+        <Tab IsCard="true" ShowClose="true" TabStyle="TabStyle.Chrome" ShowToolbar="true">
+            <TabItem Text="@Localizer["TabItem1Text"]" Icon="fa-solid fa-user">
+                <div>@Localizer["TabItem1Content"]</div>
+            </TabItem>
+            <TabItem Text="@Localizer["TabItem2Text"]" Icon="fa-solid fa-gauge-high">
+                <div>@Localizer["TabItem2Content"]</div>
+            </TabItem>
+            <TabItem Text="@Localizer["TabItem3Text"]" Icon="fa-solid fa-sitemap">
+                <div>@Localizer["TabItem3Content"]</div>
+            </TabItem>
+            <TabItem Text="@Localizer["TabItem4Text"]" Icon="fa-solid fa-building-columns">
+                <div>@Localizer["TabItem4Content"]</div>
+            </TabItem>
+        </Tab>
+        <ContextMenu>
+            <ContextMenuItem Icon="fa-solid fa-xmark" Text="关闭"></ContextMenuItem>
+            <ContextMenuItem Icon="fa-solid fa-left-right" Text="关闭其他"></ContextMenuItem>
+            <ContextMenuItem Icon="fa-solid fa-angle-left" Text="关闭左侧"></ContextMenuItem>
+            <ContextMenuItem Icon="fa-solid fa-angle-right" Text="关闭右侧"></ContextMenuItem>
+            <ContextMenuItem Icon="fa-solid fa-arrows-left-right-to-line" Text="关闭全部"></ContextMenuItem>
+        </ContextMenu>
+    </ContextMenuZone>
+</DemoBlock>
+
 <AttributeTable Items="@GetAttributes()" Title="@Localizer["AttTitle"]" />
 
 <MethodTable Items="@GetMethods()" Title="@Localizer["MethodTitle"]" />

From 1d0381ed2ac35534afa17471e317c577417d985d Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 23 Mar 2025 12:03:38 +0800
Subject: [PATCH 3/6] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Samples/Tabs.razor             | 10 +++----
 .../Components/Samples/Tabs.razor.cs          | 27 +++++++++++++++++++
 src/BootstrapBlazor.Server/Locales/en-US.json |  7 ++++-
 src/BootstrapBlazor.Server/Locales/zh-CN.json |  7 ++++-
 4 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
index cd121165018..4b1c93add90 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
@@ -498,7 +498,7 @@ private void Navigation()
 
 <DemoBlock Title="@Localizer["TabsContextMenuTitle"]" Introduction="@Localizer["TabsContextMenuIntro"]" Name="ContextMenu">
     <ContextMenuZone>
-        <Tab IsCard="true" ShowClose="true" TabStyle="TabStyle.Chrome" ShowToolbar="true">
+        <Tab IsCard="true" ShowClose="true" TabStyle="TabStyle.Chrome" ShowToolbar="true" @ref="_tab">
             <TabItem Text="@Localizer["TabItem1Text"]" Icon="fa-solid fa-user">
                 <div>@Localizer["TabItem1Content"]</div>
             </TabItem>
@@ -513,11 +513,9 @@ private void Navigation()
             </TabItem>
         </Tab>
         <ContextMenu>
-            <ContextMenuItem Icon="fa-solid fa-xmark" Text="关闭"></ContextMenuItem>
-            <ContextMenuItem Icon="fa-solid fa-left-right" Text="关闭其他"></ContextMenuItem>
-            <ContextMenuItem Icon="fa-solid fa-angle-left" Text="关闭左侧"></ContextMenuItem>
-            <ContextMenuItem Icon="fa-solid fa-angle-right" Text="关闭右侧"></ContextMenuItem>
-            <ContextMenuItem Icon="fa-solid fa-arrows-left-right-to-line" Text="关闭全部"></ContextMenuItem>
+            <ContextMenuItem Icon="fa-solid fa-xmark" Text="@Localizer["ContextClose"]" OnClick="OnClose"></ContextMenuItem>
+            <ContextMenuItem Icon="fa-solid fa-left-right" Text="@Localizer["ContextCloseOther"]" OnClick="OnCloseOther"></ContextMenuItem>
+            <ContextMenuItem Icon="fa-solid fa-arrows-left-right-to-line" Text="@Localizer["ContextCloseAll"]" OnClick="OnCloseAll"></ContextMenuItem>
         </ContextMenu>
     </ContextMenuZone>
 </DemoBlock>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs
index 451677d0dc0..77eb539f128 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tabs.razor.cs
@@ -171,6 +171,33 @@ private Task OnSetTitle(string text)
         return Task.CompletedTask;
     }
 
+    [NotNull]
+    private Tab? _tab = null;
+
+    private async Task OnClose(ContextMenuItem item, object? context)
+    {
+        if (context is TabItem tabItem)
+        {
+            await _tab.RemoveTab(tabItem);
+        }
+    }
+
+    private Task OnCloseOther(ContextMenuItem item, object? context)
+    {
+        if (context is TabItem tabItem)
+        {
+            _tab.ActiveTab(tabItem);
+        }
+        _tab.CloseOtherTabs();
+        return Task.CompletedTask;
+    }
+
+    private Task OnCloseAll(ContextMenuItem item, object? context)
+    {
+        _tab.CloseAllTabs();
+        return Task.CompletedTask;
+    }
+
     /// <summary>
     /// 获得属性方法
     /// </summary>
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
index 4704f1fb0bd..20eb4918929 100644
--- a/src/BootstrapBlazor.Server/Locales/en-US.json
+++ b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -2132,7 +2132,12 @@
     "AttributeRefreshToolbarButtonIcon": "Toolbar refresh button icon",
     "AttributeFullscreenToolbarButtonIcon": "Toolbar full screen button icon",
     "TabsToolbarDesc": "After clicking the button, the counter value increases, and clicking the <b>Refresh</b> button on the toolbar will reset the counter.",
-    "AttributeOnToolbarRefreshCallback": "Click the toolbar refresh button callback method"
+    "AttributeOnToolbarRefreshCallback": "Click the toolbar refresh button callback method",
+    "ContextClose": "Close",
+    "ContextCloseOther": "Close Other Tabs",
+    "ContextCloseAll": "Close All Tabs",
+    "TabsContextMenuTitle": "TabItem Context Menu",
+    "TabsContextMenuIntro": "Use the built-in <code>ContextMenuZone</code> component to pop up a custom context menu when you right-click a tab item"
   },
   "BootstrapBlazor.Server.Components.Components.DemoTabItem": {
     "Info": "Reset the title of this <code>TabItem</code> by click the button",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
index 6afbbb41e80..b30f29bf7ac 100644
--- a/src/BootstrapBlazor.Server/Locales/zh-CN.json
+++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -2132,7 +2132,12 @@
     "AttributeRefreshToolbarButtonIcon": "工具栏刷新按钮图标",
     "AttributeFullscreenToolbarButtonIcon": "工具栏全屏按钮图标",
     "TabsToolbarDesc": "点击按钮计数器数值增加后，点击工具栏的 <b>刷新</b> 按钮计数器清零",
-    "AttributeOnToolbarRefreshCallback": "点击工具栏刷新按钮回调方法"
+    "AttributeOnToolbarRefreshCallback": "点击工具栏刷新按钮回调方法",
+    "ContextClose": "关闭",
+    "ContextCloseOther": "关闭其他",
+    "ContextCloseAll": "关闭全部",
+    "TabsContextMenuTitle": "右键菜单",
+    "TabsContextMenuIntro": "通过内置 <code>ContextMenuZone</code> 组件，点击标签页右键时弹窗自定义右键菜单"
   },
   "BootstrapBlazor.Server.Components.Components.DemoTabItem": {
     "Info": "点击下方按钮，本 <code>TabItem</code> 标题更改为当前分钟与秒",

From 016bd9b234a90be2b067135773bbcd1686b9e6ae Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 23 Mar 2025 12:13:11 +0800
Subject: [PATCH 4/6] =?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/Components/TabTest.cs | 41 +++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/test/UnitTest/Components/TabTest.cs b/test/UnitTest/Components/TabTest.cs
index 9f5152d4121..8facda02904 100644
--- a/test/UnitTest/Components/TabTest.cs
+++ b/test/UnitTest/Components/TabTest.cs
@@ -7,6 +7,7 @@
 using Bunit.TestDoubles;
 using Microsoft.AspNetCore.Components.Rendering;
 using System.Reflection;
+using System.Threading.Tasks;
 using UnitTest.Misc;
 
 namespace UnitTest.Components;
@@ -25,6 +26,46 @@ protected override void ConfigureServices(IServiceCollection services)
         });
     }
 
+    [Fact]
+    public async Task ContextMenu_Ok()
+    {
+        var clicked = false;
+        var cut = Context.RenderComponent<ContextMenuZone>(pb =>
+        {
+            pb.AddChildContent<Tab>(pb =>
+            {
+                pb.AddChildContent<TabItem>(pb =>
+                {
+                    pb.Add(a => a.Text, "Tab1");
+                    pb.Add(a => a.Url, "/Index");
+                    pb.Add(a => a.Closable, true);
+                    pb.Add(a => a.Icon, "fa-solid fa-font-awesome");
+                    pb.Add(a => a.ChildContent, "Tab1-Content");
+                });
+            });
+            pb.AddChildContent<ContextMenu>(pb =>
+            {
+                pb.AddChildContent<ContextMenuItem>(pb =>
+                {
+                    pb.Add(a => a.Text, "test-close");
+                    pb.Add(a => a.OnClick, (context, item) =>
+                    {
+                        clicked = true;
+                        if (item is TabItem tabItem)
+                        {
+
+                        }
+                        return Task.CompletedTask;
+                    });
+                });
+            });
+        });
+
+        var item = cut.Find(".dropdown-menu .dropdown-item");
+        await cut.InvokeAsync(() => item.Click());
+        Assert.True(clicked);
+    }
+
     [Fact]
     public void ToolbarTemplate_Ok()
     {

From 97ff4b75c37d2106966654525142e6f2b9cbfd8c Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 23 Mar 2025 12:16:51 +0800
Subject: [PATCH 5/6] =?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/Components/TabTest.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/UnitTest/Components/TabTest.cs b/test/UnitTest/Components/TabTest.cs
index 8facda02904..f32d7dbe880 100644
--- a/test/UnitTest/Components/TabTest.cs
+++ b/test/UnitTest/Components/TabTest.cs
@@ -61,6 +61,9 @@ public async Task ContextMenu_Ok()
             });
         });
 
+        var menuItem = cut.Find(".tabs-item");
+        await cut.InvokeAsync(() => menuItem.ContextMenu());
+
         var item = cut.Find(".dropdown-menu .dropdown-item");
         await cut.InvokeAsync(() => item.Click());
         Assert.True(clicked);

From 98e29dcb78c060bbd15a7f0d567900029cff7c23 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 23 Mar 2025 12:21:22 +0800
Subject: [PATCH 6/6] chore: bump version 9.5.0-beta12

---
 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 e8410287ff9..c7a6b4e7fe6 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.4.11</Version>
+    <Version>9.5.0-beta12</Version>
   </PropertyGroup>
 
   <ItemGroup>