Skip to content

Perception checking: Fall back on current perception state #3762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2025
Merged

Perception checking: Fall back on current perception state #3762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c41499
Suppress more potential perception checks/warnings
stephencelis Aug 29, 2025
975b58f
wip
stephencelis Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Sources/ComposableArchitecture/Core.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ final class ScopedCore<Base: Core, State, Action>: Core {
let stateKeyPath: KeyPath<Base.State, State>
let actionKeyPath: CaseKeyPath<Base.Action, Action>
#if DEBUG
let isInPerceptionTracking = _PerceptionLocals.isInPerceptionTracking
let initializedInPerceptionTracking = _isInPerceptionTracking
#endif
init(
base: Base,
Expand All @@ -220,7 +220,9 @@ final class ScopedCore<Base: Core, State, Action>: Core {
@inline(__always)
var state: State {
#if DEBUG
return _PerceptionLocals.$skipPerceptionChecking.withValue(isInPerceptionTracking) {
return _PerceptionLocals.$skipPerceptionChecking.withValue(
initializedInPerceptionTracking || _isInPerceptionTracking
) {
base.state[keyPath: stateKeyPath]
}
#else
Expand Down
6 changes: 4 additions & 2 deletions Sources/ComposableArchitecture/Observation/IdentifiedArray+Observation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ extension Store where State: ObservableState {
public struct _StoreCollection<ID: Hashable & Sendable, State, Action>: RandomAccessCollection {
private let store: Store<IdentifiedArray<ID, State>, IdentifiedAction<ID, Action>>
private let data: IdentifiedArray<ID, State>
private let isInPerceptionTracking = _isInPerceptionTracking
private let initializedInPerceptionTracking = _isInPerceptionTracking

#if swift(<5.10)
@MainActor(unsafe)
Expand Down Expand Up @@ -146,7 +146,9 @@ public struct _StoreCollection<ID: Hashable & Sendable, State, Action>: RandomAc
return child
}
#if DEBUG
return _PerceptionLocals.$isInPerceptionTracking.withValue(self.isInPerceptionTracking) {
return _PerceptionLocals.$isInPerceptionTracking.withValue(
self.initializedInPerceptionTracking || _isInPerceptionTracking
) {
child
}
#else
Expand Down
2 changes: 1 addition & 1 deletion Sources/ComposableArchitecture/Store.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ public final class Store<State, Action>: _Store {
func subscribeToDidSet<T: ObservableState>(_ type: T.Type) -> AnyCancellable {
return core.didSet
.prefix { [weak self] _ in self?.core.isInvalid == false }
.compactMap { [weak self] in (self?.currentState as? T)?._$id }
.compactMap { [weak self] in (self?.withState(\.self) as? T)?._$id }
.removeDuplicates()
.dropFirst()
.sink { [weak self, weak parent] _ in
Expand Down
Loading