✨ feat: add onTap parameter for notification click handling

- Add optional onTap closure parameter to present() method
- Wrap notification view in Button when onTap is provided
- Create ClickableHostingView to support clicks in non-key windows
- Maintain backward compatibility when onTap is nil

Author: okooo5km

Sources/GeneralNotification/GeneralNotification.swift

@@ -8,14 +8,22 @@ import SwiftUI
 let defaultInterval: TimeInterval = 2
 
 public enum GeneralNotification {
-    public static func present(bodyView: some View, interval: TimeInterval = defaultInterval) {
-        let bodyView = bodyView
+    public static func present(
+        bodyView: some View,
+        interval: TimeInterval = defaultInterval,
+        onTap: (() -> Void)? = nil
+    ) {
+        let bodyView =
+            bodyView
             .font(.system(.body, design: .rounded))
             .frame(maxWidth: 320)
 
-        guard let context = NotificationContext(
-            bodyView: bodyView
-        ) else {
+        guard
+            let context = NotificationContext(
+                bodyView: bodyView,
+                onTap: onTap
+            )
+        else {
             return
         }
 

Sources/GeneralNotification/NotificationContext.swift

@@ -12,13 +12,15 @@ import SwiftUI
 struct NotificationContext {
     let screen: NSScreen
     let bodyView: AnyView
+    let onTap: (() -> Void)?
 
-    init(screen: NSScreen, bodyView: AnyView) {
+    init(screen: NSScreen, bodyView: AnyView, onTap: (() -> Void)? = nil) {
         self.screen = screen
         self.bodyView = bodyView
+        self.onTap = onTap
     }
 
-    init?(bodyView: AnyView) {
+    init?(bodyView: AnyView, onTap: (() -> Void)? = nil) {
         let mouseLocation = NSEvent.mouseLocation
         let screens = NSScreen.screens
         let screenWithMouse =
@@ -29,12 +31,13 @@ struct NotificationContext {
         }
         self.init(
             screen: screen,
-            bodyView: bodyView
+            bodyView: bodyView,
+            onTap: onTap
         )
     }
 
-    init?(bodyView: some View) {
-        self.init(bodyView: AnyView(bodyView))
+    init?(bodyView: some View, onTap: (() -> Void)? = nil) {
+        self.init(bodyView: AnyView(bodyView), onTap: onTap)
     }
 
     func open(forInterval interval: TimeInterval = 0) {
@@ -43,7 +46,8 @@ struct NotificationContext {
 
         let viewModel = NotificationViewModel(
             screen: screen,
-            bodyView: bodyView
+            bodyView: bodyView,
+            onTap: onTap
         )
         let view = NotificationView(vm: viewModel)
         let viewController = NotificationViewController(view)
@@ -55,12 +59,12 @@ struct NotificationContext {
             x: screen.frame.origin.x,
             y: screen.frame.origin.y + screen.frame.height - viewModel.notificationOpenedSize.height - shadowInset - 24,
             width: screen.frame.width,
-            height: viewModel.notificationOpenedSize.height + shadowInset // for shadow
+            height: viewModel.notificationOpenedSize.height + shadowInset  // for shadow
         )
         window.window?.setFrameOrigin(topRect.origin)
         window.window?.setContentSize(topRect.size)
 
-//        window.showWindow(nil)
+        //        window.showWindow(nil)
         window.window?.orderFront(nil)
 
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {

Sources/GeneralNotification/NotificationView.swift

@@ -22,21 +22,38 @@ struct NotificationView: View {
         }
     }
 
+    @ViewBuilder
+    private var contentView: some View {
+        vm.bodyView
+            .frame(maxWidth: vm.notificationOpenedSize.width, maxHeight: vm.notificationOpenedSize.height)
+            .zIndex(1)
+            .background(
+                RoundedRectangle(cornerRadius: 16).stroke(lineWidth: 2).foregroundStyle(
+                    systemColorScheme == .dark ? Color.primary.opacity(0.2) : .white.opacity(0.3))
+            )
+            .background(.regularMaterial)
+            .focusable(false)
+            .clipShape(RoundedRectangle(cornerRadius: 16))
+            .shadow(color: .black.opacity(0.2), radius: 4, y: 1)
+    }
+
+    @ViewBuilder
+    private var notificationContent: some View {
+        if let onTap = vm.onTap {
+            Button(action: onTap) {
+                contentView
+            }
+            .buttonStyle(.plain)
+        } else {
+            contentView
+        }
+    }
+
     var body: some View {
         ZStack(alignment: .top) {
             Group {
                 if vm.status == .opened {
-                    vm.bodyView
-                        .frame(maxWidth: vm.notificationOpenedSize.width, maxHeight: vm.notificationOpenedSize.height)
-                        .zIndex(1)
-                        .background(
-                            RoundedRectangle(cornerRadius: 16).stroke(lineWidth: 2).foregroundStyle(
-                                systemColorScheme == .dark ? Color.primary.opacity(0.2) : .white.opacity(0.3))
-                        )
-                        .background(.regularMaterial)
-                        .focusable(false)
-                        .clipShape(RoundedRectangle(cornerRadius: 16))
-                        .shadow(color: .black.opacity(0.2), radius: 4, y: 1)
+                    notificationContent
                 }
             }
             .transition(

Sources/GeneralNotification/NotificationViewController.swift

@@ -9,6 +9,12 @@ import AppKit
 import Cocoa
 import SwiftUI
 
+class ClickableHostingView<Content: View>: NSHostingView<Content> {
+    override func acceptsFirstMouse(for event: NSEvent?) -> Bool {
+        true
+    }
+}
+
 class NotificationViewController: NSHostingController<AnyView> {
     init(_ view: AnyView) {
         super.init(rootView: view)
@@ -22,4 +28,8 @@ class NotificationViewController: NSHostingController<AnyView> {
     convenience init(_ view: some View) {
         self.init(AnyView(view))
     }
+
+    override func loadView() {
+        view = ClickableHostingView(rootView: rootView)
+    }
 }

Sources/GeneralNotification/NotificationViewModel.swift

@@ -10,10 +10,13 @@ class NotificationViewModel: NSObject, ObservableObject {
 
     let cornerRadius: CGFloat
 
+    let onTap: (() -> Void)?
+
     var referencedWindow: NotificationWindowController? = nil
 
-    init(screen: NSScreen, bodyView: AnyView) {
+    init(screen: NSScreen, bodyView: AnyView, onTap: (() -> Void)? = nil) {
         self.bodyView = AnyView(bodyView.padding(8))
+        self.onTap = onTap
 
         let bodyFittingSize = NSHostingView(rootView: self.bodyView).fittingSize
 
@@ -27,10 +30,11 @@ class NotificationViewModel: NSObject, ObservableObject {
         super.init()
     }
 
-    convenience init(screen: NSScreen, bodyView: some View) {
+    convenience init(screen: NSScreen, bodyView: some View, onTap: (() -> Void)? = nil) {
         self.init(
             screen: screen,
-            bodyView: AnyView(bodyView)
+            bodyView: AnyView(bodyView),
+            onTap: onTap
         )
     }