fix(VoiceControl): accessibilityInputLabel for sheet nav links (#520)

mbta · Nov 3, 2024 · 1d96d3e · 1d96d3e
1 parent d07e71c
commit 1d96d3e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/iosApp/iosApp/ComponentViews/DirectionRowView.swift b/iosApp/iosApp/ComponentViews/DirectionRowView.swift
@@ -29,7 +29,6 @@ struct DirectionRowView: View {
             DirectionLabel(direction: direction)
                 .foregroundStyle(Color.text)
         }
-        .accessibilityInputLabels([direction.destination ?? direction.name])
     }
 }
 

diff --git a/iosApp/iosApp/ComponentViews/HeadsignRowView.swift b/iosApp/iosApp/ComponentViews/HeadsignRowView.swift
@@ -31,7 +31,6 @@ struct HeadsignRowView: View {
                 .font(Typography.bodySemibold)
                 .multilineTextAlignment(.leading)
         }
-        .accessibilityInputLabels([headsign])
     }
 }
 

diff --git a/iosApp/iosApp/Pages/NearbyTransit/StopDeparturesSummaryList.swift b/iosApp/iosApp/Pages/NearbyTransit/StopDeparturesSummaryList.swift
@@ -22,6 +22,12 @@ struct StopDeparturesSummaryList: View {
             Array(patternsByStop.patterns.enumerated()),
             id: \.element.id
         ) { index, patterns in
+
+            let inputLabel = switch onEnum(of: patterns) {
+            case let .byHeadsign(byHeadsign): byHeadsign.headsign
+            case let .byDirection(byDirection): byDirection.direction.destination ?? byDirection.direction.name
+            }
+
             VStack(spacing: 0) {
                 SheetNavigationLink(
                     value: .stopDetails(
@@ -36,6 +42,7 @@ struct StopDeparturesSummaryList: View {
                         condenseHeadsignPredictions: condenseHeadsignPredictions
                     )
                 }
+                .accessibilityInputLabels([inputLabel])
                 .padding(8)
                 .frame(minHeight: 44)
                 .padding(.leading, 8)

diff --git a/iosApp/iosApp/Pages/StopDetails/StopDetailsFilteredRouteView.swift b/iosApp/iosApp/Pages/StopDetails/StopDetailsFilteredRouteView.swift
@@ -199,6 +199,7 @@ struct StopDetailsFilteredRouteView: View {
                                                     .onRow(route: row.route) : .none
                                             )
                                         }
+                                        .accessibilityInputLabels([row.headsign])
                                         .padding(.vertical, 10)
                                         .padding(.horizontal, 16)
 

diff --git a/iosApp/iosApp/Pages/TripDetails/TripDetailsStopView.swift b/iosApp/iosApp/Pages/TripDetails/TripDetailsStopView.swift
@@ -30,7 +30,7 @@ struct TripDetailsStopView: View {
                     .accessibilityAddTraits(.isHeader)
                     .accessibilityHeading(.h2)
                 }
-            )
+            ).accessibilityInputLabels([stop.stop.name])
             if !stop.routes.isEmpty {
                 scrollRoutes
                     .accessibilityElement()
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ struct DirectionRowView: View { @@
                 DirectionLabel(direction: direction)
                     .foregroundStyle(Color.text)
             }
-            .accessibilityInputLabels([direction.destination ?? direction.name])
         }
     }
@@ Expand Down @@