let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mac): keep webchat panel alive

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-09 21:42:36 +00:00
parent d5517ede45
commit f83eeac5e2
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
apps/macos/Sources/Clawdis/WebChatWindow.swift
View File

@@ -372,45 +372,52 @@ extension WebChatWindowController {
@MainActor @MainActor
final class WebChatManager { final class WebChatManager {
static let shared = WebChatManager() static let shared = WebChatManager()
private var controller: WebChatWindowController? private var windowController: WebChatWindowController?
private var panelController: WebChatWindowController?
var onPanelVisibilityChanged: ((Bool) -> Void)? var onPanelVisibilityChanged: ((Bool) -> Void)?
func show(sessionKey: String) { func show(sessionKey: String) {
if self.controller == nil { self.closePanel()
self.controller = WebChatWindowController(sessionKey: sessionKey) if let controller = self.windowController {
controller.showWindow(nil)
controller.window?.makeKeyAndOrderFront(nil)
NSApp.activate(ignoringOtherApps: true)
return
} }
self.onPanelVisibilityChanged?(false)
self.controller?.showWindow(nil) let controller = WebChatWindowController(sessionKey: sessionKey)
self.controller?.window?.makeKeyAndOrderFront(nil) self.windowController = controller
controller.showWindow(nil)
controller.window?.makeKeyAndOrderFront(nil)
NSApp.activate(ignoringOtherApps: true) NSApp.activate(ignoringOtherApps: true)
} }
func togglePanel(sessionKey: String, anchorProvider: @escaping () -> NSRect?) { func togglePanel(sessionKey: String, anchorProvider: @escaping () -> NSRect?) {
if let controller, controller.window?.isVisible == true, controller.presentation.isPanel { if let controller = self.panelController {
controller.shutdown() if controller.window?.isVisible == true {
controller.closePanel() controller.closePanel()
self.controller = nil self.onPanelVisibilityChanged?(false)
} else {
controller.presentAnchoredPanel(anchorProvider: anchorProvider)
self.onPanelVisibilityChanged?(true)
}
return return
} }
if let existing = self.controller {
existing.shutdown()
existing.close()
}
let controller = WebChatWindowController(sessionKey: sessionKey, presentation: .panel(anchorProvider: anchorProvider)) let controller = WebChatWindowController(
self.controller = controller sessionKey: sessionKey,
presentation: .panel(anchorProvider: anchorProvider))
self.panelController = controller
controller.onPanelClosed = { [weak self] in controller.onPanelClosed = { [weak self] in
self?.panelClosed() self?.panelHidden()
} }
controller.presentAnchoredPanel(anchorProvider: anchorProvider) controller.presentAnchoredPanel(anchorProvider: anchorProvider)
self.onPanelVisibilityChanged?(true) self.onPanelVisibilityChanged?(true)
} }
func closePanel() { func closePanel() {
guard let controller, controller.presentation.isPanel else { return } guard let controller = self.panelController else { return }
controller.shutdown()
controller.closePanel() controller.closePanel()
self.controller = nil
self.onPanelVisibilityChanged?(false) self.onPanelVisibilityChanged?(false)
} }
@@ -433,14 +440,17 @@ final class WebChatManager {
} }
func close() { func close() {
self.controller?.shutdown() self.windowController?.shutdown()
self.controller?.close() self.windowController?.close()
self.controller = nil self.windowController = nil
self.panelController?.shutdown()
self.panelController?.close()
self.panelController = nil
} }
private func panelClosed() { private func panelHidden() {
self.onPanelVisibilityChanged?(false) self.onPanelVisibilityChanged?(false)
self.controller = nil
} }
} }