works

pointfreeco · Aug 22, 2024 · f2eb2d5 · f2eb2d5
1 parent 6d0d1d0
commit f2eb2d5
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 61 deletions.
diff --git a/Sources/SwiftNavigation/Observe.swift b/Sources/SwiftNavigation/Observe.swift
@@ -135,24 +135,7 @@ private func onChange(
     apply(.current)
   } onChange: {
     task(.current) {
-      onChange(apply) { transaction, operation in
-        var perform: @Sendable () -> Void = {
-          task(transaction, operation)
-        }
-        for value in transaction.storage.keys {
-          @Sendable func open<K: PerformKey>(_: K.Type, operation: @escaping @Sendable () -> Void) {
-            K.perform(transaction: transaction) {
-              operation()
-            }
-          }
-          if let type = value.keyType as? any PerformKey.Type {
-            perform = { [perform] in
-              open(type, operation: perform)
-            }
-          }
-        }
-        perform()
-      }
+      onChange(apply, task: task)
     }
   }
 }

diff --git a/Sources/SwiftNavigation/UITransaction.swift b/Sources/SwiftNavigation/UITransaction.swift
@@ -36,7 +36,7 @@ public func withUITransaction<R, V>(
 public struct UITransaction: Sendable {
   @TaskLocal package static var current = Self()
 
-  var storage: [Key: any Sendable] = [:]
+  private var storage: [Key: any Sendable] = [:]
 
   /// Creates a transaction.
   public init() {}
@@ -68,7 +68,7 @@ public struct UITransaction: Sendable {
     storage.isEmpty
   }
 
-  struct Key: Hashable {
+  private struct Key: Hashable {
     let keyType: Any.Type
     init<K: UITransactionKey>(_ keyType: K.Type) {
       self.keyType = keyType
@@ -93,9 +93,18 @@ public protocol UITransactionKey {
   static var defaultValue: Value { get }
 }
 
-public protocol PerformKey: UITransactionKey, Sendable {
-  static func perform(
-    transaction: UITransaction,
-    operation: @escaping @Sendable () -> Void
-  )
+
+extension UITransaction {
+  public var perform: @Sendable (UITransaction, @Sendable () -> Void) -> Void {
+    get {
+      self[PerformTransactionKey.self]
+    }
+    set {
+      self[PerformTransactionKey.self] = newValue
+    }
+  }
+}
+
+private enum PerformTransactionKey: UITransactionKey {
+  static let defaultValue: @Sendable (UITransaction, @Sendable () -> Void) -> Void = { $1() }
 }
diff --git a/Sources/UIKitNavigation/Observe.swift b/Sources/UIKitNavigation/Observe.swift
@@ -127,7 +127,36 @@
         }
       } task: { transaction, work in
         DispatchQueue.main.async {
-          withUITransaction(transaction, work)
+          withUITransaction(transaction) {
+            MainActor._assumeIsolated {
+              #if os(watchOS)
+                apply(transaction)
+              #else
+                if transaction.uiKit.disablesAnimations {
+                  UIView.performWithoutAnimation { work() }
+                  for completion in transaction.uiKit.animationCompletions {
+                    completion(true)
+                  }
+                } else if let animation = transaction.uiKit.animation {
+                  return animation.perform(
+                    { work() },
+                    completion: transaction.uiKit.animationCompletions.isEmpty
+                      ? nil
+                      : {
+                        for completion in transaction.uiKit.animationCompletions {
+                          completion($0)
+                        }
+                      }
+                  )
+                } else {
+                  work()
+                  for completion in transaction.uiKit.animationCompletions {
+                    completion(true)
+                  }
+                }
+              #endif
+            }
+          }
         }
       }
       tokens.append(token)

diff --git a/Sources/UIKitNavigation/UITransaction.swift b/Sources/UIKitNavigation/UITransaction.swift
@@ -1,7 +1,6 @@
 #if canImport(UIKit) && !os(watchOS)
 
 import UIKit
-import SwiftNavigation
 
   extension UITransaction {
     /// Creates a transaction and assigns its animation property.
@@ -17,50 +16,43 @@ import SwiftNavigation
       get { self[UIKitKey.self] }
       set {
         self[UIKitKey.self] = newValue
-//        self.perform = { transaction, work in
-//
-//        }
-      }
-    }
-
-    private enum UIKitKey: UITransactionKey, PerformKey {
-      static let defaultValue = UIKit()
-
-      public static func perform(
-        transaction: UITransaction,
-        operation: @escaping @Sendable () -> Void
-      ) {
-        MainActor._assumeIsolated {
+        self.perform = { transaction, work in
+          MainActor._assumeIsolated {
 #if os(watchOS)
-          //apply(transaction)
+            //apply(transaction)
 #else
-          if transaction.uiKit.disablesAnimations {
-            UIView.performWithoutAnimation { operation() }
-            for completion in transaction.uiKit.animationCompletions {
-              completion(true)
-            }
-          } else if let animation = transaction.uiKit.animation {
-            return animation.perform(
-              { operation() },
-              completion: transaction.uiKit.animationCompletions.isEmpty
-              ? nil
-              : {
-                for completion in transaction.uiKit.animationCompletions {
-                  completion($0)
+            if transaction.uiKit.disablesAnimations {
+              UIView.performWithoutAnimation { work() }
+              for completion in transaction.uiKit.animationCompletions {
+                completion(true)
+              }
+            } else if let animation = transaction.uiKit.animation {
+              return animation.perform(
+                { work() },
+                completion: transaction.uiKit.animationCompletions.isEmpty
+                ? nil
+                : {
+                  for completion in transaction.uiKit.animationCompletions {
+                    completion($0)
+                  }
                 }
+              )
+            } else {
+              work()
+              for completion in transaction.uiKit.animationCompletions {
+                completion(true)
               }
-            )
-          } else {
-            operation()
-            for completion in transaction.uiKit.animationCompletions {
-              completion(true)
             }
-          }
 #endif
+          }
         }
       }
     }
 
+    private enum UIKitKey: UITransactionKey {
+      static let defaultValue = UIKit()
+    }
+
     /// UIKit-specific data associated with a ``UITransaction``.
     public struct UIKit: Sendable {
       /// The animation, if any, associated with the current state change.