Fix MessageView window interaction and focus

closes #1545

Author: mobile-ar

Sources/AppBundle/tree/MacApp.swift

@@ -43,6 +43,8 @@ final class MacApp: AbstractApp {
         // Otherwise, false positive ax notifications might trigger that lead to gcWindows
         if nsApp.bundleIdentifier == lockScreenAppBundleId { return nil }
         let pid = nsApp.processIdentifier
+        // AX requests crash if you send them to yourself
+        if pid == myPid { return nil }
 
         while true {
             if let existing = allAppsMap[pid] { return existing }

Sources/AppBundle/ui/MessageView.swift

@@ -7,6 +7,8 @@ public func getMessageWindow(messageModel: MessageModel) -> some Scene {
     SwiftUI.Window(messageModel.message?.title ?? aeroSpaceAppName, id: messageWindowId) {
         MessageView(model: messageModel)
             .onAppear {
+                // Set activation policy; otherwise, AeroSpace windows won't be able to receive focus and accept keyborad input
+                NSApp.setActivationPolicy(.accessory)
                 NSApplication.shared.windows.forEach {
                     if $0.identifier?.rawValue == messageWindowId {
                         $0.level = .floating
@@ -23,6 +25,7 @@ public let messageWindowId = "\(aeroSpaceAppName).messageView"
 public struct MessageView: View {
     @StateObject private var model: MessageModel
     @Environment(\.dismiss) private var dismiss
+    @FocusState var focus: Bool
 
     public init(model: MessageModel) {
         self._model = .init(wrappedValue: model)
@@ -36,13 +39,20 @@ public struct MessageView: View {
                     .font(.system(size: 48))
                 Text("\(model.message?.description ?? "")")
                     .padding(.horizontal)
+                    .focusable()
             }
             .padding()
             ScrollView {
                 VStack(alignment: .leading) {
                     HStack {
                         TextEditor(text: .constant(model.message?.body ?? ""))
                             .font(.system(size: 12).monospaced())
+                            .focused($focus)
+                            .onExitCommand {
+                                // Escape to remove focus from the TextEditor, and then you can hit Return to trigger the Close,
+                                // or use 'CMD + ,' for open config and 'CMD + R' for reload config (same as the menu shortcuts)
+                                focus = false
+                            }
                         Spacer()
                     }
                     Spacer()
@@ -79,6 +89,9 @@ public struct MessageView: View {
             // If user closes the screen with the macOS native close (x) button and then the error is still the same, this window will not appear again
             model.message = nil
         }
+        .onAppear {
+            focus = true
+        }
     }
 }
 

Sources/AppBundle/util/appBundleUtil.swift

@@ -5,6 +5,7 @@ import os
 
 let signposter = OSSignposter(subsystem: aeroSpaceAppId, category: .pointsOfInterest)
 
+let myPid = NSRunningApplication.current.processIdentifier
 let lockScreenAppBundleId = "com.apple.loginwindow"
 let AEROSPACE_WINDOW_ID = "AEROSPACE_WINDOW_ID" // env var
 let AEROSPACE_WORKSPACE = "AEROSPACE_WORKSPACE" // env var