From b6ed03adaec1b5d4969ad8cf602a5328d3d7e7ae Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 5 Oct 2023 15:36:25 -0500 Subject: [PATCH] ONEAPP-4684 - Acessibility - Tooltip Signed-off-by: Matt Bruce --- VDS/Components/Tooltip/Tooltip.swift | 1 - VDS/Components/Tooltip/TooltipAlertViewController.swift | 4 ++-- VDS/Components/Tooltip/TooltipDialog.swift | 2 +- VDS/SupportingFiles/ReleaseNotes.txt | 4 ++++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/VDS/Components/Tooltip/Tooltip.swift b/VDS/Components/Tooltip/Tooltip.swift index 5b8390c8..c6ae86ba 100644 --- a/VDS/Components/Tooltip/Tooltip.swift +++ b/VDS/Components/Tooltip/Tooltip.swift @@ -180,7 +180,6 @@ open class Tooltip: Control, TooltipLaunchable { accessibilityLabel = "Modal" } accessibilityHint = isEnabled ? "Double tap to open." : "" - accessibilityValue = "collapsed" } public static func accessibleText(for title: String?, content: String?, closeButtonText: String) -> String { diff --git a/VDS/Components/Tooltip/TooltipAlertViewController.swift b/VDS/Components/Tooltip/TooltipAlertViewController.swift index 60300997..63645c0e 100644 --- a/VDS/Components/Tooltip/TooltipAlertViewController.swift +++ b/VDS/Components/Tooltip/TooltipAlertViewController.swift @@ -67,14 +67,14 @@ open class TooltipAlertViewController: UIViewController, Surfaceable { //left-right swipe view.publisher(for: UISwipeGestureRecognizer().with{ $0.direction = .right }) .sink { [weak self] swipe in - guard let self else { return } + guard let self, !UIAccessibility.isVoiceOverRunning else { return } self.dismiss() }.store(in: &subscribers) //tapping in background view.publisher(for: UITapGestureRecognizer().with{ $0.numberOfTapsRequired = 1 }) .sink { [weak self] swipe in - guard let self else { return } + guard let self, !UIAccessibility.isVoiceOverRunning else { return } self.dismiss() }.store(in: &subscribers) diff --git a/VDS/Components/Tooltip/TooltipDialog.swift b/VDS/Components/Tooltip/TooltipDialog.swift index a3db25c3..a5db8627 100644 --- a/VDS/Components/Tooltip/TooltipDialog.swift +++ b/VDS/Components/Tooltip/TooltipDialog.swift @@ -48,7 +48,6 @@ open class TooltipDialog: View, UIScrollViewDelegate { lazy var primaryAccessibilityElement = UIAccessibilityElement(accessibilityContainer: self).with { $0.accessibilityLabel = "Modal" - $0.accessibilityValue = "expanded" $0.accessibilityFrameInContainerSpace = .init(origin: .zero, size: .init(width: fullWidth, height: VDSLayout.Spacing.space1X.value)) } @@ -59,6 +58,7 @@ open class TooltipDialog: View, UIScrollViewDelegate { open var titleLabel = Label().with { label in label.isAccessibilityElement = true + label.accessibilityTraits = .header label.textStyle = .boldTitleMedium } diff --git a/VDS/SupportingFiles/ReleaseNotes.txt b/VDS/SupportingFiles/ReleaseNotes.txt index 7531c46f..606a1d36 100644 --- a/VDS/SupportingFiles/ReleaseNotes.txt +++ b/VDS/SupportingFiles/ReleaseNotes.txt @@ -1,3 +1,7 @@ +1.0.45 +======= +- ONEAPP-4684 - Acessibility - Tooltip + 1.0.44 ======= - ONEAPP-5109 - Typography/Label - Accessibility iOS