add sugar for passing Action as View callback

square · Jun 22, 2023 · 3039076 · 3039076
1 parent c78d2ea
commit 3039076
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Samples/TicTacToe/Sources/Authentication/LoginScreen.swift b/Samples/TicTacToe/Sources/Authentication/LoginScreen.swift
@@ -44,10 +44,10 @@ struct LoginScreen: SwiftUIScreen, Equatable {
                     get: \.password,
                     set: Action.passwordUpdated
                 ),
-                onCommit: { model.value.actionSink.send(.login) }
+                onCommit: model.action(.login)
             )
 
-            Button("Login", action: { model.value.actionSink.send(.login) })
+            Button("Login", action: model.action(.login))
         }
         .frame(maxWidth: 400)
     }

diff --git a/WorkflowSwiftUI/Sources/ObservableValue.swift b/WorkflowSwiftUI/Sources/ObservableValue.swift
@@ -104,3 +104,14 @@ public final class ObservableValue<Value>: ObservableObject {
         return subject.removeDuplicates(by: isDuplicate).eraseToAnyPublisher()
     }
 }
+
+#if canImport(UIKit)
+
+public extension ObservableValue where Value: SwiftUIScreen {
+    func action(_ action: Value.Action) -> () -> Void {
+        // TODO: Should this closure capture the current `actionSink` instead?
+        { [weak self] in self?.value.actionSink.send(action) }
+    }
+}
+
+#endif