Merge branch 'feature/isolate-chat-and-suggestion' into develop

Author: intitni

Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift

@@ -46,6 +46,13 @@ struct PresentInWindowSuggestionPresenter {
             controller.presentError(error.localizedDescription)
         }
     }
+    
+    func closeChatRoom(fileURL: URL) {
+        Task { @MainActor in
+            let controller = GraphicalUserInterfaceController.shared.suggestionWidget
+            controller.closeChatRoom(fileURL: fileURL)
+        }
+    }
 
     func presentChatGPTConversation(_ service: ChatGPTService, fileURL: URL) {
         let chatRoom = ChatRoom()
@@ -85,6 +92,13 @@ struct PresentInWindowSuggestionPresenter {
             }
         }
 
+        chatRoom.onClose = {
+            Task {
+                await service.stopReceivingMessage()
+                closeChatRoom(fileURL: fileURL)
+            }
+        }
+        
         Task { @MainActor in
             let controller = GraphicalUserInterfaceController.shared.suggestionWidget
             controller.presentChatRoom(chatRoom, fileURL: fileURL)

Core/Sources/SuggestionWidget/ChatRoom.swift

@@ -6,19 +6,22 @@ public final class ChatRoom: ObservableObject, Equatable {
     public var onMessageSend: (String) -> Void
     public var onStop: () -> Void
     public var onClear: () -> Void
+    public var onClose: () -> Void
 
     public init(
         history: [ChatMessage] = [],
         isReceivingMessage: Bool = false,
         onMessageSend: @escaping (String) -> Void = { _ in },
         onStop: @escaping () -> Void = {},
-        onClear: @escaping () -> Void = {}
+        onClear: @escaping () -> Void = {},
+        onClose: @escaping () -> Void = {}
     ) {
         self.history = history
         self.isReceivingMessage = isReceivingMessage
         self.onMessageSend = onMessageSend
         self.onStop = onStop
         self.onClear = onClear
+        self.onClose = onClose
     }
 
     public static func == (lhs: ChatRoom, rhs: ChatRoom) -> Bool {
@@ -28,6 +31,7 @@ public final class ChatRoom: ObservableObject, Equatable {
     public func send(_ message: String) { onMessageSend(message) }
     public func stop() { onStop() }
     public func clear() { onClear() }
+    public func close() { onClose() }
 }
 
 public struct ChatMessage: Equatable {

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -25,14 +25,12 @@ struct ChatPanel: View {
 
             // close button
             Button(action: {
-                viewModel.isPanelDisplayed = false
-                viewModel.content = .empty
-                chat.stop()
+                chat.close()
             }) {
                 Image(systemName: "xmark")
                     .padding(8)
                     .background(.regularMaterial, in: Circle())
-                    .padding([.leading, .bottom], 8)
+                    .padding(4)
                     .foregroundStyle(.secondary)
             }
             .buttonStyle(.plain)
@@ -196,7 +194,6 @@ struct ChatPanel_Preview: PreviewProvider {
 
     static var previews: some View {
         ChatPanel(viewModel: .init(
-            content: .empty,
             isPanelDisplayed: true
         ), chat: .init(
             history: ChatPanel_Preview.history,
@@ -212,7 +209,6 @@ struct ChatPanel_Preview: PreviewProvider {
 struct ChatPanel_InputText_Preview: PreviewProvider {
     static var previews: some View {
         ChatPanel(viewModel: .init(
-            content: .empty,
             isPanelDisplayed: true
         ), chat: .init(
             history: ChatPanel_Preview.history,
@@ -229,7 +225,6 @@ struct ChatPanel_InputMultilineText_Preview: PreviewProvider {
     static var previews: some View {
         ChatPanel(
             viewModel: .init(
-                content: .empty,
                 isPanelDisplayed: true
             ),
             chat: .init(
@@ -248,7 +243,6 @@ struct ChatPanel_InputMultilineText_Preview: PreviewProvider {
 struct ChatPanel_Light_Preview: PreviewProvider {
     static var previews: some View {
         ChatPanel(viewModel: .init(
-            content: .empty,
             isPanelDisplayed: true
         ), chat: .init(
             history: ChatPanel_Preview.history,

Core/Sources/SuggestionWidget/SuggestionPanelContent/ErrorPanel.swift

@@ -16,7 +16,7 @@ struct ErrorPanel: View {
             // close button
             Button(action: {
                 viewModel.isPanelDisplayed = false
-                viewModel.content = .empty
+                viewModel.content = nil
             }) {
                 Image(systemName: "xmark")
                     .padding([.leading, .bottom], 16)