From 68f8bfed5371fa754ab56a1be55e9294a65376a3 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Thu, 3 Aug 2023 10:37:34 +0100
Subject: [PATCH] Update compound with row selection. (#1439)

Include accessibility traits in old form styles too.
---
 DesignKit/Package.swift                                       | 2 +-
 ElementX.xcodeproj/project.pbxproj                            | 4 ++--
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 .../Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift  | 2 ++
 project.yml                                                   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/DesignKit/Package.swift b/DesignKit/Package.swift
index 64324944e..3b67ac712 100644
--- a/DesignKit/Package.swift
+++ b/DesignKit/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "DesignKit", targets: ["DesignKit"])
     ],
     dependencies: [
-        .package(url: "https://github.com/vector-im/compound-ios.git", revision: "1f3eb60c4f87249d95addf84ce1aef22c2968763"),
+        .package(url: "https://github.com/vector-im/compound-ios.git", revision: "89e3ed5adef33be7eb65137b861833ffae64f961"),
         .package(url: "https://github.com/vector-im/element-design-tokens.git", exact: "0.0.3"),
         .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.9.0")
     ],
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 8ab89d211..f6f2c63a3 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3670,7 +3670,7 @@
 			path = Timeline;
 			sourceTree = "<group>";
 		};
-		"TEMP_2C2AE7A1-DD19-41AC-BCFD-C9FE3F5EC278" /* element-x-ios */ = {
+		"TEMP_F85F8A84-6E1F-4213-A180-41C5B49354D2" /* element-x-ios */ = {
 			isa = PBXGroup;
 			children = (
 				41553551C55AD59885840F0E /* secrets.xcconfig */,
@@ -5405,7 +5405,7 @@
 			repositoryURL = "https://github.com/vector-im/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = 1f3eb60c4f87249d95addf84ce1aef22c2968763;
+				revision = 89e3ed5adef33be7eb65137b861833ffae64f961;
 			};
 		};
 		9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 9e09fd533..395a59fe4 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -11,9 +11,9 @@
     {
       "identity" : "compound-ios",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/compound-ios.git",
+      "location" : "https://github.com/vector-im/compound-ios",
       "state" : {
-        "revision" : "1f3eb60c4f87249d95addf84ce1aef22c2968763"
+        "revision" : "89e3ed5adef33be7eb65137b861833ffae64f961"
       }
     },
     {
diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
index 80226570f..22ac77a96 100644
--- a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift	
+++ b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift	
@@ -58,11 +58,13 @@ struct FormRowAccessory: View {
                 Image(systemName: "checkmark.circle.fill")
                     .font(.compound.bodyLG)
                     .foregroundColor(isSelected && isEnabled ? .compound.iconPrimary : .compound.iconTertiary)
+                    .accessibilityAddTraits(.isSelected)
             }
         case .multipleSelection(let isSelected):
             Image(systemName: isSelected ? "checkmark.circle.fill" : "circle")
                 .font(.compound.bodyLG)
                 .foregroundColor(isSelected && isEnabled ? .compound.iconPrimary : .compound.iconTertiary)
+                .accessibilityAddTraits(isSelected ? .isSelected : [])
         }
     }
     
diff --git a/project.yml b/project.yml
index a02163b25..2a66926b5 100644
--- a/project.yml
+++ b/project.yml
@@ -54,7 +54,7 @@ packages:
     minorVersion: 5.13.0
   Compound:
     url: https://github.com/vector-im/compound-ios
-    revision: 1f3eb60c4f87249d95addf84ce1aef22c2968763
+    revision: 89e3ed5adef33be7eb65137b861833ffae64f961
     # path: ../compound-ios
   Algorithms:
     url: https://github.com/apple/swift-algorithms