wip

Sources/ComposableArchitecture/Core.swift

@@ -9,6 +9,7 @@ protocol Core<State, Action>: AnyObject, Sendable {
   func send(_ action: Action) -> Task<Void, Never>?
 
   var didSet: CurrentValueRelay<Void> { get }
+  var isInvalid: Bool { get }
 }
 
 final class InvalidCore<State, Action>: Core {
@@ -19,6 +20,7 @@ final class InvalidCore<State, Action>: Core {
   func send(_ action: Action) -> Task<Void, Never>? { nil }
 
   let didSet = CurrentValueRelay<Void>(())
+  let isInvalid = true
 }
 
 final class RootCore<Root: Reducer>: Core {
@@ -28,9 +30,12 @@ final class RootCore<Root: Reducer>: Core {
     }
   }
   let reducer: Root
-  var bufferedActions: [Root.Action] = []
+
   let didSet = CurrentValueRelay(())
-  var effectCancellables: [UUID: AnyCancellable] = [:]
+  let isInvalid = false
+
+  private var bufferedActions: [Root.Action] = []
+  private var effectCancellables: [UUID: AnyCancellable] = [:]
   private var isSending = false
   init(
     initialState: Root.State,
@@ -192,6 +197,9 @@ class ScopedCore<Base: Core, State, Action>: Core {
   var didSet: CurrentValueRelay<Void> {
     base.didSet
   }
+  var isInvalid: Bool {
+    base.isInvalid
+  }
 }
 
 class IfLetCore<Base: Core, State, Action>: Core {
@@ -224,6 +232,9 @@ class IfLetCore<Base: Core, State, Action>: Core {
   var didSet: CurrentValueRelay<Void> {
     base.didSet
   }
+  var isInvalid: Bool {
+    base.state[keyPath: stateKeyPath] == nil || base.isInvalid
+  }
 }
 
 class ClosureScopedCore<Base: Core, State, Action>: Core {
@@ -248,4 +259,7 @@ class ClosureScopedCore<Base: Core, State, Action>: Core {
   var didSet: CurrentValueRelay<Void> {
     base.didSet
   }
+  var isInvalid: Bool {
+    base.isInvalid
+  }
 }

Sources/ComposableArchitecture/Observation/Binding+Observation.swift

@@ -164,7 +164,9 @@ extension Store where State: ObservableState, Action: BindableAction, Action.Sta
     get { self.state[keyPath: keyPath] }
     set {
       BindingLocal.$isActive.withValue(true) {
-        self.send(.set(keyPath, newValue, isInvalidated: _isInvalidated))
+        self.send(
+          .set(keyPath, newValue, isInvalidated: { [weak self] in self?.core.isInvalid ?? true })
+        )
       }
     }
   }
@@ -181,7 +183,9 @@ where
     get { self.observableState }
     set {
       BindingLocal.$isActive.withValue(true) {
-        self.send(.set(\.self, newValue, isInvalidated: _isInvalidated))
+        self.send(
+          .set(\.self, newValue, isInvalidated: { [weak self] in self?.core.isInvalid ?? true })
+        )
       }
     }
   }
@@ -200,7 +204,11 @@ where
     get { self.state[keyPath: keyPath] }
     set {
       BindingLocal.$isActive.withValue(true) {
-        self.send(.view(.set(keyPath, newValue, isInvalidated: _isInvalidated)))
+        self.send(
+          .view(
+            .set(keyPath, newValue, isInvalidated: { [weak self] in self?.core.isInvalid ?? true })
+          )
+        )
       }
     }
   }
@@ -218,7 +226,11 @@ where
     get { self.observableState }
     set {
       BindingLocal.$isActive.withValue(true) {
-        self.send(.view(.set(\.self, newValue, isInvalidated: _isInvalidated)))
+        self.send(
+          .view(
+            .set(\.self, newValue, isInvalidated: { [weak self] in self?.core.isInvalid ?? true })
+          )
+        )
       }
     }
   }

Sources/ComposableArchitecture/Observation/Store+Observation.swift

@@ -412,7 +412,7 @@ extension Store where State: ObservableState {
       if newValue == nil,
         let childState = self.state[keyPath: state],
         id == _identifiableID(childState),
-        !self._isInvalidated()
+        !self.core.isInvalid
       {
         self.send(action(.dismiss))
         if self.state[keyPath: state] != nil {

Sources/ComposableArchitecture/Store.swift

@@ -140,7 +140,6 @@ import SwiftUI
 public final class Store<State, Action> {
   var canCacheChildren = true
   var children: [ScopeID<State, Action>: AnyObject] = [:]
-  var _isInvalidated: @MainActor @Sendable () -> Bool = { false }
 
   let core: any Core<State, Action>
 
@@ -176,7 +175,6 @@ public final class Store<State, Action> {
   }
 
   init() {
-    self._isInvalidated = { true }
     self.core = InvalidCore()
   }
 

Sources/ComposableArchitecture/SwiftUI/Binding.swift

@@ -310,7 +310,7 @@ extension ViewStore where ViewAction: BindableAction, ViewAction.State == ViewSt
             value: value,
             bindableActionType: ViewAction.self,
             context: .bindingState,
-            isInvalidated: self.store._isInvalidated,
+            isInvalidated: { [weak self] in self?.store.core.isInvalid ?? true },
             fileID: bindingState.fileID,
             filePath: bindingState.filePath,
             line: bindingState.line,
@@ -460,7 +460,7 @@ public struct BindingViewStore<State> {
                 value: value,
                 bindableActionType: self.bindableActionType,
                 context: .bindingStore,
-                isInvalidated: self.store._isInvalidated,
+                isInvalidated: { [weak store] in store?.core.isInvalid ?? true },
                 fileID: self.fileID,
                 filePath: self.filePath,
                 line: self.line,