Cleanup

Author: StevenLambion

Todo/Containers/NewTodoContainer.swift

@@ -3,10 +3,10 @@ import Combine
 import SwiftDux
 
 struct NewTodoContainer : ConnectableView {
-  @MappedDispatch() private var dispatch
-  
   var id: String
 
+  @MappedDispatch() private var dispatch
+  
   func map(state: AppState, binder: StateBinder) -> Binding<String>? {
     guard let todoList = state.todoLists[id] else { return nil }
     return binder.bind(todoList.newTodoText) {

Todo/Containers/TodoContainer.swift

@@ -3,7 +3,6 @@ import SwiftDux
 import Combine
 
 struct TodoContainer : ConnectableView {
-  
   var todoListId: String
   var todoId: String
 

Todo/Containers/TodoListBrowserContainer.swift

@@ -3,17 +3,19 @@ import SwiftDux
 import Combine
 
 struct TodoListBrowserContainer : ConnectableView {
-  
-//  struct Props: Equatable {
-//    var todoLists: OrderedState<TodoList>
-//    var selectedTodoListId: String?
-//  }
-  
   @Environment(\.horizontalSizeClass) private var sizeClass
   @MappedDispatch() private var dispatch
 
-  func map(state: AppState) -> AppState? {
-    state
+  struct Props: Equatable {
+    var todoLists: OrderedState<TodoList>
+    var selectedTodoListId: String?
+  }
+  
+  func map(state: AppState) -> Props? {
+    Props(
+      todoLists: state.todoLists,
+      selectedTodoListId: state.selectedTodoListId
+    )
   }
 
   func body(props: Props) -> some View {

Todo/Containers/TodoListContainer.swift

@@ -3,11 +3,10 @@ import Combine
 import SwiftDux
 
 struct TodoListContainer : ConnectableView {
-  @Environment(\.horizontalSizeClass) var sizeClass
-  @MappedDispatch() private var dispatch
-  @State private var editMode: EditMode = .inactive
+  var id: String
 
-  public var id: String
+  @Environment(\.horizontalSizeClass) private var sizeClass
+  @MappedDispatch() private var dispatch
 
   func map(state: AppState) -> [String]? {
     state.todoLists[id]?.todoIds