Move chat context menu to tab bar

Author: intitni

Core/Sources/ChatGPTChatTab/ChatContextMenu.swift

@@ -0,0 +1,69 @@
+import AppKit
+import SharedUIComponents
+import SwiftUI
+
+struct ChatContextMenu: View {
+    let chat: ChatProvider
+    @AppStorage(\.customCommands) var customCommands
+
+    var body: some View {
+        Group {
+            currentSystemPrompt
+            currentExtraSystemPrompt
+            resetPrompt
+
+            Divider()
+
+            customCommandMenu
+        }
+    }
+
+    @ViewBuilder
+    var currentSystemPrompt: some View {
+        Text("System Prompt:")
+        Text({
+            var text = chat.systemPrompt
+            if text.isEmpty { text = "N/A" }
+            if text.count > 30 { text = String(text.prefix(30)) + "..." }
+            return text
+        }() as String)
+    }
+
+    @ViewBuilder
+    var currentExtraSystemPrompt: some View {
+        Text("Extra Prompt:")
+        Text({
+            var text = chat.extraSystemPrompt
+            if text.isEmpty { text = "N/A" }
+            if text.count > 30 { text = String(text.prefix(30)) + "..." }
+            return text
+        }() as String)
+    }
+
+    var resetPrompt: some View {
+        Button("Reset System Prompt") {
+            chat.resetPrompt()
+        }
+    }
+
+    var customCommandMenu: some View {
+        Menu("Custom Commands") {
+            ForEach(
+                customCommands.filter {
+                    switch $0.feature {
+                    case .chatWithSelection, .customChat: return true
+                    case .promptToCode: return false
+                    case .singleRoundDialog: return false
+                    }
+                },
+                id: \.name
+            ) { command in
+                Button(action: {
+                    chat.triggerCustomCommand(command)
+                }) {
+                    Text(command.name)
+                }
+            }
+        }
+    }
+}

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -13,6 +13,10 @@ public class ChatGPTChatTab: ChatTab {
     public func buildView() -> any View {
         ChatPanel(chat: provider)
     }
+    
+    public func buildMenu() -> any View {
+        ChatContextMenu(chat: provider)
+    }
 
     public init(service: ChatService = .init()) {
         self.service = service

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -302,9 +302,6 @@ struct ChatPanelInputArea: View {
         }
         .padding(8)
         .background(.ultraThickMaterial)
-        .contextMenu {
-            ChatContextMenu(chat: chat)
-        }
     }
 
     var clearButton: some View {
@@ -412,72 +409,6 @@ struct ChatPanelInputArea: View {
     }
 }
 
-struct ChatContextMenu: View {
-    let chat: ChatProvider
-    @AppStorage(\.customCommands) var customCommands
-
-    var body: some View {
-        Group {
-            currentSystemPrompt
-            currentExtraSystemPrompt
-            resetPrompt
-
-            Divider()
-
-            customCommandMenu
-        }
-    }
-
-    @ViewBuilder
-    var currentSystemPrompt: some View {
-        Text("System Prompt:")
-        Text({
-            var text = chat.systemPrompt
-            if text.isEmpty { text = "N/A" }
-            if text.count > 30 { text = String(text.prefix(30)) + "..." }
-            return text
-        }() as String)
-    }
-
-    @ViewBuilder
-    var currentExtraSystemPrompt: some View {
-        Text("Extra Prompt:")
-        Text({
-            var text = chat.extraSystemPrompt
-            if text.isEmpty { text = "N/A" }
-            if text.count > 30 { text = String(text.prefix(30)) + "..." }
-            return text
-        }() as String)
-    }
-
-    var resetPrompt: some View {
-        Button("Reset System Prompt") {
-            chat.resetPrompt()
-        }
-    }
-
-    var customCommandMenu: some View {
-        Menu("Custom Commands") {
-            ForEach(
-                customCommands.filter {
-                    switch $0.feature {
-                    case .chatWithSelection, .customChat: return true
-                    case .promptToCode: return false
-                    case .singleRoundDialog: return false
-                    }
-                },
-                id: \.name
-            ) { command in
-                Button(action: {
-                    chat.triggerCustomCommand(command)
-                }) {
-                    Text(command.name)
-                }
-            }
-        }
-    }
-}
-
 struct RoundedCorners: Shape {
     var tl: CGFloat = 0.0
     var tr: CGFloat = 0.0

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -73,6 +73,7 @@ struct ChatTabBar: View {
     let store: StoreOf<ChatPanelFeature>
 
     struct TabBarState: Equatable {
+        var tabs: [BaseChatTab]
         var tabInfo: [ChatTabInfo]
         var selectedTabId: String
     }
@@ -81,6 +82,7 @@ struct ChatTabBar: View {
         WithViewStore(
             store,
             observe: { TabBarState(
+                tabs: $0.chatTapGroup.tabs,
                 tabInfo: $0.chatTapGroup.tabInfo,
                 selectedTabId: $0.chatTapGroup.selectedTabId
                     ?? $0.chatTapGroup.tabInfo.first?.id ?? ""
@@ -95,6 +97,13 @@ struct ChatTabBar: View {
                                 info: info,
                                 isSelected: info.id == viewStore.state.selectedTabId
                             )
+                            .contextMenu {
+                                if let tab = viewStore.state.tabs
+                                    .first(where: { $0.id == info.id })
+                                {
+                                    tab.menu
+                                }
+                            }
                         }
                     }
                 }
@@ -194,6 +203,12 @@ struct ChatTabContainer: View {
 
 struct ChatWindowView_Previews: PreviewProvider {
     class FakeChatTab: ChatTab {
+        func buildMenu() -> any View {
+            Text("Menu Item")
+            Text("Menu Item")
+            Text("Menu Item")
+        }
+        
         func buildView() -> any View {
             ChatPanel(
                 chat: .init(

Tool/Sources/ChatTab/ChatTab.swift

@@ -62,7 +62,7 @@ open class BaseChatTab: Equatable {
 
     @ViewBuilder
     public var body: some View {
-        let id = "BaseChatTab\(info.id)"
+        let id = "ChatTabBody\(info.id)"
         if let tab = self as? ChatTabType {
             ContentView(info: info, buildView: tab.buildView).id(id)
         } else {
@@ -72,7 +72,12 @@ open class BaseChatTab: Equatable {
 
     @ViewBuilder
     public var menu: some View {
-        EmptyView()
+        let id = "ChatTabMenu\(info.id)"
+        if let tab = self as? ChatTabType {
+            ContentView(info: info, buildView: tab.buildMenu).id(id)
+        } else {
+            EmptyView().id(id)
+        }
     }
 
     public static func == (lhs: BaseChatTab, rhs: BaseChatTab) -> Bool {
@@ -83,6 +88,8 @@ open class BaseChatTab: Equatable {
 public protocol ChatTabType {
     @ViewBuilder
     func buildView() -> any View
+    @ViewBuilder
+    func buildMenu() -> any View
 }
 
 public class EmptyChatTab: ChatTab {
@@ -92,6 +99,10 @@ public class EmptyChatTab: ChatTab {
         }
         .background(Color.blue)
     }
+    
+    public func buildMenu() -> any View {
+        EmptyView()
+    }
 
     public init(id: String = UUID().uuidString) {
         super.init(id: id, title: "Empty")