Put accessibility focus on a successfully scanned cart item

staskus · staskus · commit ca5a8689f4c1 · 2025-06-23T18:47:59.000+03:00
diff --git a/WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift b/WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift
@@ -206,6 +206,8 @@ extension PointOfSaleAggregateModel {
                             productType: .init(cartItem: cartItem)
                         )
                     )
+
+                    cart.accessibilityFocusedItemID = cartItem.id
                 }
             } catch {
                 DDLogInfo("Failed to find item by barcode: \(error)")
diff --git a/WooCommerce/Classes/POS/Presentation/CartView.swift b/WooCommerce/Classes/POS/Presentation/CartView.swift
@@ -97,7 +97,9 @@ struct CartView: View {
                             .padding(.bottom, Constants.cartLastItemBottomPadding)
                             .onChange(of: posModel.cart.accessibilityFocusedItemID) { itemID in
                                 if let itemID = itemID {
-                                    accessibilityFocusedItem = itemID
+                                    Task { @MainActor in
+                                        accessibilityFocusedItem = itemID
+                                    }
                                 }
                             }
                             .animation(Constants.cartAnimation, value: posModel.cart.purchasableItems.map(\.id))

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,8 @@ extension PointOfSaleAggregateModel {`
`206`	`206`	`productType: .init(cartItem: cartItem)`
`207`	`207`	`)`
`208`	`208`	`)`
	`209`	`+`
	`210`	`+ cart.accessibilityFocusedItemID = cartItem.id`
`209`	`211`	`}`
`210`	`212`	`} catch {`
`211`	`213`	`DDLogInfo("Failed to find item by barcode: \(error)")`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ struct CartView: View {`
`97`	`97`	`.padding(.bottom, Constants.cartLastItemBottomPadding)`
`98`	`98`	`.onChange(of: posModel.cart.accessibilityFocusedItemID) { itemID in`
`99`	`99`	`if let itemID = itemID {`
`100`		`- accessibilityFocusedItem = itemID`
	`100`	`+ Task { @MainActor in`
	`101`	`+ accessibilityFocusedItem = itemID`
	`102`	`+ }`
`101`	`103`	`}`
`102`	`104`	`}`
`103`	`105`	`.animation(Constants.cartAnimation, value: posModel.cart.purchasableItems.map(\.id))`