Identify stores based off state identity

.github/package.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -9,24 +9,6 @@
         "version" : "1.0.2"
       }
     },
-    {
-      "identity" : "swift-argument-parser",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser",
-      "state" : {
-        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
-        "version" : "1.5.0"
-      }
-    },
-    {
-      "identity" : "swift-benchmark",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/google/swift-benchmark",
-      "state" : {
-        "revision" : "8163295f6fe82356b0bcf8e1ab991645de17d096",
-        "version" : "0.1.2"
-      }
-    },
     {
       "identity" : "swift-case-paths",
       "kind" : "remoteSourceControl",
@@ -59,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-concurrency-extras",
       "state" : {
-        "revision" : "6054df64b55186f08b6d0fd87152081b8ad8d613",
-        "version" : "1.2.0"
+        "revision" : "163409ef7dae9d960b87f34b51587b6609a76c1f",
+        "version" : "1.3.0"
       }
     },
     {
@@ -122,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-navigation",
       "state" : {
-        "revision" : "e834b3760731160d7d448509ee6a1408c8582a6b",
-        "version" : "2.2.0"
+        "revision" : "16a27ab7ae0abfefbbcba73581b3e2380b47a579",
+        "version" : "2.2.2"
       }
     },
     {

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "345ca5e011bfdb9a07d4b2a72a36fac771eb8263e2cd8901042f6e807a599841",
+  "originHash" : "2543a17f848dd937efce3734c88206d890e3f3b87858f4d92516e977387d1f73",
   "pins" : [
     {
       "identity" : "combine-schedulers",
@@ -42,8 +42,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-concurrency-extras",
       "state" : {
-        "revision" : "6054df64b55186f08b6d0fd87152081b8ad8d613",
-        "version" : "1.2.0"
+        "revision" : "163409ef7dae9d960b87f34b51587b6609a76c1f",
+        "version" : "1.3.0"
       }
     },
     {

Examples/CaseStudies/SwiftUICaseStudies/00-RootView.swift

@@ -40,7 +40,9 @@ struct RootView: View {
                 AlertAndConfirmationDialog()
               }
             ) { store in
-              AlertAndConfirmationDialogView(store: store)
+              UIViewControllerRepresenting {
+                AlertAndConfirmationDialogViewController(store: store)
+              }
             }
           }
           NavigationLink("Focus State") {

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

@@ -101,6 +101,67 @@ struct AlertAndConfirmationDialog {
   }
 }
 
+import UIKit
+final class AlertAndConfirmationDialogViewController: UIViewController {
+  @UIBindable var store: StoreOf<AlertAndConfirmationDialog>
+
+  init(store: StoreOf<AlertAndConfirmationDialog>) {
+    self.store = store
+    super.init(nibName: nil, bundle: nil)
+  }
+
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    let countLabel = UILabel()
+
+    let alertButton = UIButton(type: .system, primaryAction: UIAction { [weak self] _ in
+      self?.store.send(.alertButtonTapped)
+    })
+    alertButton.setTitle("Alert", for: .normal)
+
+    let confirmationDialogButton = UIButton(type: .system, primaryAction: UIAction { [weak self] _ in
+      self?.store.send(.confirmationDialogButtonTapped)
+    })
+    confirmationDialogButton.setTitle("Confirmation Dialog", for: .normal)
+
+    let stack = UIStackView(arrangedSubviews: [
+      countLabel,
+      alertButton,
+      confirmationDialogButton,
+    ])
+    stack.axis = .vertical
+    stack.translatesAutoresizingMaskIntoConstraints = false
+
+    view.addSubview(stack)
+
+    NSLayoutConstraint.activate([
+      stack.topAnchor.constraint(equalTo: view.topAnchor),
+      stack.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+      stack.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+      stack.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+    ])
+
+    observe { [weak self] in
+      guard let self else { return }
+      countLabel.text = "Count: \(store.count)"
+    }
+
+    present(item: $store.scope(state: \.alert, action: \.alert)) { store in
+      UIAlertController(store: store)
+    }
+    present(
+      item: $store.scope(state: \.confirmationDialog, action: \.confirmationDialog)
+    ) { store in
+      UIAlertController(store: store)
+    }
+  }
+}
+
 struct AlertAndConfirmationDialogView: View {
   @Bindable var store: StoreOf<AlertAndConfirmationDialog>
 

Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "e2618e836df1ca46810fbd99802b7402f1b1f9397b7b0d4d9f5ed2a60edd0a1f",
+  "originHash" : "a3ac4bdb0c3813f2d2206b7571a24699473e54cb56d4c1f3d55ca9677ca24e92",
   "pins" : [
     {
       "identity" : "combine-schedulers",
@@ -15,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-case-paths",
       "state" : {
-        "revision" : "642e6aab8e03e5f992d9c83e38c5be98cfad5078",
-        "version" : "1.5.5"
+        "revision" : "bc92c4b27f9a84bfb498cdbfdf35d5a357e9161f",
+        "version" : "1.5.6"
       }
     },
     {
@@ -33,17 +33,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
-        "version" : "1.1.3"
+        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
+        "version" : "1.1.4"
       }
     },
     {
       "identity" : "swift-concurrency-extras",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-concurrency-extras",
       "state" : {
-        "revision" : "6054df64b55186f08b6d0fd87152081b8ad8d613",
-        "version" : "1.2.0"
+        "revision" : "163409ef7dae9d960b87f34b51587b6609a76c1f",
+        "version" : "1.3.0"
       }
     },
     {
@@ -60,8 +60,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-dependencies",
       "state" : {
-        "revision" : "fd1fb25b68fdb9756cd61d23dbd9e2614b340085",
-        "version" : "1.4.0"
+        "revision" : "a24a0f1037b5c65885876be89f598b6f1e70f21c",
+        "version" : "1.5.0"
       }
     },
     {
@@ -123,26 +123,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "7b0bbbae90c41f848f90ac7b4df6c4f50068256d",
-        "version" : "1.17.5"
+        "revision" : "42a086182681cf661f5c47c9b7dc3931de18c6d7",
+        "version" : "1.17.6"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "515f79b522918f83483068d99c68daeb5116342d",
-        "version" : "600.0.0-prerelease-2024-09-04"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
       }
     },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "bc2a151366f2cd0e347274544933bc2acb00c9fe",
-        "version" : "1.4.0"
+        "revision" : "770f990d3e4eececb57ac04a6076e22f8c97daeb",
+        "version" : "1.4.2"
       }
     }
   ],

Package.swift

@@ -21,7 +21,7 @@ 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", from: "1.3.0"),
     .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-6.0.swift

@@ -21,7 +21,7 @@ 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", from: "1.3.0"),
     .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"),

Sources/ComposableArchitecture/Observation/Store+Observation.swift

@@ -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))