Split chat tab item and menu

Author: intitni

Core/Sources/ChatGPTChatTab/ChatContextMenu.swift

@@ -2,19 +2,19 @@ import AppKit
 import SharedUIComponents
 import SwiftUI
 
+struct ChatTabItemView: View {
+    @ObservedObject var chat: ChatProvider
+    
+    var body: some View {
+        Text(chat.title)
+    }
+}
+
 struct ChatContextMenu: View {
     @ObservedObject var chat: ChatProvider
     @AppStorage(\.customCommands) var customCommands
 
     var body: some View {
-        Text(chat.title)
-            .contextMenu {
-                menu
-            }
-    }
-    
-    @ViewBuilder
-    var menu: some View {
         currentSystemPrompt
         currentExtraSystemPrompt
         resetPrompt

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -42,6 +42,10 @@ public class ChatGPTChatTab: ChatTab {
     }
 
     public func buildTabItem() -> any View {
+        ChatTabItemView(chat: provider)
+    }
+    
+    public func buildMenu() -> any View {
         ChatContextMenu(chat: provider)
     }
 

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -182,6 +182,9 @@ struct ChatTabBar: View {
                                         content: { tab.tabItem },
                                         isSelected: info.id == viewStore.state.selectedTabId
                                     )
+                                    .contextMenu {
+                                        tab.menu
+                                    }
                                     .id(info.id)
                                 } else {
                                     EmptyView()
@@ -359,62 +362,8 @@ struct CreateOtherChatTabMenuStyle: MenuStyle {
     }
 }
 
-class FakeChatTab: ChatTab {
-    static var name: String { "Fake" }
-    static func chatBuilders(externalDependency: Void) -> [ChatTabBuilder] { [Builder()] }
-
-    struct Builder: ChatTabBuilder {
-        var title: String = "Title"
-
-        func build(store: StoreOf<ChatTabItem>) async -> (any ChatTab)? {
-            return FakeChatTab(store: store)
-        }
-    }
-
-    func buildTabItem() -> any View {
-        Text("Fake")
-            .contextMenu {
-                Text("Menu Item")
-                Text("Menu Item")
-            }
-    }
-
-    func buildView() -> any View {
-        ChatPanel(
-            chat: .init(
-                history: [
-                    .init(id: "1", role: .assistant, text: "Hello World"),
-                ],
-                isReceivingMessage: false
-            ),
-            typedMessage: "Hello World!"
-        )
-    }
-
-    func restorableState() async -> Data {
-        return Data()
-    }
-
-    static func restore(
-        from data: Data,
-        externalDependency: ()
-    ) async throws -> any ChatTabBuilder {
-        return Builder()
-    }
-
-    convenience init(id: String, title: String) {
-        self.init(store: .init(
-            initialState: .init(id: id, title: title),
-            reducer: ChatTabItem()
-        ))
-    }
-
-    func start() {}
-}
-
 struct ChatWindowView_Previews: PreviewProvider {
     static let pool = ChatTabPool([
-        "1": FakeChatTab(id: "1", title: "Hello I am a chatbot"),
         "2": EmptyChatTab(id: "2"),
         "3": EmptyChatTab(id: "3"),
         "4": EmptyChatTab(id: "4"),
@@ -423,30 +372,31 @@ struct ChatWindowView_Previews: PreviewProvider {
         "7": EmptyChatTab(id: "7"),
     ])
 
-    static var previews: some View {
-        ChatWindowView(
-            store: .init(
-                initialState: .init(
-                    chatTabGroup: .init(
-                        tabInfo: [
-                            .init(id: "1", title: "Fake"),
-                            .init(id: "2", title: "Empty-2"),
-                            .init(id: "3", title: "Empty-3"),
-                            .init(id: "4", title: "Empty-4"),
-                            .init(id: "5", title: "Empty-5"),
-                            .init(id: "6", title: "Empty-6"),
-                            .init(id: "7", title: "Empty-7"),
-                        ],
-                        selectedTabId: "1"
-                    ),
-                    isPanelDisplayed: true
+    static func createStore() -> StoreOf<ChatPanelFeature> {
+        StoreOf<ChatPanelFeature>(
+            initialState: .init(
+                chatTabGroup: .init(
+                    tabInfo: [
+                        .init(id: "2", title: "Empty-2"),
+                        .init(id: "3", title: "Empty-3"),
+                        .init(id: "4", title: "Empty-4"),
+                        .init(id: "5", title: "Empty-5"),
+                        .init(id: "6", title: "Empty-6"),
+                        .init(id: "7", title: "Empty-7"),
+                    ],
+                    selectedTabId: "2"
                 ),
-                reducer: ChatPanelFeature()
-            )
+                isPanelDisplayed: true
+            ),
+            reducer: ChatPanelFeature()
         )
-        .xcodeStyleFrame()
-        .padding()
-        .environment(\.chatTabPool, pool)
+    }
+
+    static var previews: some View {
+        ChatWindowView(store: createStore())
+            .xcodeStyleFrame()
+            .padding()
+            .environment(\.chatTabPool, pool)
     }
 }
 

Core/Sources/SuggestionWidget/ModuleDependency.swift

@@ -75,9 +75,7 @@ struct ActiveApplicationMonitorKey: DependencyKey {
 }
 
 struct ChatTabBuilderCollectionKey: DependencyKey {
-    static let liveValue: () -> [ChatTabBuilderCollection] = {
-        [.folder(title: "A", kinds: FakeChatTab.chatBuilders().map(ChatTabKind.init))]
-    }
+    static let liveValue: () -> [ChatTabBuilderCollection] = { [] }
 }
 
 struct ActivatePreviouslyActiveXcodeKey: DependencyKey {
@@ -135,3 +133,4 @@ extension DependencyValues {
         set { self[ActivateExtensionServiceKey.self] = newValue }
     }
 }
+

Tool/Sources/ChatTab/ChatTab.swift

@@ -23,9 +23,12 @@ public protocol ChatTabType {
     /// Build the view for this chat tab.
     @ViewBuilder
     func buildView() -> any View
-    /// Build the menu for this chat tab.
+    /// Build the tabItem for this chat tab.
     @ViewBuilder
     func buildTabItem() -> any View
+    /// Build the menu for this chat tab.
+    @ViewBuilder
+    func buildMenu() -> any View
     /// The name of this chat tab type.
     static var name: String { get }
     /// Available builders for this chat tab.
@@ -82,7 +85,7 @@ open class BaseChatTab {
         }
     }
 
-    /// The menu for this chat tab.
+    /// The tab item for this chat tab.
     @ViewBuilder
     public var tabItem: some View {
         let id = "ChatTabMenu\(id)"
@@ -95,6 +98,20 @@ open class BaseChatTab {
             EmptyView().id(id)
         }
     }
+    
+    /// The tab item for this chat tab.
+    @ViewBuilder
+    public var menu: some View {
+        let id = "ChatTabMenu\(id)"
+        if let tab = self as? (any ChatTabType) {
+            ContentView(buildView: tab.buildMenu).id(id)
+                .onAppear {
+                    Task { @MainActor in self.startIfNotStarted() }
+                }
+        } else {
+            EmptyView().id(id)
+        }
+    }
 
     @MainActor
     func startIfNotStarted() {
@@ -165,6 +182,10 @@ public class EmptyChatTab: ChatTab {
     public func buildTabItem() -> any View {
         Text("Empty-\(id)")
     }
+    
+    public func buildMenu() -> any View {
+        Text("Empty-\(id)")
+    }
 
     public func restorableState() async -> Data {
         return Data()