mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/vds_ios.git into mbruce/textArea-refactor-entryfield

Browse Source 
# Conflicts:
#	VDS/Components/TextFields/TextArea/TextArea.swift

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-03-05 13:42:27 -06:00
commit 805b0c716c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VDS/Components/TextFields/EntryFieldBase.swift
View File

@ -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

2
VDS/Components/TextFields/TextArea/TextArea.swift
View File

@ -212,7 +212,7 @@ open class TextArea: EntryFieldBase {
characterCounterLabel.text = ""
}
showInternalError = !validator.validate()
hasInternalError = !validator.validate()
internalErrorText = validator.errorMessage
icon.size = .medium