Bugfix FXIOS-13915 [New first run onboarding] [Device specific] Links in Terms of Service card are not accessible with VoiceOver (#30204)

Author: razvanlitianu

BrowserKit/Sources/ComponentLibrary/SwiftUI/AttributedLinkText.swift

@@ -12,8 +12,6 @@ public struct AttributedLinkText<Action: RawRepresentable>: View where Action.Ra
     let action: Action
     let linkAction: (Action) -> Void
 
-    @State private var attributedString: AttributedString
-
     public init(
         theme: Theme,
         fullText: String,
@@ -26,24 +24,17 @@ public struct AttributedLinkText<Action: RawRepresentable>: View where Action.Ra
         self.linkText = linkText
         self.action = action
         self.linkAction = linkAction
-
-        var attrString = AttributedString(fullText)
-        attrString.foregroundColor = Color(uiColor: theme.colors.textSecondary)
-
-        let actionURL = URL(string: "action://\(action.rawValue)")!
-        if let range = attrString.range(of: linkText) {
-            attrString[range].underlineStyle = .single
-            attrString[range].foregroundColor = Color(uiColor: theme.colors.actionPrimary)
-            attrString[range].link = actionURL
-        }
-
-        self._attributedString = State(initialValue: attrString)
     }
 
     public var body: some View {
         Text(attributedString)
             .fixedSize(horizontal: false, vertical: true)
-            .accessibilityAddTraits([.isStaticText, .isButton])
+            .accessibilityElement(children: .combine)
+            .accessibilityAddTraits(.isLink)
+            .accessibilityLabel(fullText)
+            .accessibilityAction {
+                linkAction(action)
+            }
             .font(.caption)
             .multilineTextAlignment(.center)
             .environment(\.openURL, OpenURLAction { url in
@@ -56,4 +47,18 @@ public struct AttributedLinkText<Action: RawRepresentable>: View where Action.Ra
                 return .systemAction
             })
     }
+
+    private var attributedString: AttributedString {
+        var attrString = AttributedString(fullText)
+        attrString.foregroundColor = Color(uiColor: theme.colors.textSecondary)
+
+        let actionURL = URL(string: "action://\(action.rawValue)")!
+        if let range = attrString.range(of: linkText) {
+            attrString[range].underlineStyle = .single
+            attrString[range].foregroundColor = Color(uiColor: theme.colors.actionPrimary)
+            attrString[range].link = actionURL
+        }
+
+        return attrString
+    }
 }

BrowserKit/Sources/OnboardingKit/Preview/PreviewModel.swift

@@ -250,8 +250,7 @@ extension PreviewModel {
             onComplete: {}
         ),
         windowUUID: .DefaultUITestingUUID,
-        themeManager: DefaultThemeManager(sharedContainerIdentifier: ""),
-        onEmbededLinkAction: { _ in }
+        themeManager: DefaultThemeManager(sharedContainerIdentifier: "")
     )
 }
 

BrowserKit/Sources/OnboardingKit/Views/Common/TermsOfServiceView.swift

@@ -12,18 +12,15 @@ public struct TermsOfServiceView<ViewModel: OnboardingCardInfoModelProtocol>: Vi
     private var horizontalSizeClass
     let windowUUID: WindowUUID
     var themeManager: ThemeManager
-    public let onEmbededLinkAction: (TosAction) -> Void
 
     public init(
         viewModel: TosFlowViewModel<ViewModel>,
         windowUUID: WindowUUID,
-        themeManager: ThemeManager,
-        onEmbededLinkAction: @escaping (TosAction) -> Void
+        themeManager: ThemeManager
     ) {
         self._viewModel = StateObject(wrappedValue: viewModel)
         self.windowUUID = windowUUID
         self.themeManager = themeManager
-        self.onEmbededLinkAction = onEmbededLinkAction
     }
 
     // MARK: - Body
@@ -43,8 +40,7 @@ public struct TermsOfServiceView<ViewModel: OnboardingCardInfoModelProtocol>: Vi
         TermsOfServiceRegularView(
             viewModel: viewModel,
             windowUUID: windowUUID,
-            themeManager: themeManager,
-            onEmbededLinkAction: onEmbededLinkAction
+            themeManager: themeManager
         )
     }
 
@@ -53,8 +49,7 @@ public struct TermsOfServiceView<ViewModel: OnboardingCardInfoModelProtocol>: Vi
         TermsOfServiceCompactView(
             viewModel: viewModel,
             windowUUID: windowUUID,
-            themeManager: themeManager,
-            onEmbededLinkAction: onEmbededLinkAction
+            themeManager: themeManager
         )
     }
 }

BrowserKit/Sources/OnboardingKit/Views/TermsOfServiceView/TermsOfServiceCompactView.swift

@@ -11,18 +11,15 @@ public struct TermsOfServiceCompactView<ViewModel: OnboardingCardInfoModelProtoc
     @StateObject private var viewModel: TosFlowViewModel<ViewModel>
     public let windowUUID: WindowUUID
     public var themeManager: ThemeManager
-    public let onEmbededLinkAction: (TosAction) -> Void
 
     public init(
         viewModel: TosFlowViewModel<ViewModel>,
         windowUUID: WindowUUID,
-        themeManager: ThemeManager,
-        onEmbededLinkAction: @escaping (TosAction) -> Void
+        themeManager: ThemeManager
     ) {
         self._viewModel = StateObject(wrappedValue: viewModel)
         self.windowUUID = windowUUID
         self.themeManager = themeManager
-        self.onEmbededLinkAction = onEmbededLinkAction
         self.theme = themeManager.getCurrentTheme(for: windowUUID)
     }
 

BrowserKit/Sources/OnboardingKit/Views/TermsOfServiceView/TermsOfServiceRegularView.swift

@@ -11,18 +11,15 @@ public struct TermsOfServiceRegularView<ViewModel: OnboardingCardInfoModelProtoc
     @StateObject private var viewModel: TosFlowViewModel<ViewModel>
     public let windowUUID: WindowUUID
     public var themeManager: ThemeManager
-    public let onEmbededLinkAction: (TosAction) -> Void
 
     public init(
         viewModel: TosFlowViewModel<ViewModel>,
         windowUUID: WindowUUID,
-        themeManager: ThemeManager,
-        onEmbededLinkAction: @escaping (TosAction) -> Void
+        themeManager: ThemeManager
     ) {
         self._viewModel = StateObject(wrappedValue: viewModel)
         self.windowUUID = windowUUID
         self.themeManager = themeManager
-        self.onEmbededLinkAction = onEmbededLinkAction
         self.theme = themeManager.getCurrentTheme(for: windowUUID)
     }
 

firefox-ios/Client/Coordinators/Launch/LaunchCoordinator.swift

@@ -173,8 +173,7 @@ final class LaunchCoordinator: BaseCoordinator,
         let view = TermsOfServiceView(
             viewModel: viewModel,
             windowUUID: windowUUID,
-            themeManager: themeManager,
-            onEmbededLinkAction: { _ in }
+            themeManager: themeManager
         )
 
         let viewController = PortraitOnlyHostingController(rootView: view)