diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift index fe586550..390317f0 100644 --- a/VDS/Components/TextFields/EntryFieldBase.swift +++ b/VDS/Components/TextFields/EntryFieldBase.swift @@ -154,13 +154,13 @@ open class EntryFieldBase: Control, Changeable, FormFieldable { open var showError: Bool = false { didSet { setNeedsUpdate() } } /// Whether or not to show the internal error - internal var showInternalError: Bool = false { didSet { setNeedsUpdate() } } + open internal(set) var hasInternalError: Bool = false { didSet { setNeedsUpdate() } } /// Override UIControl state to add the .error state if showError is true. open override var state: UIControl.State { get { var state = super.state - if showError || showInternalError { + if showError || hasInternalError { state.insert(.error) } return state @@ -379,7 +379,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldable { } open func updateErrorLabel(){ - if showError, showInternalError, let errorText, let internalErrorText { + if showError, hasInternalError, let errorText, let internalErrorText { errorLabel.text = [internalErrorText, errorText].joined(separator: "\n") errorLabel.surface = surface errorLabel.isEnabled = isEnabled @@ -397,7 +397,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldable { icon.color = VDSColor.paletteBlack icon.surface = surface icon.isHidden = !isEnabled - } else if showInternalError, let internalErrorText { + } else if hasInternalError, let internalErrorText { errorLabel.text = internalErrorText errorLabel.surface = surface errorLabel.isEnabled = isEnabled diff --git a/VDS/Components/TextFields/TextArea/TextArea.swift b/VDS/Components/TextFields/TextArea/TextArea.swift index 70018ab7..5db90fff 100644 --- a/VDS/Components/TextFields/TextArea/TextArea.swift +++ b/VDS/Components/TextFields/TextArea/TextArea.swift @@ -212,7 +212,7 @@ open class TextArea: EntryFieldBase { characterCounterLabel.text = "" } - showInternalError = !validator.validate() + hasInternalError = !validator.validate() internalErrorText = validator.errorMessage icon.size = .medium