Revert #1790 (#1795)

It occurred to us that this solution unfortunately is incompatible with
view actions. We have an alternate solution that works, so I'll PR that
in the future if no others materialize!

Author: stephencelis

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Bindings-Forms.swift

@@ -8,19 +8,19 @@ private let readMe = """
   Bindable state and actions allow you to safely eliminate the boilerplate caused by needing to \
   have a unique action for every UI control. Instead, all UI bindings can be consolidated into a \
   single `binding` action that holds onto a `BindingAction` value, and all bindable state can be \
-  safeguarded with the `BindingState` property wrapper.
+  safeguarded with the `BindableState` property wrapper.
 
   It is instructive to compare this case study to the "Binding Basics" case study.
   """
 
 // MARK: - Feature domain
 
 struct BindingForm: ReducerProtocol {
-  struct State: BindableStateProtocol, Equatable {
-    @BindingState var sliderValue = 5.0
-    @BindingState var stepCount = 10
-    @BindingState var text = ""
-    @BindingState var toggleIsOn = false
+  struct State: Equatable {
+    @BindableState var sliderValue = 5.0
+    @BindableState var stepCount = 10
+    @BindableState var text = ""
+    @BindableState var toggleIsOn = false
   }
 
   enum Action: BindableAction, Equatable {
@@ -60,7 +60,7 @@ struct BindingFormView: View {
         }
 
         HStack {
-          TextField("Type here", text: viewStore.$text)
+          TextField("Type here", text: viewStore.binding(\.$text))
             .disableAutocorrection(true)
             .foregroundStyle(viewStore.toggleIsOn ? Color.secondary : .primary)
           Text(alternate(viewStore.text))
@@ -69,18 +69,21 @@ struct BindingFormView: View {
 
         Toggle(
           "Disable other controls",
-          isOn: viewStore.$toggleIsOn.resignFirstResponder()
+          isOn: viewStore.binding(\.$toggleIsOn)
+            .resignFirstResponder()
         )
 
         Stepper(
-          "Max slider value: \(viewStore.stepCount)", value: viewStore.$stepCount, in: 0...100
+          "Max slider value: \(viewStore.stepCount)",
+          value: viewStore.binding(\.$stepCount),
+          in: 0...100
         )
         .disabled(viewStore.toggleIsOn)
 
         HStack {
           Text("Slider value: \(Int(viewStore.sliderValue))")
 
-          Slider(value: viewStore.$sliderValue, in: 0...Double(viewStore.stepCount))
+          Slider(value: viewStore.binding(\.$sliderValue), in: 0...Double(viewStore.stepCount))
             .tint(.accentColor)
         }
         .disabled(viewStore.toggleIsOn)

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-FocusState.swift

@@ -9,10 +9,10 @@ private let readMe = """
 // MARK: - Feature domain
 
 struct FocusDemo: ReducerProtocol {
-  struct State: BindableStateProtocol, Equatable {
-    @BindingState var focusedField: Field?
-    @BindingState var password: String = ""
-    @BindingState var username: String = ""
+  struct State: Equatable {
+    @BindableState var focusedField: Field?
+    @BindableState var password: String = ""
+    @BindableState var username: String = ""
 
     enum Field: String, Hashable {
       case username, password
@@ -55,11 +55,9 @@ struct FocusDemoView: View {
         AboutView(readMe: readMe)
 
         VStack {
-
-          TextField("Username", text: viewStore.$username)
+          TextField("Username", text: viewStore.binding(\.$username))
             .focused($focusedField, equals: .username)
-
-          SecureField("Password", text: viewStore.$password)
+          SecureField("Password", text: viewStore.binding(\.$password))
             .focused($focusedField, equals: .password)
           Button("Sign In") {
             viewStore.send(.signInButtonTapped)
@@ -68,7 +66,7 @@ struct FocusDemoView: View {
         }
         .textFieldStyle(.roundedBorder)
       }
-      .synchronize(viewStore.$focusedField, self.$focusedField)
+      .synchronize(viewStore.binding(\.$focusedField), self.$focusedField)
     }
     .navigationTitle("Focus demo")
   }

Examples/Todos/Todos/Todo.swift

@@ -2,18 +2,27 @@ import ComposableArchitecture
 import SwiftUI
 
 struct Todo: ReducerProtocol {
-  struct State: BindableStateProtocol, Equatable, Identifiable {
-    @BindingState var description = ""
+  struct State: Equatable, Identifiable {
+    var description = ""
     let id: UUID
-    @BindingState var isComplete = false
+    var isComplete = false
   }
 
-  enum Action: BindableAction, Equatable {
-    case binding(BindingAction<State>)
+  enum Action: Equatable {
+    case checkBoxToggled
+    case textFieldChanged(String)
   }
 
-  var body: some ReducerProtocol<State, Action> {
-    BindingReducer()
+  func reduce(into state: inout State, action: Action) -> EffectTask<Action> {
+    switch action {
+    case .checkBoxToggled:
+      state.isComplete.toggle()
+      return .none
+
+    case let .textFieldChanged(description):
+      state.description = description
+      return .none
+    }
   }
 }
 
@@ -23,12 +32,15 @@ struct TodoView: View {
   var body: some View {
     WithViewStore(self.store, observe: { $0 }) { viewStore in
       HStack {
-        Button(action: { viewStore.$isComplete.wrappedValue.toggle() }) {
+        Button(action: { viewStore.send(.checkBoxToggled) }) {
           Image(systemName: viewStore.isComplete ? "checkmark.square" : "square")
         }
         .buttonStyle(.plain)
 
-        TextField("Untitled Todo", text: viewStore.$description)
+        TextField(
+          "Untitled Todo",
+          text: viewStore.binding(get: \.description, send: Todo.Action.textFieldChanged)
+        )
       }
       .foregroundColor(viewStore.isComplete ? .gray : nil)
     }

Examples/Todos/Todos/Todos.swift

@@ -8,9 +8,9 @@ enum Filter: LocalizedStringKey, CaseIterable, Hashable {
 }
 
 struct Todos: ReducerProtocol {
-  struct State: BindableStateProtocol, Equatable {
-    @BindingState var editMode: EditMode = .inactive
-    @BindingState var filter: Filter = .all
+  struct State: Equatable {
+    var editMode: EditMode = .inactive
+    var filter: Filter = .all
     var todos: IdentifiedArrayOf<Todo.State> = []
 
     var filteredTodos: IdentifiedArrayOf<Todo.State> {
@@ -22,11 +22,12 @@ struct Todos: ReducerProtocol {
     }
   }
 
-  enum Action: BindableAction, Equatable, Sendable {
+  enum Action: Equatable {
     case addTodoButtonTapped
-    case binding(BindingAction<State>)
     case clearCompletedButtonTapped
     case delete(IndexSet)
+    case editModeChanged(EditMode)
+    case filterPicked(Filter)
     case move(IndexSet, Int)
     case sortCompletedTodos
     case todo(id: Todo.State.ID, action: Todo.Action)
@@ -37,16 +38,12 @@ struct Todos: ReducerProtocol {
   private enum TodoCompletionID {}
 
   var body: some ReducerProtocol<State, Action> {
-    BindingReducer()
     Reduce { state, action in
       switch action {
       case .addTodoButtonTapped:
         state.todos.insert(Todo.State(id: self.uuid()), at: 0)
         return .none
 
-      case .binding:
-        return .none
-
       case .clearCompletedButtonTapped:
         state.todos.removeAll(where: \.isComplete)
         return .none
@@ -58,6 +55,14 @@ struct Todos: ReducerProtocol {
         }
         return .none
 
+      case let .editModeChanged(editMode):
+        state.editMode = editMode
+        return .none
+
+      case let .filterPicked(filter):
+        state.filter = filter
+        return .none
+
       case var .move(source, destination):
         if state.filter == .completed {
           source = IndexSet(
@@ -83,7 +88,7 @@ struct Todos: ReducerProtocol {
         state.todos.sort { $1.isComplete && !$0.isComplete }
         return .none
 
-      case .todo(id: _, action: .binding(\.$isComplete)):
+      case .todo(id: _, action: .checkBoxToggled):
         return .run { send in
           try await self.clock.sleep(for: .seconds(1))
           await send(.sortCompletedTodos, animation: .default)
@@ -102,56 +107,70 @@ struct Todos: ReducerProtocol {
 
 struct AppView: View {
   let store: StoreOf<Todos>
+  @ObservedObject var viewStore: ViewStore<ViewState, Todos.Action>
+
+  init(store: StoreOf<Todos>) {
+    self.store = store
+    self.viewStore = ViewStore(self.store.scope(state: ViewState.init(state:)))
+  }
 
   struct ViewState: Equatable {
-    @BindingViewState var editMode: EditMode
-    @BindingViewState var filter: Filter
+    let editMode: EditMode
+    let filter: Filter
     let isClearCompletedButtonDisabled: Bool
 
     init(state: Todos.State) {
-      self._editMode = state.bindings.$editMode
-      self._filter = state.bindings.$filter
+      self.editMode = state.editMode
+      self.filter = state.filter
       self.isClearCompletedButtonDisabled = !state.todos.contains(where: \.isComplete)
     }
   }
 
   var body: some View {
-    WithViewStore(self.store, observe: ViewState.init) { viewStore in
-      NavigationView {
-        VStack(alignment: .leading) {
-          Picker("Filter", selection: viewStore.$filter.animation()) {
-            ForEach(Filter.allCases, id: \.self) { filter in
-              Text(filter.rawValue).tag(filter)
-            }
-          }
-          .pickerStyle(.segmented)
-          .padding(.horizontal)
-
-          List {
-            ForEachStore(
-              self.store.scope(state: \.filteredTodos, action: Todos.Action.todo(id:action:))
-            ) {
-              TodoView(store: $0)
-            }
-            .onDelete { viewStore.send(.delete($0)) }
-            .onMove { viewStore.send(.move($0, $1)) }
+    NavigationView {
+      VStack(alignment: .leading) {
+        Picker(
+          "Filter",
+          selection: self.viewStore.binding(
+            get: \.filter,
+            send: Todos.Action.filterPicked
+          )
+          .animation()
+        ) {
+          ForEach(Filter.allCases, id: \.self) { filter in
+            Text(filter.rawValue).tag(filter)
           }
         }
-        .navigationTitle("Todos")
-        .navigationBarItems(
-          trailing: HStack(spacing: 20) {
-            EditButton()
-            Button("Clear Completed") {
-              viewStore.send(.clearCompletedButtonTapped, animation: .default)
-            }
-            .disabled(viewStore.isClearCompletedButtonDisabled)
-            Button("Add Todo") { viewStore.send(.addTodoButtonTapped, animation: .default) }
+        .pickerStyle(.segmented)
+        .padding(.horizontal)
+
+        List {
+          ForEachStore(
+            self.store.scope(state: \.filteredTodos, action: Todos.Action.todo(id:action:))
+          ) {
+            TodoView(store: $0)
           }
-        )
-        .environment(\.editMode, viewStore.$editMode)
+          .onDelete { self.viewStore.send(.delete($0)) }
+          .onMove { self.viewStore.send(.move($0, $1)) }
+        }
       }
-      .navigationViewStyle(.stack)
+      .navigationTitle("Todos")
+      .navigationBarItems(
+        trailing: HStack(spacing: 20) {
+          EditButton()
+          Button("Clear Completed") {
+            self.viewStore.send(.clearCompletedButtonTapped, animation: .default)
+          }
+          .disabled(self.viewStore.isClearCompletedButtonDisabled)
+          Button("Add Todo") { self.viewStore.send(.addTodoButtonTapped, animation: .default) }
+        }
+      )
+      .environment(
+        \.editMode,
+        self.viewStore.binding(get: \.editMode, send: Todos.Action.editModeChanged)
+      )
     }
+    .navigationViewStyle(.stack)
   }
 }
 

Examples/Todos/TodosTests/TodosTests.swift

@@ -59,7 +59,7 @@ final class TodosTests: XCTestCase {
     )
 
     await store.send(
-      .todo(id: state.todos[0].id, action: .set(\.$description, "Learn Composable Architecture"))
+      .todo(id: state.todos[0].id, action: .textFieldChanged("Learn Composable Architecture"))
     ) {
       $0.todos[id: state.todos[0].id]?.description = "Learn Composable Architecture"
     }
@@ -88,7 +88,7 @@ final class TodosTests: XCTestCase {
 
     store.dependencies.continuousClock = self.clock
 
-    await store.send(.todo(id: state.todos[0].id, action: .set(\.$isComplete, true))) {
+    await store.send(.todo(id: state.todos[0].id, action: .checkBoxToggled)) {
       $0.todos[id: state.todos[0].id]?.isComplete = true
     }
     await self.clock.advance(by: .seconds(1))
@@ -123,11 +123,11 @@ final class TodosTests: XCTestCase {
 
     store.dependencies.continuousClock = self.clock
 
-    await store.send(.todo(id: state.todos[0].id, action: .set(\.$isComplete, true))) {
+    await store.send(.todo(id: state.todos[0].id, action: .checkBoxToggled)) {
       $0.todos[id: state.todos[0].id]?.isComplete = true
     }
     await self.clock.advance(by: .milliseconds(500))
-    await store.send(.todo(id: state.todos[0].id, action: .set(\.$isComplete, false))) {
+    await store.send(.todo(id: state.todos[0].id, action: .checkBoxToggled)) {
       $0.todos[id: state.todos[0].id]?.isComplete = false
     }
     await self.clock.advance(by: .seconds(1))
@@ -259,7 +259,7 @@ final class TodosTests: XCTestCase {
 
     store.dependencies.continuousClock = self.clock
 
-    await store.send(.set(\.$editMode, .active)) {
+    await store.send(.editModeChanged(.active)) {
       $0.editMode = .active
     }
     await store.send(.move([0], 2)) {
@@ -307,10 +307,10 @@ final class TodosTests: XCTestCase {
     store.dependencies.continuousClock = self.clock
     store.dependencies.uuid = .incrementing
 
-    await store.send(.set(\.$editMode, .active)) {
+    await store.send(.editModeChanged(.active)) {
       $0.editMode = .active
     }
-    await store.send(.set(\.$filter, .completed)) {
+    await store.send(.filterPicked(.completed)) {
       $0.filter = .completed
     }
     await store.send(.move([0], 2)) {
@@ -346,11 +346,10 @@ final class TodosTests: XCTestCase {
       reducer: Todos()
     )
 
-    await store.send(.set(\.$filter, .completed)) {
+    await store.send(.filterPicked(.completed)) {
       $0.filter = .completed
     }
-    await store.send(.todo(id: state.todos[1].id, action: .set(\.$description, "Did this already")))
-    {
+    await store.send(.todo(id: state.todos[1].id, action: .textFieldChanged("Did this already"))) {
       $0.todos[id: state.todos[1].id]?.description = "Did this already"
     }
   }