diff --git a/VDS/BaseClasses/Control.swift b/VDS/BaseClasses/Control.swift index 2a9fe769..7aa08717 100644 --- a/VDS/BaseClasses/Control.swift +++ b/VDS/BaseClasses/Control.swift @@ -129,7 +129,6 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable { //-------------------------------------------------- open var accessibilityAction: ((Control) -> Void)? - private var _isAccessibilityElement: Bool = false open override var isAccessibilityElement: Bool { get { var block: AXBoolReturnBlock? @@ -137,7 +136,7 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable { // if #available(iOS 17, *) { // block = isAccessibilityElementBlock // } - + if block == nil { block = bridge_isAccessibilityElementBlock } @@ -145,15 +144,14 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable { if let block { return block() } else { - return _isAccessibilityElement + return super.isAccessibilityElement } } set { - _isAccessibilityElement = newValue + super.isAccessibilityElement = newValue } } - private var _accessibilityLabel: String? open override var accessibilityLabel: String? { get { var block: AXStringReturnBlock? @@ -168,15 +166,14 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable { if let block { return block() } else { - return _accessibilityLabel + return super.accessibilityLabel } } set { - _accessibilityLabel = newValue + super.accessibilityLabel = newValue } } - private var _accessibilityHint: String? open override var accessibilityHint: String? { get { var block: AXStringReturnBlock? @@ -191,15 +188,14 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable { if let block { return block() } else { - return _accessibilityHint + return super.accessibilityHint } } set { - _accessibilityHint = newValue + super.accessibilityHint = newValue } } - private var _accessibilityValue: String? open override var accessibilityValue: String? { get { var block: AXStringReturnBlock? @@ -215,11 +211,11 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable { if let block{ return block() } else { - return _accessibilityValue + return super.accessibilityValue } } set { - _accessibilityValue = newValue + super.accessibilityValue = newValue } } diff --git a/VDS/BaseClasses/View.swift b/VDS/BaseClasses/View.swift index c7df1765..7e88df8e 100644 --- a/VDS/BaseClasses/View.swift +++ b/VDS/BaseClasses/View.swift @@ -96,7 +96,6 @@ open class View: UIView, ViewProtocol, UserInfoable { //-------------------------------------------------- open var accessibilityAction: ((View) -> Void)? - private var _isAccessibilityElement: Bool = false open override var isAccessibilityElement: Bool { get { var block: AXBoolReturnBlock? @@ -112,22 +111,21 @@ open class View: UIView, ViewProtocol, UserInfoable { if let block { return block() } else { - return _isAccessibilityElement + return super.isAccessibilityElement } } set { - _isAccessibilityElement = newValue + super.isAccessibilityElement = newValue } } - private var _accessibilityLabel: String? open override var accessibilityLabel: String? { get { var block: AXStringReturnBlock? // if #available(iOS 17, *) { // block = accessibilityLabelBlock // } -// + if block == nil { block = bridge_accessibilityLabelBlock } @@ -135,15 +133,14 @@ open class View: UIView, ViewProtocol, UserInfoable { if let block { return block() } else { - return _accessibilityLabel + return super.accessibilityLabel } } set { - _accessibilityLabel = newValue + super.accessibilityLabel = newValue } } - private var _accessibilityHint: String? open override var accessibilityHint: String? { get { var block: AXStringReturnBlock? @@ -158,15 +155,14 @@ open class View: UIView, ViewProtocol, UserInfoable { if let block { return block() } else { - return _accessibilityHint + return super.accessibilityHint } } set { - _accessibilityHint = newValue + super.accessibilityHint = newValue } } - private var _accessibilityValue: String? open override var accessibilityValue: String? { get { var block: AXStringReturnBlock? @@ -182,11 +178,11 @@ open class View: UIView, ViewProtocol, UserInfoable { if let block{ return block() } else { - return _accessibilityValue + return super.accessibilityValue } } set { - _accessibilityValue = newValue + super.accessibilityValue = newValue } } diff --git a/VDS/Components/Buttons/ButtonBase.swift b/VDS/Components/Buttons/ButtonBase.swift index 720fca36..eebf3a68 100644 --- a/VDS/Components/Buttons/ButtonBase.swift +++ b/VDS/Components/Buttons/ButtonBase.swift @@ -114,11 +114,6 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { titleLabel?.adjustsFontSizeToFitWidth = false titleLabel?.lineBreakMode = .byTruncatingTail titleLabel?.numberOfLines = 1 - - bridge_accessibilityLabelBlock = { [weak self] in - guard let self else { return nil } - return text - } } open func updateView() { @@ -182,7 +177,6 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { //-------------------------------------------------- open var accessibilityAction: ((ButtonBase) -> Void)? - private var _isAccessibilityElement: Bool = false open override var isAccessibilityElement: Bool { get { var block: AXBoolReturnBlock? @@ -198,15 +192,14 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { if let block { return block() } else { - return _isAccessibilityElement + return super.isAccessibilityElement } } set { - _isAccessibilityElement = newValue + super.isAccessibilityElement = newValue } } - private var _accessibilityLabel: String? open override var accessibilityLabel: String? { get { var block: AXStringReturnBlock? @@ -221,15 +214,14 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { if let block { return block() } else { - return _accessibilityLabel + return super.accessibilityLabel } } set { - _accessibilityLabel = newValue + super.accessibilityLabel = newValue } } - private var _accessibilityHint: String? open override var accessibilityHint: String? { get { var block: AXStringReturnBlock? @@ -244,15 +236,14 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { if let block { return block() } else { - return _accessibilityHint + return super.accessibilityHint } } set { - _accessibilityHint = newValue + super.accessibilityHint = newValue } } - private var _accessibilityValue: String? open override var accessibilityValue: String? { get { var block: AXStringReturnBlock? @@ -268,11 +259,11 @@ open class ButtonBase: UIButton, ViewProtocol, UserInfoable, Clickable { if let block{ return block() } else { - return _accessibilityValue + return super.accessibilityValue } } set { - _accessibilityValue = newValue + super.accessibilityValue = newValue } } diff --git a/VDS/Components/Label/Label.swift b/VDS/Components/Label/Label.swift index dccc0353..e408953b 100644 --- a/VDS/Components/Label/Label.swift +++ b/VDS/Components/Label/Label.swift @@ -214,10 +214,6 @@ open class Label: UILabel, ViewProtocol, UserInfoable { } open func setup() { - bridge_accessibilityLabelBlock = { [weak self] in - guard let self else { return "" } - return text - } } open func reset() { @@ -498,7 +494,6 @@ open class Label: UILabel, ViewProtocol, UserInfoable { open var accessibilityAction: ((Label) -> Void)? - private var _isAccessibilityElement: Bool = false open override var isAccessibilityElement: Bool { get { var block: AXBoolReturnBlock? @@ -514,15 +509,14 @@ open class Label: UILabel, ViewProtocol, UserInfoable { if let block { return block() } else { - return _isAccessibilityElement + return super.isAccessibilityElement } } set { - _isAccessibilityElement = newValue + super.isAccessibilityElement = newValue } } - private var _accessibilityLabel: String? open override var accessibilityLabel: String? { get { var block: AXStringReturnBlock? @@ -537,15 +531,14 @@ open class Label: UILabel, ViewProtocol, UserInfoable { if let block { return block() } else { - return _accessibilityLabel + return super.accessibilityLabel } } set { - _accessibilityLabel = newValue + super.accessibilityLabel = newValue } } - private var _accessibilityHint: String? open override var accessibilityHint: String? { get { var block: AXStringReturnBlock? @@ -560,15 +553,14 @@ open class Label: UILabel, ViewProtocol, UserInfoable { if let block { return block() } else { - return _accessibilityHint + return super.accessibilityHint } } set { - _accessibilityHint = newValue + super.accessibilityHint = newValue } } - private var _accessibilityValue: String? open override var accessibilityValue: String? { get { var block: AXStringReturnBlock? @@ -584,11 +576,11 @@ open class Label: UILabel, ViewProtocol, UserInfoable { if let block{ return block() } else { - return _accessibilityValue + return super.accessibilityValue } } set { - _accessibilityValue = newValue + super.accessibilityValue = newValue } } diff --git a/VDS/Components/TextFields/InputField/TextField.swift b/VDS/Components/TextFields/InputField/TextField.swift index 0108c874..05dc30f2 100644 --- a/VDS/Components/TextFields/InputField/TextField.swift +++ b/VDS/Components/TextFields/InputField/TextField.swift @@ -236,7 +236,6 @@ open class TextField: UITextField, ViewProtocol, Errorable { //-------------------------------------------------- open var accessibilityAction: ((TextField) -> Void)? - private var _isAccessibilityElement: Bool = false open override var isAccessibilityElement: Bool { get { var block: AXBoolReturnBlock? @@ -252,15 +251,14 @@ open class TextField: UITextField, ViewProtocol, Errorable { if let block { return block() } else { - return _isAccessibilityElement + return super.isAccessibilityElement } } set { - _isAccessibilityElement = newValue + super.isAccessibilityElement = newValue } } - private var _accessibilityLabel: String? open override var accessibilityLabel: String? { get { var block: AXStringReturnBlock? @@ -275,15 +273,14 @@ open class TextField: UITextField, ViewProtocol, Errorable { if let block { return block() } else { - return _accessibilityLabel + return super.accessibilityLabel } } set { - _accessibilityLabel = newValue + super.accessibilityLabel = newValue } } - private var _accessibilityHint: String? open override var accessibilityHint: String? { get { var block: AXStringReturnBlock? @@ -298,15 +295,14 @@ open class TextField: UITextField, ViewProtocol, Errorable { if let block { return block() } else { - return _accessibilityHint + return super.accessibilityHint } } set { - _accessibilityHint = newValue + super.accessibilityHint = newValue } } - private var _accessibilityValue: String? open override var accessibilityValue: String? { get { var block: AXStringReturnBlock? @@ -322,11 +318,11 @@ open class TextField: UITextField, ViewProtocol, Errorable { if let block{ return block() } else { - return _accessibilityValue + return super.accessibilityValue } } set { - _accessibilityValue = newValue + super.accessibilityValue = newValue } } diff --git a/VDS/Components/TextFields/TextArea/TextView.swift b/VDS/Components/TextFields/TextArea/TextView.swift index ed622f90..54fa9452 100644 --- a/VDS/Components/TextFields/TextArea/TextView.swift +++ b/VDS/Components/TextFields/TextArea/TextView.swift @@ -151,7 +151,6 @@ open class TextView: UITextView, ViewProtocol, Errorable { //-------------------------------------------------- open var accessibilityAction: ((TextView) -> Void)? - private var _isAccessibilityElement: Bool = false open override var isAccessibilityElement: Bool { get { var block: AXBoolReturnBlock? @@ -167,15 +166,14 @@ open class TextView: UITextView, ViewProtocol, Errorable { if let block { return block() } else { - return _isAccessibilityElement + return super.isAccessibilityElement } } set { - _isAccessibilityElement = newValue + super.isAccessibilityElement = newValue } } - private var _accessibilityLabel: String? open override var accessibilityLabel: String? { get { var block: AXStringReturnBlock? @@ -190,15 +188,14 @@ open class TextView: UITextView, ViewProtocol, Errorable { if let block { return block() } else { - return _accessibilityLabel + return super.accessibilityLabel } } set { - _accessibilityLabel = newValue + super.accessibilityLabel = newValue } } - private var _accessibilityHint: String? open override var accessibilityHint: String? { get { var block: AXStringReturnBlock? @@ -213,15 +210,14 @@ open class TextView: UITextView, ViewProtocol, Errorable { if let block { return block() } else { - return _accessibilityHint + return super.accessibilityHint } } set { - _accessibilityHint = newValue + super.accessibilityHint = newValue } } - private var _accessibilityValue: String? open override var accessibilityValue: String? { get { var block: AXStringReturnBlock? @@ -237,11 +233,11 @@ open class TextView: UITextView, ViewProtocol, Errorable { if let block{ return block() } else { - return _accessibilityValue + return super.accessibilityValue } } set { - _accessibilityValue = newValue + super.accessibilityValue = newValue } }