Relax preview traits sendability. (#299)

pointfreeco · Nov 9, 2024 · e84352a · e84352a
1 parent 26b95e1
commit e84352a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/Sources/Dependencies/DependencyValues.swift b/Sources/Dependencies/DependencyValues.swift
@@ -545,7 +545,11 @@ public final class CachedValues: @unchecked Sendable {
         case .preview:
           if !CachedValues.isAccessingCachedDependencies {
             value = CachedValues.$isAccessingCachedDependencies.withValue(true) {
-              previewValues.withValue { $0[key] }
+              #if compiler(>=6)
+                return previewValues[key]
+              #else
+                return Key.previewValue
+              #endif
             }
           } else {
             value = Key.previewValue

diff --git a/Sources/Dependencies/Traits/PreviewTrait.swift b/Sources/Dependencies/Traits/PreviewTrait.swift
@@ -19,7 +19,7 @@
     /// - Parameters:
     ///   - keyPath: A key path to a dependency value.
     ///   - value: A dependency value to override for the lifetime of the preview.
-    public static func dependency<Value: Sendable>(
+    public static func dependency<Value>(
       _ keyPath: WritableKeyPath<DependencyValues, Value> & Sendable,
       _ value: Value
     ) -> PreviewTrait {
@@ -45,14 +45,12 @@
     /// - Parameter updateValuesForPreview: A closure for updating the current dependency values for
     ///   the lifetime of the preview.
     public static func dependencies(
-      _ updateValuesForPreview: @Sendable (inout DependencyValues) -> Void
+      _ updateValuesForPreview: (inout DependencyValues) -> Void
     ) -> PreviewTrait {
-      previewValues.withValue {
-        updateValuesForPreview(&$0)
-      }
+      updateValuesForPreview(&previewValues)
       return PreviewTrait()
     }
   }
-#endif
 
-let previewValues = LockIsolated(DependencyValues(context: .preview))
+  nonisolated(unsafe) var previewValues = DependencyValues(context: .preview)
+#endif