Update chat tab to build it's own tab item

Author: intitni

Core/Sources/ChatGPTChatTab/ChatContextMenu.swift

@@ -7,15 +7,21 @@ struct ChatContextMenu: View {
     @AppStorage(\.customCommands) var customCommands
 
     var body: some View {
-        Group {
-            currentSystemPrompt
-            currentExtraSystemPrompt
-            resetPrompt
+        Text(chat.title)
+            .contextMenu {
+                menu
+            }
+    }
+    
+    @ViewBuilder
+    var menu: some View {
+        currentSystemPrompt
+        currentExtraSystemPrompt
+        resetPrompt
 
-            Divider()
+        Divider()
 
-            customCommandMenu
-        }
+        customCommandMenu
     }
 
     @ViewBuilder

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -41,7 +41,7 @@ public class ChatGPTChatTab: ChatTab {
         ChatPanel(chat: provider)
     }
 
-    public func buildMenu() -> any View {
+    public func buildTabItem() -> any View {
         ChatContextMenu(chat: provider)
     }
 

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -175,18 +175,16 @@ struct ChatTabBar: View {
                     ScrollView(.horizontal) {
                         HStack(spacing: 0) {
                             ForEach(viewStore.state.tabInfo, id: \.id) { info in
-                                ChatTabBarButton(
-                                    store: store,
-                                    info: info,
-                                    isSelected: info.id == viewStore.state.selectedTabId
-                                )
-                                .id(info.id)
-                                .contextMenu {
-                                    if let tab = chatTabPool.getTab(of: info.id) {
-                                        tab.menu
-                                    } else {
-                                        EmptyView()
-                                    }
+                                if let tab = chatTabPool.getTab(of: info.id) {
+                                    ChatTabBarButton(
+                                        store: store,
+                                        info: info,
+                                        content: { tab.tabItem },
+                                        isSelected: info.id == viewStore.state.selectedTabId
+                                    )
+                                    .id(info.id)
+                                } else {
+                                    EmptyView()
                                 }
                             }
                         }
@@ -263,9 +261,10 @@ struct ChatTabBar: View {
     }
 }
 
-struct ChatTabBarButton: View {
+struct ChatTabBarButton<Content: View>: View {
     let store: StoreOf<ChatPanelFeature>
     let info: ChatTabInfo
+    let content: () -> Content
     let isSelected: Bool
     @State var isHovered: Bool = false
 
@@ -274,7 +273,7 @@ struct ChatTabBarButton: View {
             Button(action: {
                 store.send(.tabClicked(id: info.id))
             }) {
-                Text(info.title)
+                content()
                     .font(.callout)
                     .lineLimit(1)
                     .frame(maxWidth: 120)
@@ -372,10 +371,12 @@ class FakeChatTab: ChatTab {
         }
     }
 
-    func buildMenu() -> any View {
-        Text("Menu Item")
-        Text("Menu Item")
-        Text("Menu Item")
+    func buildTabItem() -> any View {
+        Text("Fake")
+            .contextMenu {
+                Text("Menu Item")
+                Text("Menu Item")
+            }
     }
 
     func buildView() -> any View {

Tool/Sources/ChatTab/ChatTab.swift

@@ -25,7 +25,7 @@ public protocol ChatTabType {
     func buildView() -> any View
     /// Build the menu for this chat tab.
     @ViewBuilder
-    func buildMenu() -> any View
+    func buildTabItem() -> any View
     /// The name of this chat tab type.
     static var name: String { get }
     /// Available builders for this chat tab.
@@ -84,10 +84,10 @@ open class BaseChatTab {
 
     /// The menu for this chat tab.
     @ViewBuilder
-    public var menu: some View {
+    public var tabItem: some View {
         let id = "ChatTabMenu\(id)"
         if let tab = self as? (any ChatTabType) {
-            ContentView(buildView: tab.buildMenu).id(id)
+            ContentView(buildView: tab.buildTabItem).id(id)
                 .onAppear {
                     Task { @MainActor in self.startIfNotStarted() }
                 }
@@ -162,8 +162,8 @@ public class EmptyChatTab: ChatTab {
         .background(Color.blue)
     }
 
-    public func buildMenu() -> any View {
-        EmptyView()
+    public func buildTabItem() -> any View {
+        Text("Empty-\(id)")
     }
 
     public func restorableState() async -> Data {