diff --git a/VDS/Components/Checkbox/Checkbox.swift b/VDS/Components/Checkbox/Checkbox.swift index 0ab14b6d..d1651adf 100644 --- a/VDS/Components/Checkbox/Checkbox.swift +++ b/VDS/Components/Checkbox/Checkbox.swift @@ -231,13 +231,6 @@ open class CheckboxBase: Control, Changable onChange?() } - override open func accessibilityActivate() -> Bool { - // Hold state in case User wanted isAnimated to remain off. - guard isUserInteractionEnabled else { return false } - sendActions(for: .touchUpInside) - return true - } - //-------------------------------------------------- // MARK: - State //-------------------------------------------------- @@ -261,7 +254,6 @@ open class CheckboxBase: Control, Changable setAccessibilityHint(enabled) setAccessibilityValue(viewModel.selected) setAccessibilityLabel(viewModel.selected) - isUserInteractionEnabled = !viewModel.disabled setNeedsLayout() layoutIfNeeded() } diff --git a/VDS/Components/RadioBox/RadioBox.swift b/VDS/Components/RadioBox/RadioBox.swift index ae29b376..300cc770 100644 --- a/VDS/Components/RadioBox/RadioBox.swift +++ b/VDS/Components/RadioBox/RadioBox.swift @@ -229,13 +229,6 @@ open class RadioBoxBase: Control, Changable sendActions(for: .valueChanged) onChange?() } - - override open func accessibilityActivate() -> Bool { - // Hold state in case User wanted isAnimated to remain off. - guard isUserInteractionEnabled else { return false } - sendActions(for: .touchUpInside) - return true - } //-------------------------------------------------- // MARK: - State @@ -261,7 +254,6 @@ open class RadioBoxBase: Control, Changable setAccessibilityHint(enabled) setAccessibilityValue(viewModel.selected) setAccessibilityLabel(viewModel.selected) - isUserInteractionEnabled = !viewModel.disabled setNeedsLayout() layoutIfNeeded() } diff --git a/VDS/Components/RadioButton/RadioButton.swift b/VDS/Components/RadioButton/RadioButton.swift index ac811fdb..6a80f240 100644 --- a/VDS/Components/RadioButton/RadioButton.swift +++ b/VDS/Components/RadioButton/RadioButton.swift @@ -231,14 +231,7 @@ open class RadioButtonBase: Control, Cha sendActions(for: .valueChanged) onChange?() } - - override open func accessibilityActivate() -> Bool { - // Hold state in case User wanted isAnimated to remain off. - guard isUserInteractionEnabled else { return false } - sendActions(for: .touchUpInside) - return true - } - + //-------------------------------------------------- // MARK: - State //-------------------------------------------------- @@ -262,7 +255,6 @@ open class RadioButtonBase: Control, Cha setAccessibilityHint(enabled) setAccessibilityValue(viewModel.selected) setAccessibilityLabel(viewModel.selected) - isUserInteractionEnabled = !viewModel.disabled setNeedsLayout() layoutIfNeeded() } diff --git a/VDS/Components/RadioSwatch/RadioSwatch.swift b/VDS/Components/RadioSwatch/RadioSwatch.swift index e9bf95c7..cbd783c6 100644 --- a/VDS/Components/RadioSwatch/RadioSwatch.swift +++ b/VDS/Components/RadioSwatch/RadioSwatch.swift @@ -143,13 +143,6 @@ open class RadioSwatchBase: Control, Cha sendActions(for: .valueChanged) onChange?() } - - override open func accessibilityActivate() -> Bool { - // Hold state in case User wanted isAnimated to remain off. - guard isUserInteractionEnabled else { return false } - sendActions(for: .touchUpInside) - return true - } //-------------------------------------------------- // MARK: - State @@ -168,11 +161,9 @@ open class RadioSwatchBase: Control, Cha setAccessibilityHint(enabled) setAccessibilityValue(viewModel.selected) setAccessibilityLabel(viewModel.selected) - //isUserInteractionEnabled = !viewModel.disabled setNeedsLayout() layoutIfNeeded() } - //-------------------------------------------------- // MARK: - Configuration Properties diff --git a/VDS/Components/Toggle/Toggle.swift b/VDS/Components/Toggle/Toggle.swift index 384a2e4e..eea6b867 100644 --- a/VDS/Components/Toggle/Toggle.swift +++ b/VDS/Components/Toggle/Toggle.swift @@ -332,14 +332,7 @@ open class ToggleBase: Control, Changable { sendActions(for: .touchUpInside) } - - override open func accessibilityActivate() -> Bool { - // Hold state in case User wanted isAnimated to remain off. - guard isUserInteractionEnabled else { return false } - sendActions(for: .touchUpInside) - return true - } - + //-------------------------------------------------- // MARK: - State //-------------------------------------------------- @@ -357,7 +350,6 @@ open class ToggleBase: Control, Changable { setAccessibilityValue(viewModel.on) setAccessibilityLabel(viewModel.on) backgroundColor = viewModel.surface.color - isUserInteractionEnabled = !viewModel.disabled setNeedsLayout() layoutIfNeeded() }