Add buttons to toast

Author: intitni

Core/Sources/SuggestionWidget/SuggestionPanelContent/ToastPanelView.swift

@@ -12,34 +12,92 @@ struct ToastPanelView: View {
             VStack(spacing: 4) {
                 if !store.alignTopToAnchor {
                     Spacer()
+                        .allowsHitTesting(false)
                 }
 
                 ForEach(store.toast.messages) { message in
-                    message.content
-                        .foregroundColor(.white)
-                        .padding(8)
-                        .frame(maxWidth: .infinity)
-                        .background({
-                            switch message.type {
-                            case .info: return Color.accentColor
-                            case .error: return Color(nsColor: .systemRed)
-                            case .warning: return Color(nsColor: .systemOrange)
+                    HStack {
+                        message.content
+                            .foregroundColor(.white)
+                            .textSelection(.enabled)
+                        
+
+                        if !message.buttons.isEmpty {
+                            HStack {
+                                ForEach(
+                                    Array(message.buttons.enumerated()),
+                                    id: \.offset
+                                ) { _, button in
+                                    Button(action: button.action) {
+                                        button.label
+                                            .foregroundColor(.white)
+                                            .padding(.horizontal, 6)
+                                            .padding(.vertical, 2)
+                                            .background {
+                                                RoundedRectangle(cornerRadius: 4)
+                                                    .stroke(Color.white, lineWidth: 1)
+                                            }
+                                            .contentShape(Rectangle())
+                                    }
+                                    .buttonStyle(.plain)
+                                    .allowsHitTesting(true)
+                                }
                             }
-                        }() as Color, in: RoundedRectangle(cornerRadius: 8))
-                        .overlay {
-                            RoundedRectangle(cornerRadius: 8)
-                                .stroke(Color.black.opacity(0.1), lineWidth: 1)
                         }
+                    }
+                    .padding(8)
+                    .frame(maxWidth: .infinity)
+                    .background({
+                        switch message.type {
+                        case .info: return Color.accentColor
+                        case .error: return Color(nsColor: .systemRed)
+                        case .warning: return Color(nsColor: .systemOrange)
+                        }
+                    }() as Color, in: RoundedRectangle(cornerRadius: 8))
+                    .overlay {
+                        RoundedRectangle(cornerRadius: 8)
+                            .stroke(Color.black.opacity(0.1), lineWidth: 1)
+                    }
                 }
 
                 if store.alignTopToAnchor {
                     Spacer()
+                        .allowsHitTesting(false)
                 }
             }
             .colorScheme(store.colorScheme)
             .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .allowsHitTesting(false)
         }
     }
 }
 
+#Preview {
+    ToastPanelView(store: .init(initialState: .init(
+        toast: .init(messages: [
+            ToastController.Message(
+                id: UUID(),
+                type: .info,
+                content: Text("Info message"),
+                buttons: [
+                    .init(label: Text("Dismiss"), action: {}),
+                    .init(label: Text("More info"), action: {}),
+                ]
+            ),
+            ToastController.Message(
+                id: UUID(),
+                type: .error,
+                content: Text("Error message"),
+                buttons: [.init(label: Text("Dismiss"), action: {})]
+            ),
+            ToastController.Message(
+                id: UUID(),
+                type: .warning,
+                content: Text("Warning message"),
+                buttons: [.init(label: Text("Dismiss"), action: {})]
+            ),
+        ])
+    ), reducer: {
+        ToastPanel()
+    }))
+}
+

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -793,7 +793,7 @@ public final class WidgetWindows {
             defer: false
         )
         it.isReleasedWhenClosed = false
-        it.isOpaque = true
+        it.isOpaque = false
         it.backgroundColor = .clear
         it.level = widgetLevel(0)
         it.hasShadow = false
@@ -804,7 +804,6 @@ public final class WidgetWindows {
             ))
         )
         it.setIsVisible(true)
-        it.ignoresMouseEvents = true
         it.canBecomeKeyChecker = { false }
         return it
     }()

Tool/Sources/Toast/Toast.swift

@@ -46,15 +46,36 @@ public extension DependencyValues {
 
 public class ToastController: ObservableObject {
     public struct Message: Identifiable, Equatable {
+        public struct MessageButton: Equatable {
+            public static func == (lhs: Self, rhs: Self) -> Bool {
+                lhs.label == rhs.label
+            }
+
+            public var label: Text
+            public var action: () -> Void
+            public init(label: Text, action: @escaping () -> Void) {
+                self.label = label
+                self.action = action
+            }
+        }
+
         public var namespace: String?
         public var id: UUID
         public var type: ToastType
         public var content: Text
-        public init(id: UUID, type: ToastType, namespace: String? = nil, content: Text) {
+        public var buttons: [MessageButton]
+        public init(
+            id: UUID,
+            type: ToastType,
+            namespace: String? = nil,
+            content: Text,
+            buttons: [MessageButton] = []
+        ) {
             self.namespace = namespace
             self.id = id
             self.type = type
             self.content = content
+            self.buttons = buttons
         }
     }
 
@@ -64,16 +85,35 @@ public class ToastController: ObservableObject {
         self.messages = messages
     }
 
-    public func toast(content: String, type: ToastType, namespace: String? = nil) {
+    public func toast(
+        content: String,
+        type: ToastType,
+        namespace: String? = nil,
+        buttons: [Message.MessageButton] = [],
+        duration: TimeInterval = 4
+    ) {
         let id = UUID()
-        let message = Message(id: id, type: type, namespace: namespace, content: Text(content))
+        let message = Message(
+            id: id,
+            type: type,
+            namespace: namespace,
+            content: Text(content),
+            buttons: buttons.map { b in
+                Message.MessageButton(label: b.label, action: { [weak self] in
+                    b.action()
+                    withAnimation(.easeInOut(duration: 0.2)) {
+                        self?.messages.removeAll { $0.id == id }
+                    }
+                })
+            }
+        )
 
         Task { @MainActor in
             withAnimation(.easeInOut(duration: 0.2)) {
                 messages.append(message)
                 messages = messages.suffix(3)
             }
-            try await Task.sleep(nanoseconds: 4_000_000_000)
+            try await Task.sleep(nanoseconds: UInt64(duration * 1_000_000_000))
             withAnimation(.easeInOut(duration: 0.2)) {
                 messages.removeAll { $0.id == id }
             }
@@ -84,7 +124,7 @@ public class ToastController: ObservableObject {
 @Reducer
 public struct Toast {
     public typealias Message = ToastController.Message
-    
+
     @ObservableState
     public struct State: Equatable {
         var isObservingToastController = false