From 80233b6797a2faea895a1d5e90224db7607f4afd Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 29 Apr 2024 09:52:39 -0500 Subject: [PATCH] added error state in the accessibilityLabel Signed-off-by: Matt Bruce --- VDS/BaseClasses/Selector/SelectorBase.swift | 1 + VDS/BaseClasses/Selector/SelectorItemBase.swift | 2 +- VDS/Components/Checkbox/Checkbox.swift | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VDS/BaseClasses/Selector/SelectorBase.swift b/VDS/BaseClasses/Selector/SelectorBase.swift index 161f979d..0b29f4e2 100644 --- a/VDS/BaseClasses/Selector/SelectorBase.swift +++ b/VDS/BaseClasses/Selector/SelectorBase.swift @@ -123,6 +123,7 @@ open class SelectorBase: Control, SelectorControlable { /// Used to update any Accessibility properties.ß open override func updateAccessibility() { super.updateAccessibility() + accessibilityLabel = "\(Self.self)\(showError ? ", error" : "")" } /// This will change the state of the Selector and execute the actionBlock if provided. diff --git a/VDS/BaseClasses/Selector/SelectorItemBase.swift b/VDS/BaseClasses/Selector/SelectorItemBase.swift index 9eee8f29..495ffaf3 100644 --- a/VDS/BaseClasses/Selector/SelectorItemBase.swift +++ b/VDS/BaseClasses/Selector/SelectorItemBase.swift @@ -190,7 +190,7 @@ open class SelectorItemBase: Control, Errorable, /// Used to update any Accessibility properties. open override func updateAccessibility() { super.updateAccessibility() - setAccessibilityLabel(for: [label, childLabel, errorLabel]) + setAccessibilityLabel(for: [selectorView, label, childLabel, errorLabel]) } /// Resets to default settings. diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index d9ca8a7e..550b6db1 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -42,7 +42,6 @@ open class Checkbox: SelectorBase { /// 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() - accessibilityLabel = "Checkbox" backgroundColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .selected) backgroundColorConfiguration.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: [.selected, .highlighted]) @@ -71,7 +70,7 @@ open class Checkbox: SelectorBase { isSelected.toggle() sendActions(for: .valueChanged) } - + open override func layoutSubviews() { super.layoutSubviews()