Identify stores based off state identity

Potential fix for #3451.

Author: stephencelis

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,7 +21,10 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
-    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.2.0"),
+    .package(
+      url: "https://github.com/pointfreeco/swift-concurrency-extras",
+      branch: "any-hashable-sendable-flexibility"
+    ),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),

Package.swift

@@ -21,7 +21,10 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
-    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.2.0"),
+    .package(
+      url: "https://github.com/pointfreeco/swift-concurrency-extras",
+      branch: "any-hashable-sendable-flexibility"
+    ),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),

[email protected]

@@ -36,7 +36,24 @@ extension Store: Hashable {
   }
 }
 
-extension Store: Identifiable {}
+extension Store: Identifiable {
+  public struct ID: Hashable {
+    fileprivate let objectIdentifier: ObjectIdentifier
+    fileprivate let stateIdentifier: AnyHashableSendable?
+  }
+
+  public nonisolated var id: ID {
+    ID(
+      objectIdentifier: ObjectIdentifier(self),
+      stateIdentifier: Thread.isMainThread
+        ? MainActor.assumeIsolated {
+          ((currentState as? any Identifiable)?.id as? any Hashable)
+            .map(AnyHashableSendable.init)
+        }
+        : nil
+    )
+  }
+}
 
 extension Store where State: ObservableState {
   /// Scopes the store to optional child state and actions.
@@ -395,7 +412,7 @@ extension Store where State: ObservableState {
     set {
       if newValue == nil,
         let childState = self.state[keyPath: state],
-        id == _identifiableID(childState),
+        id == nil || id == _identifiableID(childState),
         !self._isInvalidated()
       {
         self.send(action(.dismiss))