Merge branch 'feature/improve-performance-of-widgets' into develop

intitni · intitni · commit e280dbd30f46 · 2024-02-14T22:42:52.000+08:00
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift
@@ -85,7 +85,7 @@ public struct ChatPanelFeature: ReducerProtocol {
     @Dependency(\.chatTabBuilderCollection) var chatTabBuilderCollection
 
     @MainActor func toggleFullScreen() {
-        let window = suggestionWidgetControllerDependency.windows
+        let window = suggestionWidgetControllerDependency.windowsController?.windows
             .chatPanelWindow
         window?.toggleFullScreen(nil)
     }
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift
@@ -38,7 +38,7 @@ public struct PanelFeature: ReducerProtocol {
     @Dependency(\.suggestionWidgetControllerDependency) var suggestionWidgetControllerDependency
     @Dependency(\.xcodeInspector) var xcodeInspector
     @Dependency(\.activateThisApp) var activateThisApp
-    var windows: WidgetWindows { suggestionWidgetControllerDependency.windows }
+    var windows: WidgetWindows? { suggestionWidgetControllerDependency.windowsController?.windows }
 
     public var body: some ReducerProtocol<State, Action> {
         Scope(state: \.suggestionPanelState, action: /Action.suggestionPanel) {
@@ -122,7 +122,9 @@ public struct PanelFeature: ReducerProtocol {
 
                     if hasPromptToCode {
                         activateThisApp()
-                        await windows.sharedPanelWindow.makeKey()
+                        await MainActor.run {
+                            windows?.sharedPanelWindow.makeKey()
+                        }
                     }
                 }.animation(.easeInOut(duration: 0.2))
 
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift
diff --git a/Core/Sources/SuggestionWidget/ModuleDependency.swift b/Core/Sources/SuggestionWidget/ModuleDependency.swift
@@ -13,32 +13,11 @@ public final class SuggestionWidgetControllerDependency {
     public var suggestionWidgetDataSource: SuggestionWidgetDataSource?
     public var onOpenChatClicked: () -> Void = {}
     public var onCustomCommandClicked: (CustomCommand) -> Void = { _ in }
-    public var windows: WidgetWindows = .init()
+    var windowsController: WindowsController?
 
     public init() {}
 }
 
-@MainActor
-public final class WidgetWindows {
-    var fullscreenDetector: NSWindow!
-    var widgetWindow: NSWindow!
-    var sharedPanelWindow: NSWindow!
-    var suggestionPanelWindow: NSWindow!
-    var chatPanelWindow: ChatWindow!
-    var toastWindow: NSWindow!
-
-    nonisolated
-    init() {}
-
-    func orderFront() {
-        widgetWindow?.orderFrontRegardless()
-        toastWindow?.orderFrontRegardless()
-        sharedPanelWindow?.orderFrontRegardless()
-        suggestionPanelWindow?.orderFrontRegardless()
-        chatPanelWindow?.orderFrontRegardless()
-    }
-}
-
 public final class WidgetUserDefaultsObservers {
     let presentationModeChangeObserver = UserDefaultsObserver(
         object: UserDefaults.shared,
diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
@@ -11,194 +11,10 @@ import XcodeInspector
 
 @MainActor
 public final class SuggestionWidgetController: NSObject {
-    // you should make these window `.transient` so they never show up in the mission control.
-
-    private lazy var fullscreenDetector = {
-        let it = CanBecomeKeyWindow(
-            contentRect: .zero,
-            styleMask: .borderless,
-            backing: .buffered,
-            defer: false
-        )
-        it.isReleasedWhenClosed = false
-        it.isOpaque = false
-        it.backgroundColor = .clear
-        it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
-        it.hasShadow = false
-        it.setIsVisible(false)
-        it.canBecomeKeyChecker = { false }
-        return it
-    }()
-
-    private lazy var widgetWindow = {
-        let it = CanBecomeKeyWindow(
-            contentRect: .zero,
-            styleMask: .borderless,
-            backing: .buffered,
-            defer: false
-        )
-        it.isReleasedWhenClosed = false
-        it.isOpaque = false
-        it.backgroundColor = .clear
-        it.level = .floating
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
-        it.hasShadow = true
-        it.contentView = NSHostingView(
-            rootView: WidgetView(
-                store: store.scope(
-                    state: \._circularWidgetState,
-                    action: WidgetFeature.Action.circularWidget
-                )
-            )
-        )
-        it.setIsVisible(true)
-        it.canBecomeKeyChecker = { false }
-        return it
-    }()
-
-    private lazy var sharedPanelWindow = {
-        let it = CanBecomeKeyWindow(
-            contentRect: .init(x: 0, y: 0, width: Style.panelWidth, height: Style.panelHeight),
-            styleMask: .borderless,
-            backing: .buffered,
-            defer: false
-        )
-        it.isReleasedWhenClosed = false
-        it.isOpaque = false
-        it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 2)
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
-        it.hasShadow = true
-        it.contentView = NSHostingView(
-            rootView: SharedPanelView(
-                store: store.scope(
-                    state: \.panelState,
-                    action: WidgetFeature.Action.panel
-                ).scope(
-                    state: \.sharedPanelState,
-                    action: PanelFeature.Action.sharedPanel
-                )
-            )
-        )
-        it.setIsVisible(true)
-        it.canBecomeKeyChecker = { [store] in
-            store.withState { state in
-                state.panelState.sharedPanelState.content.promptToCode != nil
-            }
-        }
-        return it
-    }()
-
-    private lazy var suggestionPanelWindow = {
-        let it = CanBecomeKeyWindow(
-            contentRect: .init(x: 0, y: 0, width: Style.panelWidth, height: Style.panelHeight),
-            styleMask: .borderless,
-            backing: .buffered,
-            defer: false
-        )
-        it.isReleasedWhenClosed = false
-        it.isOpaque = false
-        it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 2)
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
-        it.hasShadow = true
-        it.contentView = NSHostingView(
-            rootView: SuggestionPanelView(
-                store: store.scope(
-                    state: \.panelState,
-                    action: WidgetFeature.Action.panel
-                ).scope(
-                    state: \.suggestionPanelState,
-                    action: PanelFeature.Action.suggestionPanel
-                )
-            )
-        )
-        it.canBecomeKeyChecker = { false }
-        it.setIsVisible(true)
-        return it
-    }()
-
-    private lazy var chatPanelWindow = {
-        let it = ChatWindow(
-            contentRect: .zero,
-            styleMask: [.resizable, .titled, .miniaturizable, .fullSizeContentView],
-            backing: .buffered,
-            defer: false
-        )
-        it.minimizeWindow = { [weak self] in
-            self?.store.send(.chatPanel(.hideButtonClicked))
-        }
-        it.titleVisibility = .hidden
-        it.addTitlebarAccessoryViewController({
-            let controller = NSTitlebarAccessoryViewController()
-            let view = NSHostingView(rootView: ChatTitleBar(store: store.scope(
-                state: \.chatPanelState,
-                action: WidgetFeature.Action.chatPanel
-            )))
-            controller.view = view
-            view.frame = .init(x: 0, y: 0, width: 100, height: 40)
-            controller.layoutAttribute = .right
-            return controller
-        }())
-        it.titlebarAppearsTransparent = true
-        it.isReleasedWhenClosed = false
-        it.isOpaque = false
-        it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 1)
-        it.collectionBehavior = [
-            .fullScreenAuxiliary,
-            .transient,
-            .fullScreenPrimary,
-            .fullScreenAllowsTiling,
-        ]
-        it.hasShadow = true
-        it.contentView = NSHostingView(
-            rootView: ChatWindowView(
-                store: store.scope(
-                    state: \.chatPanelState,
-                    action: WidgetFeature.Action.chatPanel
-                ),
-                toggleVisibility: { [weak it] isDisplayed in
-                    guard let window = it else { return }
-                    window.isPanelDisplayed = isDisplayed
-                }
-            )
-            .environment(\.chatTabPool, chatTabPool)
-        )
-        it.setIsVisible(true)
-        it.isPanelDisplayed = false
-        it.delegate = self
-        return it
-    }()
-
-    private lazy var toastWindow = {
-        let it = CanBecomeKeyWindow(
-            contentRect: .zero,
-            styleMask: [.borderless],
-            backing: .buffered,
-            defer: false
-        )
-        it.isReleasedWhenClosed = false
-        it.isOpaque = true
-        it.backgroundColor = .clear
-        it.level = .floating
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
-        it.hasShadow = false
-        it.contentView = NSHostingView(
-            rootView: ToastPanelView(store: store.scope(
-                state: \.toastPanel,
-                action: WidgetFeature.Action.toastPanel
-            ))
-        )
-        it.setIsVisible(true)
-        it.ignoresMouseEvents = true
-        it.canBecomeKeyChecker = { false }
-        return it
-    }()
-
     let store: StoreOf<WidgetFeature>
     let viewStore: ViewStoreOf<WidgetFeature>
     let chatTabPool: ChatTabPool
+    let windowsController: WindowsController
     private var cancellable = Set<AnyCancellable>()
 
     public let dependency: SuggestionWidgetControllerDependency
@@ -212,19 +28,16 @@ public final class SuggestionWidgetController: NSObject {
         self.store = store
         self.chatTabPool = chatTabPool
         viewStore = .init(store, observe: { $0 })
+        windowsController = .init(store: store, chatTabPool: chatTabPool)
 
         super.init()
 
         if ProcessInfo.processInfo.environment["IS_UNIT_TEST"] == "YES" { return }
 
-        dependency.windows.chatPanelWindow = chatPanelWindow
-        dependency.windows.toastWindow = toastWindow
-        dependency.windows.sharedPanelWindow = sharedPanelWindow
-        dependency.windows.suggestionPanelWindow = suggestionPanelWindow
-        dependency.windows.fullscreenDetector = fullscreenDetector
-        dependency.windows.widgetWindow = widgetWindow
-                                                                                             
+        dependency.windowsController = windowsController
+
         store.send(.startup)
+        windowsController.start()
     }
 }
 
@@ -267,69 +80,3 @@ public extension SuggestionWidgetController {
     }
 }
 
-// MARK: - NSWindowDelegate
-
-extension SuggestionWidgetController: NSWindowDelegate {
-    public func windowWillMove(_ notification: Notification) {
-        guard (notification.object as? NSWindow) === chatPanelWindow else { return }
-        Task { @MainActor in
-            await Task.yield()
-            store.send(.chatPanel(.detachChatPanel))
-        }
-    }
-    
-    public func windowWillEnterFullScreen(_ notification: Notification) {
-        guard (notification.object as? NSWindow) === chatPanelWindow else { return }
-        Task { @MainActor in
-            await Task.yield()
-            store.send(.chatPanel(.enterFullScreen))
-        }
-    }
-    
-    public func windowWillExitFullScreen(_ notification: Notification) {
-        guard (notification.object as? NSWindow) === chatPanelWindow else { return }
-        Task { @MainActor in
-            await Task.yield()
-            store.send(.chatPanel(.exitFullScreen))
-        }
-    }
-}
-
-// MARK: - Window Subclasses
-
-class CanBecomeKeyWindow: NSWindow {
-    var canBecomeKeyChecker: () -> Bool = { true }
-    override var canBecomeKey: Bool { canBecomeKeyChecker() }
-    override var canBecomeMain: Bool { canBecomeKeyChecker() }
-}
-
-class ChatWindow: NSWindow {
-    override var canBecomeKey: Bool { true }
-    override var canBecomeMain: Bool { true }
-
-    
-    var minimizeWindow: () -> Void = {}
-
-    var isWindowHidden: Bool = false {
-        didSet {
-            alphaValue = isPanelDisplayed && !isWindowHidden ? 1 : 0
-        }
-    }
-
-    var isPanelDisplayed: Bool = false {
-        didSet {
-            alphaValue = isPanelDisplayed && !isWindowHidden ? 1 : 0
-        }
-    }
-    
-    override var alphaValue: CGFloat {
-        didSet {
-            ignoresMouseEvents = alphaValue <= 0
-        }
-    }
-
-    override func miniaturize(_: Any?) {
-        minimizeWindow()
-    }
-}
-
diff --git a/Core/Sources/SuggestionWidget/WidgetPositionStrategy.swift b/Core/Sources/SuggestionWidget/WidgetPositionStrategy.swift
@@ -1,8 +1,8 @@
 import AppKit
 import Foundation
 
-struct WidgetLocation {
-    struct PanelLocation {
+public struct WidgetLocation: Equatable {
+    struct PanelLocation: Equatable {
         var frame: CGRect
         var alignPanelTop: Bool
     }
diff --git a/Core/Sources/SuggestionWidget/WindowsController.swift b/Core/Sources/SuggestionWidget/WindowsController.swift

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public struct ChatPanelFeature: ReducerProtocol {`
`85`	`85`	`@Dependency(\.chatTabBuilderCollection) var chatTabBuilderCollection`
`86`	`86`
`87`	`87`	`@MainActor func toggleFullScreen() {`
`88`		`- let window = suggestionWidgetControllerDependency.windows`
	`88`	`+ let window = suggestionWidgetControllerDependency.windowsController?.windows`
`89`	`89`	`.chatPanelWindow`
`90`	`90`	`window?.toggleFullScreen(nil)`
`91`	`91`	`}`