diff --git a/VDS/Classes/SelectorItemBase.swift b/VDS/Classes/SelectorItemBase.swift index b1b91985..b7c916b2 100644 --- a/VDS/Classes/SelectorItemBase.swift +++ b/VDS/Classes/SelectorItemBase.swift @@ -186,13 +186,13 @@ open class SelectorItemBase: Control, Errorable, /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() updateLabels() selectorView.showError = showError selectorView.isSelected = isSelected selectorView.isHighlighted = isHighlighted selectorView.disabled = disabled selectorView.surface = surface - updateAccessibility() } open override func updateAccessibility() { diff --git a/VDS/Components/Badge/Badge.swift b/VDS/Components/Badge/Badge.swift index 60b1cd33..bf2ff583 100644 --- a/VDS/Components/Badge/Badge.swift +++ b/VDS/Components/Badge/Badge.swift @@ -133,6 +133,8 @@ open class Badge: View { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + updateTextColorConfig() backgroundColor = backgroundColorConfiguration.getColor(self) diff --git a/VDS/Components/BadgeIndicator/BadgeIndicator.swift b/VDS/Components/BadgeIndicator/BadgeIndicator.swift index b9f72d46..1a00abfc 100644 --- a/VDS/Components/BadgeIndicator/BadgeIndicator.swift +++ b/VDS/Components/BadgeIndicator/BadgeIndicator.swift @@ -312,6 +312,8 @@ open class BadgeIndicator: View { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + updateTextColorConfig() badgeView.backgroundColor = backgroundColorConfiguration.getColor(self) diff --git a/VDS/Components/Buttons/Button/Button.swift b/VDS/Components/Buttons/Button/Button.swift index 42b3150d..f81e3b40 100644 --- a/VDS/Components/Buttons/Button/Button.swift +++ b/VDS/Components/Buttons/Button/Button.swift @@ -152,6 +152,7 @@ open class Button: ButtonBase, Useable { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { super.updateView() + let bgColor = backgroundColorConfiguration.getColor(self) let borderColor = borderColorConfiguration.getColor(self) let borderWidth = use == .secondary ? VDSFormControls.widthBorder : 0.0 diff --git a/VDS/Components/Line/Line.swift b/VDS/Components/Line/Line.swift index 070b3768..c9c33aba 100644 --- a/VDS/Components/Line/Line.swift +++ b/VDS/Components/Line/Line.swift @@ -58,6 +58,8 @@ open class Line: View { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + lineView.backgroundColor = lineViewColorConfiguration.getColor(self) } } diff --git a/VDS/Components/Notification/Notification.swift b/VDS/Components/Notification/Notification.swift index 9d6e0e34..3e704b5e 100644 --- a/VDS/Components/Notification/Notification.swift +++ b/VDS/Components/Notification/Notification.swift @@ -266,6 +266,8 @@ open class Notification: View { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + backgroundColor = backgroundColorConfiguration.getColor(self) updateIcons() updateLabels() diff --git a/VDS/Components/RadioBox/RadioBoxItem.swift b/VDS/Components/RadioBox/RadioBoxItem.swift index d7c9d1bd..e789785e 100644 --- a/VDS/Components/RadioBox/RadioBoxItem.swift +++ b/VDS/Components/RadioBox/RadioBoxItem.swift @@ -261,8 +261,9 @@ open class RadioBoxItem: Control, Changeable { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + updateLabels() - updateAccessibility() setNeedsLayout() layoutIfNeeded() } diff --git a/VDS/Components/RadioSwatch/RadioSwatch.swift b/VDS/Components/RadioSwatch/RadioSwatch.swift index f2898f13..1658482d 100644 --- a/VDS/Components/RadioSwatch/RadioSwatch.swift +++ b/VDS/Components/RadioSwatch/RadioSwatch.swift @@ -127,10 +127,14 @@ open class RadioSwatch: Control { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + layer.setNeedsDisplay() } public override func updateAccessibility() { + super.updateAccessibility() + accessibilityLabel = text } diff --git a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift index e7b29b65..25827392 100644 --- a/VDS/Components/RadioSwatch/RadioSwatchGroup.swift +++ b/VDS/Components/RadioSwatch/RadioSwatchGroup.swift @@ -126,6 +126,8 @@ open class RadioSwatchGroup: SelectorGroupSelectedHandlerBase, UICo /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + label.textPosition = .left label.textStyle = .bodySmall label.text = selectedHandler?.text ?? " " diff --git a/VDS/Components/TextFields/EntryField/EntryField.swift b/VDS/Components/TextFields/EntryField/EntryField.swift index 794b2fa1..819e805e 100644 --- a/VDS/Components/TextFields/EntryField/EntryField.swift +++ b/VDS/Components/TextFields/EntryField/EntryField.swift @@ -260,6 +260,7 @@ open class EntryField: Control, Changeable { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() containerView.backgroundColor = backgroundColorConfiguration.getColor(self) containerView.layer.borderColor = borderColorConfiguration.getColor(self).cgColor diff --git a/VDS/Components/Tilelet/Tilelet.swift b/VDS/Components/Tilelet/Tilelet.swift index 7c19a3fa..0de18f58 100644 --- a/VDS/Components/Tilelet/Tilelet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -374,10 +374,11 @@ open class Tilelet: TileContainer { updateIcons() layoutIfNeeded() - updateAccessibility() } open override func updateAccessibility() { + super.updateAccessibility() + setAccessibilityLabel(for: [badge.label, titleLockup.eyebrowLabel, titleLockup.titleLabel, titleLockup.subTitleLabel]) } } diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index f96d534a..82a602b2 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -193,15 +193,17 @@ open class Toggle: Control, Changeable { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + updateLabel() toggleView.surface = surface toggleView.disabled = disabled toggleView.isOn = isOn - updateAccessibility() } open override func updateAccessibility() { super.updateAccessibility() + if showText { setAccessibilityLabel(for: [label]) } else { diff --git a/VDS/Components/Toggle/ToggleView.swift b/VDS/Components/Toggle/ToggleView.swift index 8729fb72..672c7305 100644 --- a/VDS/Components/Toggle/ToggleView.swift +++ b/VDS/Components/Toggle/ToggleView.swift @@ -154,12 +154,14 @@ open class ToggleView: Control, Changeable { /// Function used to make changes to the View based off a change events or from local properties. open override func updateView() { + super.updateView() + updateToggle() - updateAccessibility() } open override func updateAccessibility() { super.updateAccessibility() + accessibilityLabel = "Toggle" }