diff --git a/VDS/Classes/CollectionViewCell.swift b/VDS/Classes/CollectionViewCell.swift index bb2169ac..7a3a0968 100644 --- a/VDS/Classes/CollectionViewCell.swift +++ b/VDS/Classes/CollectionViewCell.swift @@ -43,6 +43,7 @@ open class CollectionViewCell: UICo if model.disabled != disabled { model.disabled = disabled } + isUserInteractionEnabled = isEnabled } } diff --git a/VDS/Classes/Control.swift b/VDS/Classes/Control.swift index de2a2dae..e3adfb56 100644 --- a/VDS/Classes/Control.swift +++ b/VDS/Classes/Control.swift @@ -42,6 +42,7 @@ open class Control: UIControl, ModelHandlerable, ViewProto if model.disabled != disabled { model.disabled = disabled } + isUserInteractionEnabled = isEnabled } } @@ -81,6 +82,14 @@ open class Control: UIControl, ModelHandlerable, ViewProto } } + 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: - Overrides //-------------------------------------------------- diff --git a/VDS/Classes/View.swift b/VDS/Classes/View.swift index 20cc0d6b..a0ed38b2 100644 --- a/VDS/Classes/View.swift +++ b/VDS/Classes/View.swift @@ -42,6 +42,7 @@ open class View: UIView, ModelHandlerable, ViewProtocol, R if model.disabled != disabled { model.disabled = disabled } + isUserInteractionEnabled = isEnabled } } diff --git a/VDS/Components/Label/Label.swift b/VDS/Components/Label/Label.swift index 94f1b9dd..5e710ed1 100644 --- a/VDS/Components/Label/Label.swift +++ b/VDS/Components/Label/Label.swift @@ -42,6 +42,7 @@ open class LabelBase: UILabel, ModelHandlerable, ViewProt if model.disabled != disabled { model.disabled = disabled } + isUserInteractionEnabled = isEnabled } }