Bugfix FXIOS-10512 ⁃ [Menu] [Accessibility] - "Tools" and "Save" head…

…ers are not announced (backport #23078) (#23088) Bugfix FXIOS-10512 ⁃ [Menu] [Accessibility] - "Tools" and "Save" headers are not announced (#23078) FXIOS-10512 #23050 ⁃ [Menu redesign] [Accessibility] - "Tools" and "Save" headers are not announced (cherry picked from commit 52f77c9) Co-authored-by: dicarobinho <61138287+dicarobinho@users.noreply.github.com>
mozilla-mobile · Nov 13, 2024 · 00d0299 · 00d0299
1 parent 10ba680
commit 00d0299
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/BrowserKit/Sources/ComponentLibrary/Headers/NavigationHeaderView.swift b/BrowserKit/Sources/ComponentLibrary/Headers/NavigationHeaderView.swift
@@ -98,11 +98,16 @@ public final class NavigationHeaderView: UIView {
 
     public func setupAccessibility(closeButtonA11yLabel: String,
                                    closeButtonA11yId: String,
+                                   titleA11yId: String? = nil,
                                    backButtonA11yLabel: String,
                                    backButtonA11yId: String) {
         let closeButtonViewModel = CloseButtonViewModel(a11yLabel: closeButtonA11yLabel,
                                                         a11yIdentifier: closeButtonA11yId)
         closeButton.configure(viewModel: closeButtonViewModel)
+        if let titleA11yId {
+            titleLabel.isAccessibilityElement = true
+            titleLabel.accessibilityIdentifier = titleA11yId
+        }
         backButton.accessibilityIdentifier = backButtonA11yId
         backButton.accessibilityLabel = backButtonA11yLabel
     }

diff --git a/BrowserKit/Sources/MenuKit/MenuDetailView.swift b/BrowserKit/Sources/MenuKit/MenuDetailView.swift
@@ -49,10 +49,12 @@ public final class MenuDetailView: UIView,
 
     public func setupAccessibilityIdentifiers(closeButtonA11yLabel: String,
                                               closeButtonA11yId: String,
+                                              titleA11yId: String? = nil,
                                               backButtonA11yLabel: String,
                                               backButtonA11yId: String) {
         detailHeaderView.setupAccessibility(closeButtonA11yLabel: closeButtonA11yLabel,
                                             closeButtonA11yId: closeButtonA11yId,
+                                            titleA11yId: titleA11yId,
                                             backButtonA11yLabel: backButtonA11yLabel,
                                             backButtonA11yId: backButtonA11yId)
     }

diff --git a/firefox-ios/Client/Application/AccessibilityIdentifiers.swift b/firefox-ios/Client/Application/AccessibilityIdentifiers.swift
@@ -80,6 +80,7 @@ public struct AccessibilityIdentifiers {
 
         struct NavigationHeaderView {
             static let backButton = "MainMenu.BackButton"
+            static let title = "MainMenu.Title"
             static let closeButton = "MainMenu.CloseMenuButton"
         }
 

diff --git a/firefox-ios/Client/Frontend/Browser/MainMenu/Views/MainMenuDetailsViewController.swift b/firefox-ios/Client/Frontend/Browser/MainMenu/Views/MainMenuDetailsViewController.swift
@@ -102,6 +102,7 @@ class MainMenuDetailsViewController: UIViewController,
         submenuContent.setupAccessibilityIdentifiers(
             closeButtonA11yLabel: .MainMenu.Account.AccessibilityLabels.CloseButton,
             closeButtonA11yId: AccessibilityIdentifiers.MainMenu.NavigationHeaderView.closeButton,
+            titleA11yId: AccessibilityIdentifiers.MainMenu.NavigationHeaderView.title,
             backButtonA11yLabel: .MainMenu.Account.AccessibilityLabels.BackButton,
             backButtonA11yId: AccessibilityIdentifiers.MainMenu.NavigationHeaderView.backButton)
     }