Merge branch 'navigation-beta' into prerelease/1.0

Author: stephencelis

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,6 +21,7 @@
 		CAF5802329A564590042FB62 /* TestCases.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAF57FFC29A564210042FB62 /* TestCases.framework */; };
 		CAF5802529A5651D0042FB62 /* PresentationTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF5802429A5651D0042FB62 /* PresentationTestCase.swift */; };
 		CAF5802729A567BB0042FB62 /* PresentationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF5802629A567BB0042FB62 /* PresentationTests.swift */; };
+		CAF8595829BF8882008721D4 /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = CAF8595729BF8882008721D4 /* SwiftUINavigation */; };
 		E9919D3E296E28C800C8716B /* EscapedWithViewStoreTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9919D3D296E28C800C8716B /* EscapedWithViewStoreTestCase.swift */; };
 		E9919D40296E3EF400C8716B /* EscapedWithViewStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9919D3F296E3EF400C8716B /* EscapedWithViewStoreTests.swift */; };
 		E9919D42296E47A400C8716B /* BindingsAnimationsTestBench.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9919D41296E47A400C8716B /* BindingsAnimationsTestBench.swift */; };
@@ -91,6 +92,7 @@
 			files = (
 				CAF5801C29A564440042FB62 /* TestCases.framework in Frameworks */,
 				CA595278296DF67E00B5B695 /* ComposableArchitecture in Frameworks */,
+				CAF8595829BF8882008721D4 /* SwiftUINavigation in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -214,6 +216,7 @@
 			name = Integration;
 			packageProductDependencies = (
 				CA595277296DF67E00B5B695 /* ComposableArchitecture */,
+				CAF8595729BF8882008721D4 /* SwiftUINavigation */,
 			);
 			productName = Integration;
 			productReference = CAA1CAF1296DEE78000665B1 /* Integration.app */;
@@ -287,6 +290,9 @@
 				Base,
 			);
 			mainGroup = CAA1CAE8296DEE78000665B1;
+			packageReferences = (
+				CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */,
+			);
 			productRefGroup = CAA1CAF2296DEE78000665B1 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -685,6 +691,17 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCRemoteSwiftPackageReference section */
+		CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/pointfreeco/swiftui-navigation.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.5.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
 		CA595277296DF67E00B5B695 /* ComposableArchitecture */ = {
 			isa = XCSwiftPackageProductDependency;
@@ -694,6 +711,11 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = ComposableArchitecture;
 		};
+		CAF8595729BF8882008721D4 /* SwiftUINavigation */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */;
+			productName = SwiftUINavigation;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = CAA1CAE9296DEE78000665B1 /* Project object */;

Examples/Integration/Integration.xcodeproj/project.pbxproj

@@ -1,5 +1,6 @@
 @preconcurrency import ComposableArchitecture
 import SwiftUI
+import SwiftUINavigation
 
 private struct PresentationTestCase: Reducer {
   struct State: Equatable {
@@ -8,6 +9,7 @@ private struct PresentationTestCase: Reducer {
   }
   enum Action: Equatable, Sendable {
     case alertButtonTapped
+    case customAlertButtonTapped
     case destination(PresentationAction<Destination.Action>)
     case dialogButtonTapped
     case fullScreenCoverButtonTapped
@@ -20,6 +22,7 @@ private struct PresentationTestCase: Reducer {
   struct Destination: Reducer {
     enum State: Equatable {
       case alert(AlertState<AlertAction>)
+      case customAlert
       case dialog(ConfirmationDialogState<DialogAction>)
       case fullScreenCover(ChildFeature.State)
       case navigationDestination(ChildFeature.State)
@@ -29,6 +32,7 @@ private struct PresentationTestCase: Reducer {
     }
     enum Action: Equatable {
       case alert(AlertAction)
+      case customAlert(AlertAction)
       case dialog(DialogAction)
       case fullScreenCover(ChildFeature.Action)
       case navigationDestination(ChildFeature.Action)
@@ -96,6 +100,9 @@ private struct PresentationTestCase: Reducer {
           }
         )
         return .none
+      case .customAlertButtonTapped:
+        state.destination = .customAlert
+        return .none
       case .destination(.presented(.fullScreenCover(.parentSendDismissActionButtonTapped))),
         .destination(.presented(.sheet(.parentSendDismissActionButtonTapped))),
         .destination(.presented(.popover(.parentSendDismissActionButtonTapped))):
@@ -225,23 +232,26 @@ private struct ChildFeature: Reducer {
 
 struct PresentationTestCaseView: View {
   private let store: StoreOf<PresentationTestCase>
-  @StateObject private var viewStore: ViewStore<String, PresentationTestCase.Action>
+  @StateObject private var viewStore: ViewStore<PresentationTestCase.State, PresentationTestCase.Action>
+  @State var alertMessage = ""
 
   init() {
     let store = Store(
       initialState: PresentationTestCase.State(),
-      reducer: PresentationTestCase()._printChanges()
+      reducer: PresentationTestCase()
+        ._printChanges()
     )
     self.store = store
     self._viewStore = StateObject(
-      wrappedValue: ViewStore(store, observe: { $0.message })
+      wrappedValue: ViewStore(store, observe: { $0 })
     )
   }
 
   var body: some View {
     Form {
       Section {
-        Text(self.viewStore.state)
+        Text(self.viewStore.message)
+        Text(self.alertMessage)
       }
 
       Button("Open alert") {
@@ -254,6 +264,21 @@ struct PresentationTestCaseView: View {
         action: PresentationTestCase.Destination.Action.alert
       )
 
+      Button("Open custom alert") {
+        self.viewStore.send(.customAlertButtonTapped)
+      }
+      .alert(
+        "Custom alert!",
+        isPresented: viewStore
+          .binding(get: \.destination, send: PresentationTestCase.Action.destination(.dismiss))
+          .case(/PresentationTestCase.Destination.State.customAlert)
+          .isPresent()
+      ) {
+        TextField("Message", text: self.$alertMessage)
+        Button("Submit") {}
+        Button("Cancel", role: .cancel) {}
+      }
+
       Button("Open dialog") {
         self.viewStore.send(.dialogButtonTapped)
       }
@@ -370,10 +395,14 @@ private struct NavigationLinkDemoFeature: ReducerProtocol {
   struct State: Equatable {
     var message = ""
     @PresentationState var child: ChildFeature.State?
+    @PresentationState var identifiedChild: ChildFeature.State?
   }
   enum Action: Equatable {
     case child(PresentationAction<ChildFeature.Action>)
+    case identifiedChild(PresentationAction<ChildFeature.Action>)
+    case identifiedNavigationLinkButtonTapped
     case navigationLinkButtonTapped
+    case nonDeadbeefIdentifiedNavigationLinkButtonTapped
   }
   var body: some ReducerProtocolOf<Self> {
     Reduce<State, Action> { state, action in
@@ -390,16 +419,30 @@ private struct NavigationLinkDemoFeature: ReducerProtocol {
       case .child(.presented(.parentSendDismissActionButtonTapped)):
         state.child = nil
         return .none
-      case .child:
+      case .identifiedChild(.presented(.parentSendDismissActionButtonTapped)):
+        state.child = nil
+        return .none
+      case .child, .identifiedChild:
+        return .none
+      case .identifiedNavigationLinkButtonTapped:
+        state.identifiedChild = ChildFeature.State(
+          id: UUID(uuidString: "deadbeef-dead-beef-dead-beefdeadbeef")!
+        )
         return .none
       case .navigationLinkButtonTapped:
         state.child = ChildFeature.State()
         return .none
+      case .nonDeadbeefIdentifiedNavigationLinkButtonTapped:
+        state.identifiedChild = ChildFeature.State()
+        return .none
       }
     }
     .ifLet(\.$child, action: /Action.child) {
       ChildFeature()
     }
+    .ifLet(\.$identifiedChild, action: /Action.identifiedChild) {
+      ChildFeature()
+    }
   }
 }
 
@@ -411,16 +454,34 @@ private struct NavigationLinkDemoView: View {
       Form {
         WithViewStore(self.store, observe: \.message) { viewStore in
           Text(viewStore.state)
-          
+
           NavigationLinkStore(
-            store: self.store.scope(state: \.$child, action: NavigationLinkDemoFeature.Action.child)
+            self.store.scope(state: \.$child, action: NavigationLinkDemoFeature.Action.child)
           ) {
             viewStore.send(.navigationLinkButtonTapped)
           } destination: { store in
             ChildView(store: store)
           } label: {
             Text("Open navigation link")
           }
+
+          NavigationLinkStore(
+            self.store.scope(
+              state: \.$identifiedChild,
+              action: NavigationLinkDemoFeature.Action.identifiedChild
+            ),
+            id: UUID(uuidString: "deadbeef-dead-beef-dead-beefdeadbeef")!
+          ) {
+            viewStore.send(.identifiedNavigationLinkButtonTapped)
+          } destination: { store in
+            ChildView(store: store)
+          } label: {
+            Text("Open identified navigation link")
+          }
+
+          Button("Open non-deadbeef identified navigation link") {
+            viewStore.send(.nonDeadbeefIdentifiedNavigationLinkButtonTapped)
+          }
         }
       }
     }