Update SwiftUI Navigation to support new alert mappings (#1865)

* wip

* wip

* wip

* Bump

* Update AlertStateUIKit.swift

(cherry picked from commit 63972fa9ea670405011ddc76a09f11e924341fca)

# Conflicts:
#	ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Package.resolved

Author: stephencelis

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -25,7 +25,7 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.6.0"),
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.1.2"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "0.4.1"),
-    .package(url: "https://github.com/pointfreeco/swiftui-navigation", from: "0.4.5"),
+    .package(url: "https://github.com/pointfreeco/swiftui-navigation", from: "0.6.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.5.0"),
   ],
   targets: [

Package.resolved

@@ -45,7 +45,11 @@ private struct NewAlertModifier<Action>: ViewModifier {
       presenting: viewStore.state,
       actions: {
         ForEach($0.buttons) {
-          Button($0) { viewStore.send($0) }
+          Button($0) { action in
+            if let action = action {
+              viewStore.send(action)
+            }
+          }
         }
       },
       message: { $0.message.map { Text($0) } }
@@ -59,7 +63,11 @@ private struct OldAlertModifier<Action>: ViewModifier {
 
   func body(content: Content) -> some View {
     content.alert(item: viewStore.binding(send: dismiss)) { state in
-      Alert(state) { viewStore.send($0) }
+      Alert(state) { action in
+        if let action = action {
+          viewStore.send(action)
+        }
+      }
     }
   }
 }

Package.swift

@@ -53,7 +53,11 @@ private struct NewConfirmationDialogModifier<Action>: ViewModifier {
       presenting: viewStore.state,
       actions: {
         ForEach($0.buttons) {
-          Button($0, action: { viewStore.send($0) })
+          Button($0) { action in
+            if let action = action {
+              viewStore.send(action)
+            }
+          }
         }
       },
       message: { $0.message.map { Text($0) } }
@@ -72,7 +76,11 @@ private struct OldConfirmationDialogModifier<Action>: ViewModifier {
   func body(content: Content) -> some View {
     #if !os(macOS)
       return content.actionSheet(item: viewStore.binding(send: dismiss)) {
-        ActionSheet($0) { viewStore.send($0) }
+        ActionSheet($0) { action in
+          if let action = action {
+            viewStore.send(action)
+          }
+        }
       }
     #else
       return EmptyView()

Sources/ComposableArchitecture/SwiftUI/Alert.swift

@@ -40,7 +40,7 @@
     ///   - send: A function that wraps an alert action in the view store's action type.
     public convenience init<Action>(
       state: AlertState<Action>,
-      send: @escaping (Action) -> Void
+      send: @escaping (Action?) -> Void
     ) {
       self.init(
         title: String(state: state.title),
@@ -58,7 +58,7 @@
     ///   - state: The state of dialog that can be shown to the user.
     ///   - send: A function that wraps a dialog action in the view store's action type.
     public convenience init<Action>(
-      state: ConfirmationDialogState<Action>, send: @escaping (Action) -> Void
+      state: ConfirmationDialogState<Action>, send: @escaping (Action?) -> Void
     ) {
       self.init(
         title: String(state: state.title),
@@ -74,7 +74,7 @@
   @available(macOS, unavailable)
   @available(watchOS, unavailable)
   extension UIAlertAction.Style {
-    init<Action>(_ role: ButtonState<Action>.Role) {
+    init(_ role: ButtonStateRole) {
       switch role {
       case .cancel:
         self = .cancel
@@ -89,13 +89,14 @@
   extension UIAlertAction {
     convenience init<Action>(
       _ button: ButtonState<Action>,
-      action: @escaping (Action) -> Void
+      action handler: @escaping (Action?) -> Void
     ) {
       self.init(
         title: String(state: button.label),
-        style: button.role.map(UIAlertAction.Style.init) ?? .default,
-        handler: button.action.map { _ in { _ in button.withAction(action) } }
-      )
+        style: button.role.map(UIAlertAction.Style.init) ?? .default
+      ) { _ in
+        button.withAction(handler)
+      }
     }
   }
 #endif