refactored out text of base class

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-04-09 15:37:58 -05:00
parent 7b722e4c7e
commit 7b9aa51d0a
3 changed files with 30 additions and 21 deletions

View File

@ -187,12 +187,6 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
} }
} }
/// Override this to conveniently get/set the textfield(s).
open var text: String? {
get { nil }
set { fatalError("You MUST override EntryField's 'text' variable in your subclass.") }
}
open var tooltipModel: Tooltip.TooltipModel? { didSet { setNeedsUpdate() } } open var tooltipModel: Tooltip.TooltipModel? { didSet { setNeedsUpdate() } }
open var transparentBackground: Bool = false { didSet { setNeedsUpdate() } } open var transparentBackground: Bool = false { didSet { setNeedsUpdate() } }
@ -201,18 +195,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
open var inputId: String? { didSet { setNeedsUpdate() } } open var inputId: String? { didSet { setNeedsUpdate() } }
/// The text of this textField. open var value: String? { didSet { setNeedsUpdate() } }
private var _value: String?
open var value: String? {
get { _value }
set {
if let newValue, newValue != _value {
_value = newValue
text = newValue
}
setNeedsUpdate()
}
}
open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() } } open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() } }

View File

@ -79,7 +79,7 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
open var fieldType: FieldType = .text { didSet { setNeedsUpdate() } } open var fieldType: FieldType = .text { didSet { setNeedsUpdate() } }
/// The text of this textField. /// The text of this textField.
open override var text: String? { open var text: String? {
get { textField.text } get { textField.text }
set { set {
if let newValue, newValue != text { if let newValue, newValue != text {
@ -90,6 +90,19 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
} }
} }
/// The value of this textField.
private var _value: String?
open override var value: String? {
get { _value }
set {
if let newValue, newValue != _value {
_value = newValue
text = newValue
}
setNeedsUpdate()
}
}
var _showError: Bool = false var _showError: Bool = false
/// Whether not to show the error. /// Whether not to show the error.
open override var showError: Bool { open override var showError: Bool {

View File

@ -108,7 +108,7 @@ open class TextArea: EntryFieldBase {
/// The text of this textView /// The text of this textView
private var _text: String? private var _text: String?
open override var text: String? { open var text: String? {
get { textView.text } get { textView.text }
set { set {
if let newValue, newValue != _text { if let newValue, newValue != _text {
@ -120,6 +120,19 @@ open class TextArea: EntryFieldBase {
} }
} }
/// The text of this textField.
private var _value: String?
open override var value: String? {
get { _value }
set {
if let newValue, newValue != _value {
_value = newValue
text = newValue
}
setNeedsUpdate()
}
}
/// UITextView shown in the TextArea. /// UITextView shown in the TextArea.
open var textView = TextView().with { open var textView = TextView().with {
$0.translatesAutoresizingMaskIntoConstraints = false $0.translatesAutoresizingMaskIntoConstraints = false