Merge pull request #115 from UbiqueInnovation/fix-on-preference-chang…

…e-for-xcode-16-2 Fix onPreferenceChange modifier on Xcode 16.2
UbiqueInnovation · Jan 1, 2025 · 9767a49 · 9767a49
2 parents 7edaf15 + de420bc
commit 9767a49
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 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
@@ -8,6 +8,7 @@
 #if arch(arm64) || arch(x86_64)
 
 import Foundation
+import UBFoundation
 import SwiftUI
 
 public struct UBPopupWrapper<V: View>: View {
@@ -25,13 +26,28 @@ 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)
+                if Thread.isMainThread {
+                    MainActor.assumeIsolated {
+                        popupPreferenceChanged(popupPreference: popupPreference)
+                    }
                 } else {
-                    UBPopupWindowManager.shared.hideWindow()
+                    Log.reportError("onPreferenceChange called on non-main thread")
+                    DispatchQueue.main.async {
+                        MainActor.assumeIsolated {
+                            popupPreferenceChanged(popupPreference: popupPreference)
+                        }
+                    }
                 }
             }
     }
+
+    private func popupPreferenceChanged(popupPreference: UBPopupPreference?) {
+        if let popupPreference, popupPreference.isPresented.wrappedValue {
+            UBPopupWindowManager.shared.showPopup(isPresented: popupPreference.isPresented, style: popupPreference.customStyle ?? style, content: popupPreference.content)
+        } else {
+            UBPopupWindowManager.shared.hideWindow()
+        }
+    }
 }
 
 #endif