From 886577e94579f5f74d700f63172580d63f55c803 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 21 Sep 2023 14:54:44 -0500 Subject: [PATCH 1/2] updated accessibility Signed-off-by: Matt Bruce --- VDS/Components/Badge/Badge.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/VDS/Components/Badge/Badge.swift b/VDS/Components/Badge/Badge.swift index 67bbae67..f4a9c99c 100644 --- a/VDS/Components/Badge/Badge.swift +++ b/VDS/Components/Badge/Badge.swift @@ -47,6 +47,7 @@ open class Badge: View { //-------------------------------------------------- /// Label used to render text open var label = Label().with { + $0.isAccessibilityElement = false $0.lineBreakMode = .byTruncatingTail $0.setContentCompressionResistancePriority(.required, for: .vertical) $0.setContentHuggingPriority(.defaultHigh, for: .vertical) @@ -131,8 +132,7 @@ open class Badge: View { /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations. open override func setup() { super.setup() - - accessibilityElements = [label] + isAccessibilityElement = true layer.cornerRadius = 2 addSubview(label) @@ -177,4 +177,10 @@ open class Badge: View { label.surface = surface label.isEnabled = isEnabled } + + open override func updateAccessibility() { + super.updateAccessibility() + + accessibilityLabel = text + } } From 4f68f67a6b503e3c927973470d73b20e44eee2b8 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 21 Sep 2023 14:55:14 -0500 Subject: [PATCH 2/2] updated trait Signed-off-by: Matt Bruce --- VDS/Components/Badge/Badge.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VDS/Components/Badge/Badge.swift b/VDS/Components/Badge/Badge.swift index f4a9c99c..f6bb36d5 100644 --- a/VDS/Components/Badge/Badge.swift +++ b/VDS/Components/Badge/Badge.swift @@ -47,7 +47,7 @@ open class Badge: View { //-------------------------------------------------- /// Label used to render text open var label = Label().with { - $0.isAccessibilityElement = false + $0.isAccessibilityElement = false $0.lineBreakMode = .byTruncatingTail $0.setContentCompressionResistancePriority(.required, for: .vertical) $0.setContentHuggingPriority(.defaultHigh, for: .vertical) @@ -133,6 +133,8 @@ open class Badge: View { open override func setup() { super.setup() isAccessibilityElement = true + accessibilityTraits = .staticText + layer.cornerRadius = 2 addSubview(label)