diff --git a/VDS/BaseClasses/Selector/SelectorBase.swift b/VDS/BaseClasses/Selector/SelectorBase.swift index 1e2f5fba..fd794479 100644 --- a/VDS/BaseClasses/Selector/SelectorBase.swift +++ b/VDS/BaseClasses/Selector/SelectorBase.swift @@ -100,9 +100,11 @@ open class SelectorBase: Control, SelectorControlable { //-------------------------------------------------- // MARK: - Overrides //-------------------------------------------------- - /// Executed on initialization for this View. - open override func initialSetup() { - super.initialSetup() + + /// 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() + onClick = { control in control.toggle() } @@ -116,14 +118,10 @@ open class SelectorBase: Control, SelectorControlable { guard let self else { return "" } return !isEnabled ? "" : "Double tap to activate." } - } - - /// 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() - + isAccessibilityElement = true accessibilityTraits = .button + } open override func updateView() { diff --git a/VDS/BaseClasses/Selector/SelectorItemBase.swift b/VDS/BaseClasses/Selector/SelectorItemBase.swift index 44ed01b1..e27a9f94 100644 --- a/VDS/BaseClasses/Selector/SelectorItemBase.swift +++ b/VDS/BaseClasses/Selector/SelectorItemBase.swift @@ -157,9 +157,11 @@ open class SelectorItemBase: Control, Errorable, Changea //-------------------------------------------------- // MARK: - Overrides //-------------------------------------------------- - /// Executed on initialization for this View. - open override func initialSetup() { - super.initialSetup() + + /// 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() + onClick = { [weak self] control in guard let self, isEnabled else { return } toggle() @@ -204,13 +206,7 @@ open class SelectorItemBase: Control, Errorable, Changea return !isEnabled ? "" : "Double tap to activate." } - } - - /// 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() - - selectorView.isAccessibilityElement = true + selectorView.isAccessibilityElement = true isAccessibilityElement = false addSubview(mainStackView)