Make detach chat window no persistent

intitni · intitni · commit 850cab3ac030 · 2023-04-30T00:46:19.000+08:00
diff --git a/Core/Sources/Preferences/Keys.swift b/Core/Sources/Preferences/Keys.swift
@@ -175,17 +175,6 @@ public struct UserDefaultPreferenceKeys {
     public var preferWidgetToStayInsideEditorWhenWidthGreaterThan: PreferWidgetToStayInsideEditorWhenWidthGreaterThan {
         .init()
     }
-    
-    // MARK: - Chat Panel in a Separate Window
-
-    public struct ChatPanelInASeparateWindow: UserDefaultPreferenceKey {
-        public let defaultValue = true
-        public let key = "ChatPanelInASeparateWindow"
-    }
-
-    public var chatPanelInASeparateWindow: ChatPanelInASeparateWindow {
-        .init()
-    }
 }
 
 // MARK: - OpenAI Account Settings
diff --git a/Core/Sources/SuggestionWidget/ChatWindowView.swift b/Core/Sources/SuggestionWidget/ChatWindowView.swift
@@ -8,7 +8,7 @@ final class ChatWindowViewModel: ObservableObject {
     @Published var chat: ChatProvider?
     @Published var colorScheme: ColorScheme
     @Published var isPanelDisplayed = false
-    @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow
+    @Published var chatPanelInASeparateWindow = false
     
     public init(chat: ChatProvider? = nil, colorScheme: ColorScheme = .dark) {
         self.chat = chat
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelView.swift b/Core/Sources/SuggestionWidget/SuggestionPanelView.swift
@@ -22,24 +22,14 @@ final class SuggestionPanelViewModel: ObservableObject {
 
     enum ActiveTab {
         case suggestion
-        case chat
     }
-    
-    @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow
 
     @Published var content: Content? {
         didSet {
-            adjustActiveTabAndShowHideIfNeeded(tab: .suggestion)
             requestApplicationPolicyUpdate?(self)
         }
     }
 
-    @Published var chat: ChatProvider? {
-        didSet {
-            adjustActiveTabAndShowHideIfNeeded(tab: .chat)
-        }
-    }
-
     @Published var activeTab: ActiveTab {
         didSet {
             requestApplicationPolicyUpdate?(self)
@@ -54,51 +44,17 @@ final class SuggestionPanelViewModel: ObservableObject {
 
     public init(
         content: Content? = nil,
-        chat: ChatProvider? = nil,
         isPanelDisplayed: Bool = false,
         activeTab: ActiveTab = .suggestion,
         colorScheme: ColorScheme = .dark,
         requestApplicationPolicyUpdate: ((SuggestionPanelViewModel) -> Void)? = nil
     ) {
         self.content = content
-        self.chat = chat
         self.isPanelDisplayed = isPanelDisplayed
         self.activeTab = activeTab
         self.colorScheme = colorScheme
         self.requestApplicationPolicyUpdate = requestApplicationPolicyUpdate
     }
-
-    func adjustActiveTabAndShowHideIfNeeded(tab: ActiveTab) {
-        if chatPanelInASeparateWindow {
-            activeTab = .suggestion
-            return
-        }
-        
-        switch tab {
-        case .suggestion:
-            if content != nil {
-                activeTab = .suggestion
-                return
-            }
-        case .chat:
-            if chat != nil {
-                activeTab = .chat
-                return
-            }
-        }
-
-        if content != nil {
-            activeTab = .suggestion
-            return
-        }
-
-        if chat != nil {
-            activeTab = .chat
-            return
-        }
-
-        activeTab = .suggestion
-    }
 }
 
 struct SuggestionPanelView: View {
@@ -130,15 +86,6 @@ struct SuggestionPanelView: View {
                         .allowsHitTesting(viewModel.isPanelDisplayed)
                     }
                 }
-
-//                if let chat = viewModel.chat {
-//                    if case .chat = viewModel.activeTab {
-//                        ChatPanel(chat: chat)
-//                            .frame(maxWidth: .infinity, maxHeight: Style.panelHeight)
-//                            .fixedSize(horizontal: false, vertical: true)
-//                            .allowsHitTesting(viewModel.isPanelDisplayed)
-//                    }
-//                }
             }
             .frame(maxWidth: .infinity)
 
@@ -151,7 +98,7 @@ struct SuggestionPanelView: View {
         .preferredColorScheme(viewModel.colorScheme)
         .opacity({
             guard viewModel.isPanelDisplayed else { return 0 }
-            guard viewModel.content != nil || viewModel.chat != nil else { return 0 }
+            guard viewModel.content != nil else { return 0 }
             return 1
         }())
         .animation(.easeInOut(duration: 0.2), value: viewModel.content?.contentHash)
@@ -193,59 +140,6 @@ struct SuggestionPanelView_Error_Preview: PreviewProvider {
     }
 }
 
-struct SuggestionPanelView_Chat_Preview: PreviewProvider {
-    static var previews: some View {
-        SuggestionPanelView(viewModel: .init(
-            chat: .init(
-                history: [
-                    .init(id: "1", isUser: true, text: "Hello"),
-                    .init(id: "2", isUser: false, text: "Hi"),
-                    .init(id: "3", isUser: true, text: "What's up?"),
-                ]
-            ),
-            isPanelDisplayed: true,
-            activeTab: .chat
-        ))
-        .frame(width: 450, height: 300)
-    }
-}
-
-struct SuggestionPanelView_Both_DisplayingChat_Preview: PreviewProvider {
-    static var previews: some View {
-        SuggestionPanelView(viewModel: .init(
-            content: .suggestion(SuggestionProvider(
-                code: """
-                - (void)addSubview:(UIView *)view {
-                    [self addSubview:view];
-                }
-                """,
-                language: "objective-c",
-                startLineIndex: 8,
-                suggestionCount: 2,
-                currentSuggestionIndex: 0
-            )),
-            chat: .init(
-                history: [
-                    .init(id: "1", isUser: true, text: "Hello"),
-                    .init(id: "2", isUser: false, text: "Hi"),
-                    .init(id: "3", isUser: true, text: "What's up?"),
-                ]
-            ),
-            isPanelDisplayed: true,
-            activeTab: .chat,
-            colorScheme: .light
-        ))
-        .frame(width: 450, height: 500)
-        .background {
-            HStack {
-                Color.red
-                Color.green
-                Color.blue
-            }
-        }
-    }
-}
-
 struct SuggestionPanelView_Both_DisplayingSuggestion_Preview: PreviewProvider {
     static var previews: some View {
         SuggestionPanelView(viewModel: .init(
@@ -260,13 +154,6 @@ struct SuggestionPanelView_Both_DisplayingSuggestion_Preview: PreviewProvider {
                 suggestionCount: 2,
                 currentSuggestionIndex: 0
             )),
-            chat: .init(
-                history: [
-                    .init(id: "1", isUser: true, text: "Hello"),
-                    .init(id: "2", isUser: false, text: "Hi"),
-                    .init(id: "3", isUser: true, text: "What's up?"),
-                ]
-            ),
             isPanelDisplayed: true,
             activeTab: .suggestion,
             colorScheme: .dark
@@ -281,3 +168,4 @@ struct SuggestionPanelView_Both_DisplayingSuggestion_Preview: PreviewProvider {
         }
     }
 }
+
diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
@@ -2,6 +2,7 @@ import ActiveApplicationMonitor
 import AppKit
 import AsyncAlgorithms
 import AXNotificationStream
+import Combine
 import Environment
 import Preferences
 import SwiftUI
@@ -120,12 +121,12 @@ public final class SuggestionWidgetController: NSObject {
 
     private var presentationModeChangeObserver = UserDefaultsObserver()
     private var colorSchemeChangeObserver = UserDefaultsObserver()
-    private var detachChatPanelObserver = UserDefaultsObserver()
     private var windowChangeObservationTask: Task<Void, Error>?
     private var activeApplicationMonitorTask: Task<Void, Error>?
     private var sourceEditorMonitorTask: Task<Void, Error>?
     private var currentFileURL: URL?
     private var colorScheme: ColorScheme = .light
+    private var cancellable = Set<AnyCancellable>()
 
     public var onOpenChatClicked: () -> Void = {}
     public var onCustomCommandClicked: (CustomCommand) -> Void = { _ in }
@@ -160,7 +161,7 @@ public final class SuggestionWidgetController: NSObject {
                             self.widgetWindow.alphaValue = 0
                             self.panelWindow.alphaValue = 0
                             self.tabWindow.alphaValue = 0
-                            if !UserDefaults.shared.value(for: \.chatPanelInASeparateWindow) {
+                            if !chatWindowViewModel.chatPanelInASeparateWindow {
                                 self.chatWindow.alphaValue = 0
                             }
                         }
@@ -184,16 +185,13 @@ public final class SuggestionWidgetController: NSObject {
         }
 
         Task { @MainActor in
-            detachChatPanelObserver.onChange = { [weak self] in
-                guard let self else { return }
-                self.updateWindowLocation(animated: true)
-            }
-            UserDefaults.shared.addObserver(
-                detachChatPanelObserver,
-                forKeyPath: UserDefaultPreferenceKeys().chatPanelInASeparateWindow.key,
-                options: .new,
-                context: nil
-            )
+            chatWindowViewModel.$chatPanelInASeparateWindow.dropFirst().removeDuplicates()
+                .sink { [weak self] _ in
+                    guard let self else { return }
+                    Task { @MainActor in
+                        self.updateWindowLocation(animated: true)
+                    }
+                }.store(in: &cancellable)
         }
 
         Task { @MainActor in
@@ -280,9 +278,8 @@ public extension SuggestionWidgetController {
             if let chat = await dataSource?.chatForFile(at: fileURL) {
                 chatWindowViewModel.chat = chat
                 chatWindowViewModel.isPanelDisplayed = true
-                suggestionPanelViewModel.chat = chat
 
-                if UserDefaults.shared.value(for: \.chatPanelInASeparateWindow) {
+                if chatWindowViewModel.chatPanelInASeparateWindow {
                     self.updateWindowLocation()
                 }
 
@@ -444,7 +441,7 @@ extension SuggestionWidgetController {
             return
         }
 
-        let detachChat = UserDefaults.shared.value(for: \.chatPanelInASeparateWindow)
+        let detachChat = chatWindowViewModel.chatPanelInASeparateWindow
 
         if let widgetFrames = {
             if let xcode = ActiveApplicationMonitor.latestXcode {
@@ -571,19 +568,14 @@ extension SuggestionWidgetController {
         }() else {
             suggestionPanelViewModel.content = nil
             chatWindowViewModel.chat = nil
-            suggestionPanelViewModel.chat = nil
             return
         }
 
         if let chat = await dataSource?.chatForFile(at: fileURL) {
-            if suggestionPanelViewModel.chat?.id != chat.id {
-                suggestionPanelViewModel.chat = chat
-            }
             if chatWindowViewModel.chat?.id != chat.id {
                 chatWindowViewModel.chat = chat
             }
         } else {
-            suggestionPanelViewModel.chat = nil
             chatWindowViewModel.chat = nil
         }
 
@@ -604,7 +596,7 @@ extension SuggestionWidgetController: NSWindowDelegate {
         guard (notification.object as? NSWindow) === chatWindow else { return }
         Task { @MainActor in
             await Task.yield()
-            UserDefaults.shared.set(true, for: \.chatPanelInASeparateWindow)
+            chatWindowViewModel.chatPanelInASeparateWindow = true
         }
     }
 
diff --git a/Core/Sources/SuggestionWidget/TabView.swift b/Core/Sources/SuggestionWidget/TabView.swift
@@ -2,7 +2,6 @@ import SwiftUI
 
 struct TabView: View {
     @ObservedObject var chatWindowViewModel: ChatWindowViewModel
-    @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow
 
     var body: some View {
         Button(action: {
@@ -16,7 +15,7 @@ struct TabView: View {
                 )
         })
         .buttonStyle(.plain)
-        .opacity(chatPanelInASeparateWindow ? 1 : 0)
+        .opacity(chatWindowViewModel.chatPanelInASeparateWindow ? 1 : 0)
         .preferredColorScheme(chatWindowViewModel.colorScheme)
         .frame(maxWidth: Style.widgetWidth, maxHeight: Style.widgetHeight)
     }
diff --git a/Core/Sources/SuggestionWidget/WidgetView.swift b/Core/Sources/SuggestionWidget/WidgetView.swift
@@ -35,7 +35,7 @@ struct WidgetView: View {
                 let minimumLineWidth: Double = 4
                 let lineWidth = (1 - processingProgress) * 28 + minimumLineWidth
                 let scale = max(processingProgress * 1, 0.0001)
-                let empty = panelViewModel.content == nil && panelViewModel.chat == nil
+                let empty = panelViewModel.content == nil && chatWindowViewModel.chat == nil
 
                 ZStack {
                     Circle()
@@ -81,6 +81,7 @@ struct WidgetView: View {
                 }
             }.contextMenu {
                 WidgetContextMenu(
+                    chatWindowViewModel: chatWindowViewModel,
                     widgetViewModel: viewModel,
                     isChatOpen: chatWindowViewModel.isPanelDisplayed
                         && chatWindowViewModel.chat != nil,
@@ -96,7 +97,7 @@ struct WidgetView: View {
             if viewModel.isProcessing {
                 processingProgress = 1 - processingProgress
             } else {
-                let empty = panelViewModel.content == nil && panelViewModel.chat == nil
+                let empty = panelViewModel.content == nil && chatWindowViewModel.chat == nil
                 processingProgress = empty ? 0 : 1
             }
         }
@@ -112,7 +113,7 @@ struct WidgetContextMenu: View {
     @AppStorage(\.disableSuggestionFeatureGlobally) var disableSuggestionFeatureGlobally
     @AppStorage(\.suggestionFeatureEnabledProjectList) var suggestionFeatureEnabledProjectList
     @AppStorage(\.customCommands) var customCommands
-    @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow
+    @ObservedObject var chatWindowViewModel: ChatWindowViewModel
     @ObservedObject var widgetViewModel: WidgetViewModel
     @State var projectPath: String?
     var isChatOpen: Bool
@@ -137,10 +138,10 @@ struct WidgetContextMenu: View {
 
             Group { // Settings
                 Button(action: {
-                    chatPanelInASeparateWindow.toggle()
+                    chatWindowViewModel.chatPanelInASeparateWindow.toggle()
                 }) {
                     Text("Detach Chat Panel")
-                    if chatPanelInASeparateWindow {
+                    if chatWindowViewModel.chatPanelInASeparateWindow {
                         Image(systemName: "checkmark")
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import SwiftUI`
`2`	`2`
`3`	`3`	`struct TabView: View {`
`4`	`4`	`@ObservedObject var chatWindowViewModel: ChatWindowViewModel`
`5`		`- @AppStorage(\.chatPanelInASeparateWindow) var chatPanelInASeparateWindow`
`6`	`5`
`7`	`6`	`var body: some View {`
`8`	`7`	`Button(action: {`
`@@ -16,7 +15,7 @@ struct TabView: View {`
`16`	`15`	`)`
`17`	`16`	`})`
`18`	`17`	`.buttonStyle(.plain)`
`19`		`- .opacity(chatPanelInASeparateWindow ? 1 : 0)`
	`18`	`+ .opacity(chatWindowViewModel.chatPanelInASeparateWindow ? 1 : 0)`
`20`	`19`	`.preferredColorScheme(chatWindowViewModel.colorScheme)`
`21`	`20`	`.frame(maxWidth: Style.widgetWidth, maxHeight: Style.widgetHeight)`
`22`	`21`	`}`