[Swift 6] Fully enable "StrictConcurrency"

Author: Walker Haynes

Package.swift

@@ -43,7 +43,10 @@ let package = Package(
         .target(
             name: "Grape",
             dependencies: ["ForceSimulation"],
-            path: "Sources/Grape"
+            path: "Sources/Grape",
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency")
+            ]
                 // link ForceSimulation in release mode
                 // swiftSettings: [.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])]
         ),

Sources/Grape/Modifiers/GraphForegroundScale.swift

@@ -3,11 +3,12 @@ import SwiftUI
 @usableFromInline
 enum GrapeEnvironment { }
 
+
 extension GrapeEnvironment {
     @usableFromInline
     struct GraphForegroundScale: EnvironmentKey {
         @usableFromInline
-        static let defaultValue: [AnyHashable: GraphicsContext.Shading] = [:]
+        static nonisolated(unsafe) let defaultValue: [AnyHashable: GraphicsContext.Shading] = [:]
     }
 }
 

Sources/Grape/Views/ForceDirectedGraph+Gesture.swift

@@ -2,6 +2,7 @@ import ForceSimulation
 import SwiftUI
 
 #if !os(tvOS)
+    @MainActor
     extension ForceDirectedGraph {
         @inlinable
         static var minimumAlphaAfterDrag: CGFloat { 0.5 }
@@ -78,7 +79,7 @@ import SwiftUI
         @inlinable
         static var minimumDragDistance: CGFloat { 3.0 }
     }
-
+    @MainActor
     extension ForceDirectedGraph {
         @inlinable
         internal func onTapGesture(
@@ -92,7 +93,7 @@ import SwiftUI
 #endif
 
 #if os(iOS) || os(macOS)
-    extension ForceDirectedGraph {
+    @MainActor extension ForceDirectedGraph {
 
         @inlinable
         static var minimumScaleDelta: CGFloat { 0.001 }
@@ -180,6 +181,7 @@ import SwiftUI
     }
 #endif
 
+@MainActor
 extension ForceDirectedGraph {
     @inlinable
     public func onTicked(

Sources/Grape/Views/ForceDirectedGraph+View.swift

@@ -1,6 +1,7 @@
 import ForceSimulation
 import SwiftUI
 
+@MainActor
 extension ForceDirectedGraph: View {
 
     @inlinable

Sources/Grape/Views/ForceDirectedGraph.swift

@@ -75,6 +75,7 @@ where NodeID == Content.NodeID {
     ///     initial kinetic states. This is only applied on the new nodes that is not seen before when the
     ///     graph is created (or updated).
     @inlinable
+    @MainActor
     public init(
         states: ForceDirectedGraphState = ForceDirectedGraphState(),
         ticksPerSecond: Double = 60.0,

Sources/Grape/Views/ForceDirectedGraphModel.swift

@@ -4,6 +4,7 @@ import Observation
 import SwiftUI
 
 // @Observable
+@MainActor
 public final class ForceDirectedGraphModel<Content: GraphContent> {
 
     @usableFromInline
@@ -28,8 +29,8 @@ public final class ForceDirectedGraphModel<Content: GraphContent> {
     //     }
     // }
 
-//    @usableFromInline
-//    internal var _modelTransformExtenalBinding: Binding<ViewportTransform>
+    //    @usableFromInline
+    //    internal var _modelTransformExtenalBinding: Binding<ViewportTransform>
 
     @inlinable
     internal var modelTransform: ViewportTransform {
@@ -127,6 +128,7 @@ public final class ForceDirectedGraphModel<Content: GraphContent> {
     let ticksPerSecond: Double
 
     @usableFromInline
+    @MainActor
     var scheduledTimer: Timer? = nil
 
     @usableFromInline
@@ -228,7 +230,7 @@ public final class ForceDirectedGraphModel<Content: GraphContent> {
         withObservationTracking { [weak self] in
             guard let self else { return }
             self.updateModelRunningState(isRunning: self.stateMixinRef.isRunning)
-        } onChange: { [weak self] in
+        } onChange: { @Sendable [weak self] in
             guard let self else { return }
             Task { @MainActor [weak self] in
                 self?.continuouslyTrackingRunning()
@@ -266,7 +268,8 @@ public final class ForceDirectedGraphModel<Content: GraphContent> {
 
     @inlinable
     deinit {
-        self.stop()
+        self.scheduledTimer?.invalidate()
+        self.scheduledTimer = nil
     }
 
     @usableFromInline
@@ -294,26 +297,30 @@ extension StrokeStyle {
 }
 
 // Render related
+@MainActor
 extension ForceDirectedGraphModel {
 
     @inlinable
-    // @MainActor
     func start(minAlpha: Double = 0.6) {
         guard self.scheduledTimer == nil else { return }
         print("Simulation started")
         if simulationContext.storage.kinetics.alpha < minAlpha {
             simulationContext.storage.kinetics.alpha = minAlpha
         }
+
         self.scheduledTimer = Timer.scheduledTimer(
             withTimeInterval: 1.0 / ticksPerSecond,
             repeats: true
         ) { [weak self] _ in
-            self?.tick()
+            if let capturedSelf = self {
+                Task { @MainActor [weak capturedSelf] in
+                    capturedSelf?.tick()
+                }
+            }
         }
     }
 
     @inlinable
-    // @MainActor
     func tick() {
         withMutation(keyPath: \.currentFrame) {
             simulationContext.storage.tick()
@@ -323,15 +330,13 @@ extension ForceDirectedGraphModel {
     }
 
     @inlinable
-    // @MainActor
     func stop() {
         print("Simulation stopped")
         self.scheduledTimer?.invalidate()
         self.scheduledTimer = nil
     }
 
     @inlinable
-    @MainActor
     func render(
         _ graphicsContext: inout GraphicsContext,
         _ size: CGSize