marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement splits and notification focus

Browse source
This commit is contained in:
Lawrence Chen 2026-01-22 18:02:45 -08:00
parent 4440e0ae10
commit bc074d20c1
10 changed files with 1380 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Sources/AppDelegate.swift
View file

@ -55,9 +55,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
willPresent notification: UNNotification,
withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
) {
let shouldPresent = shouldPresentNotification(notification)
let options: UNNotificationPresentationOptions = shouldPresent ? [.banner, .sound] : []
completionHandler(options)
completionHandler([.banner, .sound])
}
private func handleNotificationResponse(_ response: UNNotificationResponse) {
@ -65,6 +63,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
let tabId = UUID(uuidString: tabIdString) else {
return
}
let surfaceId: UUID? = {
guard let surfaceIdString = response.notification.request.content.userInfo["surfaceId"] as? String else {
return nil
}
return UUID(uuidString: surfaceIdString)
}()
switch response.actionIdentifier {
case UNNotificationDefaultActionIdentifier, TerminalNotificationStore.actionShowIdentifier:
@ -75,7 +79,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
let notificationId = UUID(uuidString: notificationIdString) {
self.notificationStore?.markRead(id: notificationId)
}
self.tabManager?.focusTab(tabId)
self.tabManager?.focusTab(tabId, surfaceId: surfaceId)
}
case UNNotificationDismissActionIdentifier:
DispatchQueue.main.async {
@ -91,21 +95,4 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
}
}
private func shouldPresentNotification(_ notification: UNNotification) -> Bool {
guard let tabManager else { return true }
guard let tabIdString = notification.request.content.userInfo["tabId"] as? String,
let tabId = UUID(uuidString: tabIdString) else {
return true
}
let isAppActive = NSApp.isActive
let isTabActive = tabManager.selectedTabId == tabId
let isKeyWindow = NSApp.keyWindow?.isKeyWindow ?? false
if isAppActive && isTabActive && isKeyWindow {
return false
}
return true
}
}