From 6a8285d8b1bb90bb7ff83654cfb7bff46c552c6a Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 24 Apr 2024 15:31:08 -0500 Subject: [PATCH] updated accessibility Signed-off-by: Matt Bruce --- VDS/Components/Icon/ButtonIcon/ButtonIcon.swift | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift index b1473262..28614e59 100644 --- a/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift +++ b/VDS/Components/Icon/ButtonIcon/ButtonIcon.swift @@ -364,7 +364,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable { open override func setup() { super.setup() isAccessibilityElement = false - accessibilityElements = [icon, badgeIndicator] //create a layoutGuide for the icon to key off of let iconLayoutGuide = UILayoutGuide() @@ -459,6 +458,18 @@ open class ButtonIcon: Control, Changeable, FormFieldable { setNeedsLayout() } + open override func updateAccessibility() { + super.updateAccessibility() + var elements = [Any]() + if iconName != nil { + elements.append(icon) + } + if badgeIndicatorModel != nil { + elements.append(badgeIndicator) + } + accessibilityElements = elements.count > 0 ? elements : nil + } + open override func layoutSubviews() { super.layoutSubviews()