Fix onPreferenceChange modifier on Xcode 16.2

UbiqueInnovation · Dec 13, 2024 · f96a75c · f96a75c
1 parent 7edaf15
commit f96a75c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Sources/UBUserInterface/SwiftUI/Popup/UBPopupPreferenceKey.swift b/Sources/UBUserInterface/SwiftUI/Popup/UBPopupPreferenceKey.swift
@@ -20,6 +20,7 @@ struct UBPopupPreferenceKey: PreferenceKey {
     }
 }
 
+@MainActor
 struct UBPopupPreference: Equatable {
     let id = UUID()
     let isPresented: Binding<Bool>
@@ -36,7 +37,7 @@ struct UBPopupPreference: Equatable {
         self.content = content
     }
 
-    static func == (lhs: UBPopupPreference, rhs: UBPopupPreference) -> Bool {
+    nonisolated static func == (lhs: UBPopupPreference, rhs: UBPopupPreference) -> Bool {
         lhs.id == rhs.id
             && lhs.isPresented.wrappedValue == rhs.isPresented.wrappedValue
             && lhs.date == rhs.date

diff --git a/Sources/UBUserInterface/SwiftUI/Popup/UBPopupStyle.swift b/Sources/UBUserInterface/SwiftUI/Popup/UBPopupStyle.swift
@@ -9,7 +9,7 @@
 
 import SwiftUI
 
-public struct UBPopupStyle: Equatable {
+public struct UBPopupStyle: Equatable, Sendable {
     let extendsToEdges: Bool
     let backgroundColor: Color
     let backdropColor: Color

diff --git a/Sources/UBUserInterface/SwiftUI/Popup/UBPopupWrapper.swift b/Sources/UBUserInterface/SwiftUI/Popup/UBPopupWrapper.swift
@@ -25,10 +25,12 @@ public struct UBPopupWrapper<V: View>: View {
                 UBPopupWindowManager.shared.setupWindow()
             }
             .onPreferenceChange(UBPopupPreferenceKey.self) { popupPreference in
-                if let popupPreference, popupPreference.isPresented.wrappedValue {
-                    UBPopupWindowManager.shared.showPopup(isPresented: popupPreference.isPresented, style: popupPreference.customStyle ?? style, content: popupPreference.content)
-                } else {
-                    UBPopupWindowManager.shared.hideWindow()
+                DispatchQueue.main.async {
+                    if let popupPreference, popupPreference.isPresented.wrappedValue {
+                        UBPopupWindowManager.shared.showPopup(isPresented: popupPreference.isPresented, style: popupPreference.customStyle ?? style, content: popupPreference.content)
+                    } else {
+                        UBPopupWindowManager.shared.hideWindow()
+                    }
                 }
             }
     }