Update Preference Change Main Actor Usage

StanfordBDHG · Jan 12, 2025 · 87de80c · 87de80c
1 parent 6ead6dc
commit 87de80c
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 22 deletions.
diff --git a/Package.swift b/Package.swift
@@ -25,7 +25,9 @@ let package = Package(
         .library(name: "ResearchKitSwiftUI", targets: ["ResearchKitSwiftUI"]),
         .library(name: "ResearchKitSwiftUIBridge", targets: ["ResearchKitSwiftUIBridge"])
     ],
-    dependencies: [] + swiftLintPackage(),
+    dependencies: [
+        .package(url: "https://github.com/StanfordSpezi/SpeziFoundation.git", from: "2.0.1"),
+    ] + swiftLintPackage(),
     targets: [
         .binaryTarget(
             name: "ResearchKit",
@@ -42,7 +44,8 @@ let package = Package(
         .target(
             name: "ResearchKitSwiftUI",
             dependencies: [
-                .target(name: "ResearchKit")
+                .target(name: "ResearchKit"),
+                .product(name: "SpeziFoundation", package: "SpeziFoundation")
             ],
             path: "ResearchKitSwiftUI"
         ),

diff --git a/ResearchKitSwiftUI/ResearchForm.swift b/ResearchKitSwiftUI/ResearchForm.swift
@@ -28,6 +28,7 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import SpeziFoundation
 import SwiftUI
 
 /// Manages the navigation between steps in a survey.
@@ -169,16 +170,20 @@ public struct ResearchFormStep<Header: View, Content: View>: View {
                             question
                         }
                     }
-                    .onPreferenceChange(QuestionRequiredPreferenceKey.self) {
-                        if $0 == true {
-                            requiredQuestions.insert(question.id)
+                    .onPreferenceChange(QuestionRequiredPreferenceKey.self) { value in
+                        runOrScheduleOnMainActor {
+                            if value {
+                                requiredQuestions.insert(question.id)
+                            }
                         }
                     }
-                    .onPreferenceChange(QuestionAnsweredPreferenceKey.self) {
-                        if $0 == true {
-                            answeredQuestions.insert(question.id)
-                        } else {
-                            answeredQuestions.remove(question.id)
+                    .onPreferenceChange(QuestionAnsweredPreferenceKey.self) { value in
+                        runOrScheduleOnMainActor {
+                            if value {
+                                answeredQuestions.insert(question.id)
+                            } else {
+                                answeredQuestions.remove(question.id)
+                            }
                         }
                     }
                     .onAppear {
@@ -197,9 +202,10 @@ public struct ResearchFormStep<Header: View, Content: View>: View {
         #if os(iOS)
             .frame(maxWidth: .infinity, alignment: .leading)
         #endif
-        .onPreferenceChange(QuestionCardPreferenceKey.self) {
-            shouldWrapInQuestionCard in
-            self.shouldWrapInQuestionCard = shouldWrapInQuestionCard
+        .onPreferenceChange(QuestionCardPreferenceKey.self) { shouldWrapInQuestionCard in
+            runOrScheduleOnMainActor {
+                self.shouldWrapInQuestionCard = shouldWrapInQuestionCard
+            }
         }
     }
 

diff --git a/ResearchKitSwiftUI/ResearchFormStepContentView.swift b/ResearchKitSwiftUI/ResearchFormStepContentView.swift
@@ -28,6 +28,7 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import SpeziFoundation
 import SwiftUI
 
 struct ResearchFormStepContentView<Content: View>: View {
@@ -55,8 +56,10 @@ struct ResearchFormStepContentView<Content: View>: View {
     var body: some View {
         StickyScrollView {
             content
-                .onPreferenceChange(StepCompletedPreferenceKey.self) {
-                    doneButtonEnabled = $0
+                .onPreferenceChange(StepCompletedPreferenceKey.self) { value in
+                    runOrScheduleOnMainActor {
+                        doneButtonEnabled = value
+                    }
                 }
                 .padding()
                 #if !os(watchOS)

diff --git a/...ftUI/ResearchKitSwiftUI/Step Views/Question Views/Supporting Views/StickyScrollView.swift b/...ftUI/ResearchKitSwiftUI/Step Views/Question Views/Supporting Views/StickyScrollView.swift
@@ -28,6 +28,7 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import SpeziFoundation
 import SwiftUI
 
 /// A vertical ScrollView with a sticky footer, that returns to flow inline if
@@ -224,19 +225,25 @@ struct StickyScrollView<BodyContent: View, FooterContent: View>: View {
             }
             .coordinateSpace(name: scrollCoordinateSpace)
             .onPreferenceChange(FrameSizeKey.self) { value in
-                self.frameSize = value
+                runOrScheduleOnMainActor {
+                    self.frameSize = value
+                }
             }
             .onPreferenceChange(SafeAreaInsetsKey.self) { value in
-                self.safeAreaInsets = value
+                runOrScheduleOnMainActor {
+                    self.safeAreaInsets = value
+                }
             }
             .onPreferenceChange(KeyboardIgnoringSafeAreaInsets.self) { value in
-                self.keyboardIgnoringSafeAreaInsets = value
+                runOrScheduleOnMainActor {
+                    self.keyboardIgnoringSafeAreaInsets = value
+                }
             }
-            .onPreferenceChange(
-                BodySizeKey.self,
-                perform: { value in
+            .onPreferenceChange(BodySizeKey.self) { value in
+                runOrScheduleOnMainActor {
                     self.bodySize = value
-                })
+                }
+            }
         }
     }
 }