Fix Navigation tutorial (#2736)

* Add missing case * `destination` property should be `nil` * Change `store` property to `Bindable` to show alert * Fix filename * Fix indentation diffs
pointfreeco · Jan 29, 2024 · da028ac · da028ac
1 parent 499798a
commit da028ac
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 6 deletions.
diff --git a/...osableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0006-previous.swift b/...osableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0006-previous.swift
@@ -32,6 +32,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(
           AlertState {

diff --git a/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0006.swift b/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0006.swift
@@ -33,6 +33,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(
           AlertState {

diff --git a/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0007.swift b/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0007.swift
@@ -33,6 +33,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(
           AlertState {

diff --git a/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0013.swift b/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0013.swift
@@ -11,7 +11,7 @@ final class ContactsFeatureTests: XCTestCase {
     } withDependencies: {
       $0.uuid = .incrementing
     }
-
+    
     await store.send(.addButtonTapped) {
       $0.destination = .addContact(
         AddContactFeature.State(

diff --git a/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0016.swift b/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0016.swift
@@ -11,7 +11,7 @@ final class ContactsFeatureTests: XCTestCase {
     } withDependencies: {
       $0.uuid = .incrementing
     }
-
+    
     await store.send(.addButtonTapped) {
       $0.destination = .addContact(
         AddContactFeature.State(

diff --git a/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0017.swift b/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0017.swift
@@ -11,7 +11,7 @@ final class ContactsFeatureTests: XCTestCase {
     } withDependencies: {
       $0.uuid = .incrementing
     }
-
+    
     await store.send(.addButtonTapped) {
       $0.destination = .addContact(
         AddContactFeature.State(
@@ -31,6 +31,8 @@ final class ContactsFeatureTests: XCTestCase {
         Contact(id: UUID(0), name: "Blob Jr.")
       ]
     }
-    await store.receive(\.destination.dismiss)
+    await store.receive(\.destination.dismiss) {
+      $0.destination = nil
+    }
   }
 }
diff --git a/...osableArchitecture/02-Navigation/03-TestingPresentation/02-03-03-code-0007-previous.swift b/...osableArchitecture/02-Navigation/03-TestingPresentation/02-03-03-code-0007-previous.swift
@@ -33,6 +33,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(
           AlertState {

diff --git a/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-03-code-0007.swift b/...etTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-03-code-0007.swift
@@ -33,6 +33,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(.deleteConfirmation(id: id))
         return .none

diff --git a/...sableArchitecture/02-Navigation/03-TestingPresentation/02-03-TestingPresentation.tutorial b/...sableArchitecture/02-Navigation/03-TestingPresentation/02-03-TestingPresentation.tutorial
@@ -146,7 +146,7 @@
         To further assert that when the `saveContact` delegate action was received, you must
         annotate `AddContactFeature.Action.Delegate` with the `@CasePathable` macro.
 
-        @Code(name: "ContactsFeatureTests.swift", file: 02-03-01-code-0015.swift, previousFile: 02-03-01-code-0015-previous.swift)
+        @Code(name: "ContactsFeature.swift", file: 02-03-01-code-0015.swift, previousFile: 02-03-01-code-0015-previous.swift)
       }
 
       @Step {

diff --git a/...omposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0000-previous.swift b/...omposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0000-previous.swift
@@ -33,6 +33,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(.deleteConfirmation(id: id))
         return .none

diff --git a/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0000.swift b/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0000.swift
@@ -34,6 +34,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(.deleteConfirmation(id: id))
         return .none

diff --git a/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0001.swift b/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0001.swift
@@ -35,6 +35,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(.deleteConfirmation(id: id))
         return .none

diff --git a/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0002.swift b/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-02-code-0002.swift
@@ -35,6 +35,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(.deleteConfirmation(id: id))
         return .none

diff --git a/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-03-code-0003.swift b/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-03-code-0003.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 
 struct ContactDetailView: View {
-  let store: StoreOf<ContactDetailFeature>
+  @Bindable var store: StoreOf<ContactDetailFeature>
 
   var body: some View {
     Form {

diff --git a/...omposableArchitecture/02-Navigation/04-NavigationStacks/02-04-03-code-0004-previous.swift b/...omposableArchitecture/02-Navigation/04-NavigationStacks/02-04-03-code-0004-previous.swift
@@ -35,6 +35,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(.deleteConfirmation(id: id))
         return .none

diff --git a/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-03-code-0004.swift b/.../MeetTheComposableArchitecture/02-Navigation/04-NavigationStacks/02-04-03-code-0004.swift
@@ -35,6 +35,9 @@ struct ContactsFeature {
         state.contacts.remove(id: id)
         return .none
 
+      case .destination:
+        return .none
+
       case let .deleteButtonTapped(id: id):
         state.destination = .alert(.deleteConfirmation(id: id))
         return .none