Fix 06-TreeBasedNavigation

kalupas226 · Feb 25, 2024 · 65ede25 · 65ede25
1 parent 5bc4404
commit 65ede25
Show file tree

Hide file tree

Showing 22 changed files with 607 additions and 786 deletions.
diff --git a/...s/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0001-previous.swift b/...s/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0001-previous.swift
@@ -7,19 +7,21 @@ import GitHubAPIClient
 import IdentifiedCollections
 import SwiftUI
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositoryRows: IdentifiedArrayOf<RepositoryRow.State> = []
     var isLoading: Bool = false
-    @BindingState var query: String = ""
+    var query: String = ""
 
     public init() {}
   }
 
-  public enum Action: Equatable, BindableAction {
+  public enum Action: BindableAction {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
-    case repositoryRow(id: RepositoryRow.State.ID, action: RepositoryRow.Action)
+    case searchRepositoriesResponse(Result<[Repository]>)
+    case repositoryRows(IdentifiedActionOf<RepositoryRow>)
     case queryChangeDebounced
     case binding(BindingAction<State>)
   }
@@ -55,9 +57,9 @@ public struct RepositoryList: Reducer {
           // TODO: Handling error
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
-      case .binding(\.$query):
+      case .binding(\.query):
         return .run { send in
           await send(.queryChangeDebounced)
         }
@@ -78,7 +80,7 @@ public struct RepositoryList: Reducer {
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }
@@ -87,7 +89,7 @@ public struct RepositoryList: Reducer {
     .run { send in
       await send(
         .searchRepositoriesResponse(
-          TaskResult {
+          Result {
             try await gitHubAPIClient.searchRepositories(query)
           }
         )

diff --git a/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0001.swift b/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0001.swift
@@ -8,20 +8,22 @@ import IdentifiedCollections
 import SwiftUI
 import SwiftUINavigationCore
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositoryRows: IdentifiedArrayOf<RepositoryRow.State> = []
     var isLoading: Bool = false
-    @BindingState var query: String = ""
-    @PresentationState var alert: AlertState<Action.Alert>?
+    var query: String = ""
+    @Presents var alert: AlertState<Action.Alert>?
 
     public init() {}
   }
 
-  public enum Action: Equatable, BindableAction {
+  public enum Action: BindableAction {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
-    case repositoryRow(id: RepositoryRow.State.ID, action: RepositoryRow.Action)
+    case searchRepositoriesResponse(Result<[Repository]>)
+    case repositoryRows(IdentifiedActionOf<RepositoryRow>)
     case queryChangeDebounced
     case binding(BindingAction<State>)
     case alert(PresentationAction<Alert>)
@@ -60,9 +62,9 @@ public struct RepositoryList: Reducer {
           // TODO: Handling error
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
-      case .binding(\.$query):
+      case .binding(\.query):
         return .run { send in
           await send(.queryChangeDebounced)
         }
@@ -83,7 +85,7 @@ public struct RepositoryList: Reducer {
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }
@@ -92,7 +94,7 @@ public struct RepositoryList: Reducer {
     .run { send in
       await send(
         .searchRepositoriesResponse(
-          TaskResult {
+          Result {
             try await gitHubAPIClient.searchRepositories(query)
           }
         )

diff --git a/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0002.swift b/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0002.swift
@@ -8,20 +8,22 @@ import IdentifiedCollections
 import SwiftUI
 import SwiftUINavigationCore
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositoryRows: IdentifiedArrayOf<RepositoryRow.State> = []
     var isLoading: Bool = false
-    @BindingState var query: String = ""
-    @PresentationState var alert: AlertState<Action.Alert>?
+    var query: String = ""
+    @Presents var alert: AlertState<Action.Alert>?
 
     public init() {}
   }
 
-  public enum Action: Equatable, BindableAction {
+  public enum Action: BindableAction {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
-    case repositoryRow(id: RepositoryRow.State.ID, action: RepositoryRow.Action)
+    case searchRepositoriesResponse(Result<[Repository]>)
+    case repositoryRows(IdentifiedActionOf<RepositoryRow>)
     case queryChangeDebounced
     case binding(BindingAction<State>)
     case alert(PresentationAction<Alert>)
@@ -64,9 +66,9 @@ public struct RepositoryList: Reducer {
           }
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
-      case .binding(\.$query):
+      case .binding(\.query):
         return .run { send in
           await send(.queryChangeDebounced)
         }
@@ -89,7 +91,7 @@ public struct RepositoryList: Reducer {
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }
@@ -98,7 +100,7 @@ public struct RepositoryList: Reducer {
     .run { send in
       await send(
         .searchRepositoriesResponse(
-          TaskResult {
+          Result {
             try await gitHubAPIClient.searchRepositories(query)
           }
         )

diff --git a/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0003.swift b/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0003.swift
@@ -8,20 +8,22 @@ import IdentifiedCollections
 import SwiftUI
 import SwiftUINavigationCore
 
-public struct RepositoryList: Reducer {
+@Reducer
+public struct RepositoryList {
+  @ObservableState
   public struct State: Equatable {
     var repositoryRows: IdentifiedArrayOf<RepositoryRow.State> = []
     var isLoading: Bool = false
-    @BindingState var query: String = ""
-    @PresentationState var alert: AlertState<Action.Alert>?
+    var query: String = ""
+    @Presents var alert: AlertState<Action.Alert>?
 
     public init() {}
   }
 
-  public enum Action: Equatable, BindableAction {
+  public enum Action: BindableAction {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
-    case repositoryRow(id: RepositoryRow.State.ID, action: RepositoryRow.Action)
+    case searchRepositoriesResponse(Result<[Repository]>)
+    case repositoryRows(IdentifiedActionOf<RepositoryRow>)
     case queryChangeDebounced
     case binding(BindingAction<State>)
     case alert(PresentationAction<Alert>)
@@ -60,9 +62,9 @@ public struct RepositoryList: Reducer {
           state.alert = .networkError
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
-      case .binding(\.$query):
+      case .binding(\.query):
         return .run { send in
           await send(.queryChangeDebounced)
         }
@@ -85,7 +87,7 @@ public struct RepositoryList: Reducer {
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }
@@ -94,7 +96,7 @@ public struct RepositoryList: Reducer {
     .run { send in
       await send(
         .searchRepositoriesResponse(
-          TaskResult {
+          Result {
             try await gitHubAPIClient.searchRepositories(query)
           }
         )

diff --git a/...s/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0004-previous.swift b/...s/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0004-previous.swift
@@ -9,40 +9,38 @@ import SwiftUI
 import SwiftUINavigationCore
 
 public struct RepositoryListView: View {
-  let store: StoreOf<RepositoryList>
+  @Bindable var store: StoreOf<RepositoryList>
 
   public init(store: StoreOf<RepositoryList>) {
     self.store = store
   }
 
   public var body: some View {
     NavigationStack {
-      WithViewStore(store, observe: { $0 }) { viewStore in
-        Group {
-          if viewStore.isLoading {
-            ProgressView()
-          } else {
-            List {
-              ForEachStore(
-                store.scope(
-                  state: \.repositoryRows,
-                  action:  { .repositoryRow(id: $0, action: $1) }
-                ),
-                content: RepositoryRowView.init(store:)
-              )
-            }
+      Group {
+        if store.isLoading {
+          ProgressView()
+        } else {
+          List {
+            ForEach(
+              store.scope(
+                state: \.repositoryRows,
+                action: \.repositoryRows
+              ),
+              content: RepositoryRowView.init(store:)
+            )
           }
         }
-        .onAppear {
-          viewStore.send(.onAppear)
-        }
-        .navigationTitle("Repositories")
-        .searchable(
-          text: viewStore.$query,
-          placement: .navigationBarDrawer,
-          prompt: "Input query"
-        )
       }
+      .onAppear {
+        store.send(.onAppear)
+      }
+      .navigationTitle("Repositories")
+      .searchable(
+        text: $store.query,
+        placement: .navigationBarDrawer,
+        prompt: "Input query"
+      )
     }
   }
 }

diff --git a/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0004.swift b/Sources/Docs/Documentation.docc/Resources/06-TreeBasedNavigation/06-01-code-0004.swift
@@ -9,46 +9,44 @@ import SwiftUI
 import SwiftUINavigationCore
 
 public struct RepositoryListView: View {
-  let store: StoreOf<RepositoryList>
+  @Bindable var store: StoreOf<RepositoryList>
 
   public init(store: StoreOf<RepositoryList>) {
     self.store = store
   }
 
   public var body: some View {
     NavigationStack {
-      WithViewStore(store, observe: { $0 }) { viewStore in
-        Group {
-          if viewStore.isLoading {
-            ProgressView()
-          } else {
-            List {
-              ForEachStore(
-                store.scope(
-                  state: \.repositoryRows,
-                  action:  { .repositoryRow(id: $0, action: $1) }
-                ),
-                content: RepositoryRowView.init(store:)
-              )
-            }
+      Group {
+        if store.isLoading {
+          ProgressView()
+        } else {
+          List {
+            ForEach(
+              store.scope(
+                state: \.repositoryRows,
+                action: \.repositoryRows
+              ),
+              content: RepositoryRowView.init(store:)
+            )
           }
         }
-        .onAppear {
-          viewStore.send(.onAppear)
-        }
-        .navigationTitle("Repositories")
-        .searchable(
-          text: viewStore.$query,
-          placement: .navigationBarDrawer,
-          prompt: "Input query"
-        )
-        .alert(
-          store: store.scope(
-            state: \.$alert,
-            action: { .alert($0) }
-          )
-        )
       }
+      .onAppear {
+        store.send(.onAppear)
+      }
+      .navigationTitle("Repositories")
+      .searchable(
+        text: $store.query,
+        placement: .navigationBarDrawer,
+        prompt: "Input query"
+      )
+      .alert(
+        $store.scope(
+          state: \.alert,
+          action: \.alert
+        )
+      )
     }
   }
 }