Cleanup

Author: stephencelis

Examples/Todos/Todos/Todos.swift

@@ -65,14 +65,19 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment>.combine(
       state.filter = filter
       return .none
 
-    case let .move(source, destination):
-      // Get source and destination in unfiltered todos array
-      let sourceInTodos = source
-        .map { state.filteredTodos[$0] }
-        .compactMap { state.todos.index(id: $0.id) }
-      let destinationInTodos = state.todos.index(id: state.filteredTodos[destination].id)!
-
-      state.todos.move(fromOffsets: IndexSet(sourceInTodos), toOffset: destinationInTodos)
+    case var .move(source, destination):
+      if state.filter != .all {
+        source = IndexSet(
+          source
+            .map { state.filteredTodos[$0] }
+            .compactMap { state.todos.index(id: $0.id) }
+        )
+        destination = state.todos.index(id: state.filteredTodos[destination].id)
+          ?? destination
+      }
+
+      state.todos.move(fromOffsets: source, toOffset: destination)
+
       return Effect(value: .sortCompletedTodos)
         .delay(for: .milliseconds(100), scheduler: environment.mainQueue)
         .eraseToEffect()