Fix 03-BindingsAndCancellation

kalupas226 · Feb 21, 2024 · 4206498 · 4206498
1 parent c4b9a7d
commit 4206498
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 132 deletions.
diff --git a/...cs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0001-previous.swift b/...cs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0001-previous.swift
@@ -5,18 +5,20 @@ import Foundation
 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
 
     public init() {}
   }
 
-  public enum Action: Equatable {
+  public enum Action {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
-    case repositoryRow(id: RepositoryRow.State.ID, action: RepositoryRow.Action)
+    case searchRepositoriesResponse(Result<[Repository]>)
+    case repositoryRows(IdentifiedActionOf<RepositoryRow>)
   }
 
   public init() {}
@@ -29,7 +31,7 @@ public struct RepositoryList: Reducer {
         return .run { send in
           await send(
             .searchRepositoriesResponse(
-              TaskResult {
+              Result {
                 let query = "composable"
                 let url = URL(
                   string: "https://api.github.com/search/repositories?q=\(query)&sort=stars"
@@ -66,11 +68,11 @@ public struct RepositoryList: Reducer {
           // TODO: Handling error
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }

diff --git a/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0001.swift b/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0001.swift
@@ -5,19 +5,21 @@ import Foundation
 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 {
+  public enum Action {
     case onAppear
-    case searchRepositoriesResponse(TaskResult<[Repository]>)
-    case repositoryRow(id: RepositoryRow.State.ID, action: RepositoryRow.Action)
+    case searchRepositoriesResponse(Result<[Repository]>)
+    case repositoryRows(IdentifiedActionOf<RepositoryRow>)
   }
 
   public init() {}
@@ -30,7 +32,7 @@ public struct RepositoryList: Reducer {
         return .run { send in
           await send(
             .searchRepositoriesResponse(
-              TaskResult {
+              Result {
                 let query = "composable"
                 let url = URL(
                   string: "https://api.github.com/search/repositories?q=\(query)&sort=stars"
@@ -67,11 +69,11 @@ public struct RepositoryList: Reducer {
           // TODO: Handling error
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }

diff --git a/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0002.swift b/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0002.swift
@@ -5,19 +5,21 @@ import Foundation
 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 repositoryRow(IdentifiedActionOf<RepositoryRow>)
     case binding(BindingAction<State>)
   }
 
@@ -31,7 +33,7 @@ public struct RepositoryList: Reducer {
         return .run { send in
           await send(
             .searchRepositoriesResponse(
-              TaskResult {
+              Result {
                 let query = "composable"
                 let url = URL(
                   string: "https://api.github.com/search/repositories?q=\(query)&sort=stars"
@@ -68,11 +70,11 @@ public struct RepositoryList: Reducer {
           // TODO: Handling error
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }

diff --git a/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0003.swift b/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-01-code-0003.swift
@@ -5,19 +5,21 @@ import Foundation
 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 repositoryRow(IdentifiedActionOf<RepositoryRow>)
     case binding(BindingAction<State>)
   }
 
@@ -32,7 +34,7 @@ public struct RepositoryList: Reducer {
         return .run { send in
           await send(
             .searchRepositoriesResponse(
-              TaskResult {
+              Result {
                 let query = "composable"
                 let url = URL(
                   string: "https://api.github.com/search/repositories?q=\(query)&sort=stars"
@@ -69,13 +71,13 @@ public struct RepositoryList: Reducer {
           // TODO: Handling error
           return .none
         }
-      case .repositoryRow:
+      case .repositoryRows:
         return .none
       case .binding:
         return .none
       }
     }
-    .forEach(\.repositoryRows, action: /Action.repositoryRow(id:action:)) {
+    .forEach(\.repositoryRows, action: \.repositoryRows) {
       RepositoryRow()
     }
   }

diff --git a/...cs/Documentation.docc/Resources/03-BindingsAndCancellation/03-02-code-0001-previous.swift b/...cs/Documentation.docc/Resources/03-BindingsAndCancellation/03-02-code-0001-previous.swift
@@ -13,25 +13,23 @@ public struct RepositoryListView: View {
   }
 
   public var body: some View {
-    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)
-      }
+    }
+    .onAppear {
+      store.send(.onAppear)
     }
   }
 }

diff --git a/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-02-code-0001.swift b/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-02-code-0001.swift
@@ -6,39 +6,37 @@ import IdentifiedCollections
 import SwiftUI
 
 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 {
-    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/03-BindingsAndCancellation/03-02-code-0002.swift b/Sources/Docs/Documentation.docc/Resources/03-BindingsAndCancellation/03-02-code-0002.swift
@@ -6,40 +6,38 @@ import IdentifiedCollections
 import SwiftUI
 
 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"
+      )
     }
   }
 }