Support toast namespace

Author: intitni

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEdit.swift

@@ -1,4 +1,5 @@
 import AIModel
+import Toast
 import ComposableArchitecture
 import Dependencies
 import Keychain
@@ -40,7 +41,12 @@ struct ChatModelEdit: ReducerProtocol {
         case baseURLSelection(BaseURLSelection.Action)
     }
 
-    @Dependency(\.toast) var toast
+    var toast: (String, ToastType) -> Void {
+        @Dependency(\.namespacedToast) var toast
+        return {
+            toast($0, $1, "ChatModelEdit")
+        }
+    }
     @Dependency(\.apiKeyKeychain) var keychain
 
     var body: some ReducerProtocol<State, Action> {

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEditView.swift

@@ -71,6 +71,7 @@ struct ChatModelEditView: View {
             store.send(.appear)
         }
         .fixedSize(horizontal: false, vertical: true)
+        .handleToast(namespace: "ChatModelEdit")
     }
 
     var nameTextField: some View {

Core/Sources/HostApp/AccountSettings/EmbeddingModelManagement/EmbeddingModelEdit.swift

@@ -1,4 +1,5 @@
 import AIModel
+import Toast
 import ComposableArchitecture
 import Dependencies
 import Keychain
@@ -39,7 +40,12 @@ struct EmbeddingModelEdit: ReducerProtocol {
         case baseURLSelection(BaseURLSelection.Action)
     }
 
-    @Dependency(\.toast) var toast
+    var toast: (String, ToastType) -> Void {
+        @Dependency(\.namespacedToast) var toast
+        return {
+            toast($0, $1, "EmbeddingModelEdit")
+        }
+    }
     @Dependency(\.apiKeyKeychain) var keychain
 
     var body: some ReducerProtocol<State, Action> {

Core/Sources/HostApp/AccountSettings/EmbeddingModelManagement/EmbeddingModelEditView.swift

@@ -66,6 +66,7 @@ struct EmbeddingModelEditView: View {
             store.send(.appear)
         }
         .fixedSize(horizontal: false, vertical: true)
+        .handleToast(namespace: "EmbeddingModelEdit")
     }
 
     var nameTextField: some View {

Core/Sources/HostApp/HandleToast.swift

@@ -0,0 +1,49 @@
+import Dependencies
+import SwiftUI
+import Toast
+
+struct ToastHandler: View {
+    @ObservedObject var toastController: ToastController
+    let namespace: String?
+
+    init(toastController: ToastController, namespace: String?) {
+        _toastController = .init(wrappedValue: toastController)
+        self.namespace = namespace
+    }
+
+    var body: some View {
+        VStack(spacing: 4) {
+            ForEach(toastController.messages) { message in
+                if let n = message.namespace, n != namespace {
+                    EmptyView()
+                } else {
+                    message.content
+                        .foregroundColor(.white)
+                        .padding(8)
+                        .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))
+                        .shadow(color: Color.black.opacity(0.2), radius: 4)
+                }
+            }
+        }
+        .padding()
+        .allowsHitTesting(false)
+    }
+}
+
+extension View {
+    func handleToast(namespace: String? = nil) -> some View {
+        @Dependency(\.toastController) var toastController
+        return overlay(alignment: .bottom) {
+            ToastHandler(toastController: toastController, namespace: namespace)
+        }.environment(\.toast) { [toastController] content, type in
+            toastController.toast(content: content, type: type, namespace: namespace)
+        }
+    }
+}
+

Core/Sources/HostApp/TabContainer.swift

@@ -75,33 +75,12 @@ public struct TabContainer: View {
             }
             .environment(\.tabBarTabTag, tag)
             .frame(minHeight: 400)
-            .overlay(alignment: .bottom) {
-                VStack(spacing: 4) {
-                    ForEach(toastController.messages) { message in
-                        message.content
-                            .foregroundColor(.white)
-                            .padding(8)
-                            .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))
-                            .shadow(color: Color.black.opacity(0.2), radius: 4)
-                    }
-                }
-                .padding()
-                .allowsHitTesting(false)
-            }
         }
         .focusable(false)
         .padding(.top, 8)
         .background(.ultraThinMaterial.opacity(0.01))
         .background(Color(nsColor: .controlBackgroundColor).opacity(0.4))
-        .environment(\.toast) { [toastController] content, type in
-            toastController.toast(content: content, type: type)
-        }
+        .handleToast()
         .onPreferenceChange(TabBarItemPreferenceKey.self) { items in
             tabBarItems = items
         }

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -70,7 +70,7 @@ public extension SuggestionWidgetController {
     }
 
     func presentError(_ errorDescription: String) {
-        store.send(.toastPanel(.toast(.toast(errorDescription, .error))))
+        store.send(.toastPanel(.toast(.toast(errorDescription, .error, nil))))
     }
 
     func presentChatRoom() {

Tool/Sources/Toast/Toast.swift

@@ -30,15 +30,28 @@ public extension DependencyValues {
         set { self[ToastControllerDependencyKey.self] = newValue }
     }
 
-    var toast: (String, ToastType) -> Void { toastController.toast }
+    var toast: (String, ToastType) -> Void {
+        return { content, type in
+            toastController.toast(content: content, type: type, namespace: nil)
+        }
+    }
+
+    var namespacedToast: (String, ToastType, String) -> Void {
+        return {
+            content, type, namespace in
+            toastController.toast(content: content, type: type, namespace: namespace)
+        }
+    }
 }
 
 public class ToastController: ObservableObject {
     public struct Message: Identifiable, Equatable {
+        public var namespace: String?
         public var id: UUID
         public var type: ToastType
         public var content: Text
-        public init(id: UUID, type: ToastType, content: Text) {
+        public init(id: UUID, type: ToastType, namespace: String? = nil, content: Text) {
+            self.namespace = namespace
             self.id = id
             self.type = type
             self.content = content
@@ -51,9 +64,9 @@ public class ToastController: ObservableObject {
         self.messages = messages
     }
 
-    public func toast(content: String, type: ToastType) {
+    public func toast(content: String, type: ToastType, namespace: String? = nil) {
         let id = UUID()
-        let message = Message(id: id, type: type, content: Text(content))
+        let message = Message(id: id, type: type, namespace: namespace, content: Text(content))
 
         Task { @MainActor in
             withAnimation(.easeInOut(duration: 0.2)) {
@@ -73,7 +86,7 @@ public struct Toast: ReducerProtocol {
     public struct State: Equatable {
         var isObservingToastController = false
         public var messages: [Message] = []
-        
+
         public init(messages: [Message] = []) {
             self.messages = messages
         }
@@ -82,13 +95,13 @@ public struct Toast: ReducerProtocol {
     public enum Action: Equatable {
         case start
         case updateMessages([Message])
-        case toast(String, ToastType)
+        case toast(String, ToastType, String?)
     }
 
     @Dependency(\.toastController) var toastController
 
     struct CancelID: Hashable {}
-    
+
     public init() {}
 
     public var body: some ReducerProtocol<State, Action> {
@@ -114,8 +127,8 @@ public struct Toast: ReducerProtocol {
             case let .updateMessages(messages):
                 state.messages = messages
                 return .none
-            case let .toast(content, type):
-                toastController.toast(content: content, type: type)
+            case let .toast(content, type, namespace):
+                toastController.toast(content: content, type: type, namespace: namespace)
                 return .none
             }
         }