From 05638422f61bf18fe7a2365d8029c573db7ecc24 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Wed, 28 Feb 2024 13:04:11 -0600
Subject: [PATCH 1/7] updated labels to ensure string is valid

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Components/Label/Attributes/AnyLabelAttribute.swift       | 1 +
 VDS/Components/Label/Attributes/ColorLabelAttribute.swift     | 2 ++
 VDS/Components/Label/Attributes/LabelAttributeModel.swift     | 4 ++++
 .../Label/Attributes/StrikeThroughLabelAttribute.swift        | 1 +
 VDS/Components/Label/Attributes/TextStyleLabelAttribute.swift | 1 +
 VDS/Components/Label/Attributes/UnderlineLabelAttribute.swift | 3 ++-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/VDS/Components/Label/Attributes/AnyLabelAttribute.swift b/VDS/Components/Label/Attributes/AnyLabelAttribute.swift
index b914c912..50e76ba7 100644
--- a/VDS/Components/Label/Attributes/AnyLabelAttribute.swift
+++ b/VDS/Components/Label/Attributes/AnyLabelAttribute.swift
@@ -30,6 +30,7 @@ public struct AnyAttribute: LabelAttributeModel {
     }
     
     public func setAttribute(on attributedString: NSMutableAttributedString) {
+        guard isValidRange(on: attributedString) else { return }
         attributedString.removeAttribute(key, range: range)
         attributedString.addAttribute(key, value: value, range: range)
     }
diff --git a/VDS/Components/Label/Attributes/ColorLabelAttribute.swift b/VDS/Components/Label/Attributes/ColorLabelAttribute.swift
index 354fbc93..50229ab0 100644
--- a/VDS/Components/Label/Attributes/ColorLabelAttribute.swift
+++ b/VDS/Components/Label/Attributes/ColorLabelAttribute.swift
@@ -31,6 +31,8 @@ public struct ColorLabelAttribute: LabelAttributeModel {
     }
     
     public func setAttribute(on attributedString: NSMutableAttributedString) {
+        guard isValidRange(on: attributedString) else { return }
+
         var colorRange = range
         if length == 0 && location == 0 {
             colorRange = .init(location: location, length: attributedString.length)
diff --git a/VDS/Components/Label/Attributes/LabelAttributeModel.swift b/VDS/Components/Label/Attributes/LabelAttributeModel.swift
index 62e1bbd8..87708ffb 100644
--- a/VDS/Components/Label/Attributes/LabelAttributeModel.swift
+++ b/VDS/Components/Label/Attributes/LabelAttributeModel.swift
@@ -29,6 +29,10 @@ extension LabelAttributeModel {
     public static func == (lhs: any LabelAttributeModel, rhs: any LabelAttributeModel) -> Bool {
         lhs.isEqual(rhs)
     }
+    
+    public func isValidRange(on attributedString: NSMutableAttributedString) -> Bool {
+        true//range.location + range.length <= attributedString.string.count
+    }
 }
 
 public extension NSAttributedString {
diff --git a/VDS/Components/Label/Attributes/StrikeThroughLabelAttribute.swift b/VDS/Components/Label/Attributes/StrikeThroughLabelAttribute.swift
index 93650f2b..ba4c97ac 100644
--- a/VDS/Components/Label/Attributes/StrikeThroughLabelAttribute.swift
+++ b/VDS/Components/Label/Attributes/StrikeThroughLabelAttribute.swift
@@ -24,6 +24,7 @@ public struct StrikeThroughLabelAttribute: LabelAttributeModel {
     }
     
     public func setAttribute(on attributedString: NSMutableAttributedString) {
+        guard isValidRange(on: attributedString) else { return }
         attributedString.addAttribute(.strikethroughStyle, value: NSUnderlineStyle.thick.rawValue, range: range)
         attributedString.addAttribute(.baselineOffset, value: 0, range: range)
     }
diff --git a/VDS/Components/Label/Attributes/TextStyleLabelAttribute.swift b/VDS/Components/Label/Attributes/TextStyleLabelAttribute.swift
index ae3ea1e5..a161d580 100644
--- a/VDS/Components/Label/Attributes/TextStyleLabelAttribute.swift
+++ b/VDS/Components/Label/Attributes/TextStyleLabelAttribute.swift
@@ -44,6 +44,7 @@ public struct TextStyleLabelAttribute: LabelAttributeModel {
     }
     
     public func setAttribute(on attributedString: NSMutableAttributedString) {
+        guard isValidRange(on: attributedString) else { return }
         attributedString.removeAttribute(.font, range: range)
         attributedString.addAttribute(.font, value: textStyle.font, range: range)
         if let textColor {
diff --git a/VDS/Components/Label/Attributes/UnderlineLabelAttribute.swift b/VDS/Components/Label/Attributes/UnderlineLabelAttribute.swift
index 0ca4e2f9..a2ad403e 100644
--- a/VDS/Components/Label/Attributes/UnderlineLabelAttribute.swift
+++ b/VDS/Components/Label/Attributes/UnderlineLabelAttribute.swift
@@ -52,7 +52,8 @@ public struct UnderlineLabelAttribute: LabelAttributeModel {
     //--------------------------------------------------
     // MARK: - Public Methods
     //--------------------------------------------------
-   public func setAttribute(on attributedString: NSMutableAttributedString) {
+    public func setAttribute(on attributedString: NSMutableAttributedString) {
+        guard isValidRange(on: attributedString) else { return }
         attributedString.addAttribute(.underlineStyle, value: underlineValue.rawValue, range: range)
         if let color = color {
             attributedString.addAttribute(.underlineColor, value: color, range: range)

From 69a23745040dfb10fe755144124a6905faa455ea Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 29 Feb 2024 10:34:10 -0600
Subject: [PATCH 2/7] First cut at form fiedable change

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../Attributes/LabelAttributeModel.swift      |  2 +-
 .../TextFields/EntryFieldBase.swift           |  4 +-
 .../TextFields/InputField/InputField.swift    |  4 +-
 .../TextFields/TextArea/TextArea.swift        | 43 +++++++++++---
 VDS/Protocols/FormFieldable.swift             | 58 ++++++++++++++++++-
 5 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/VDS/Components/Label/Attributes/LabelAttributeModel.swift b/VDS/Components/Label/Attributes/LabelAttributeModel.swift
index 87708ffb..ac43472f 100644
--- a/VDS/Components/Label/Attributes/LabelAttributeModel.swift
+++ b/VDS/Components/Label/Attributes/LabelAttributeModel.swift
@@ -31,7 +31,7 @@ extension LabelAttributeModel {
     }
     
     public func isValidRange(on attributedString: NSMutableAttributedString) -> Bool {
-        true//range.location + range.length <= attributedString.string.count
+        range.location + range.length <= attributedString.string.count
     }
 }
 
diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift
index e66d31a5..3b738549 100644
--- a/VDS/Components/TextFields/EntryFieldBase.swift
+++ b/VDS/Components/TextFields/EntryFieldBase.swift
@@ -13,7 +13,7 @@ import Combine
 
 /// Base Class used to build out a Input controls.
 @objc(VDSEntryField)
-open class EntryFieldBase: Control, Changeable {
+open class EntryFieldBase: Control, Changeable, FormFieldable {    
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -196,7 +196,7 @@ open class EntryFieldBase: Control, Changeable {
     
     open var inputId: String? { didSet { setNeedsUpdate() } }
     
-    open var value: AnyHashable? { didSet { setNeedsUpdate() } }
+    open var value: String? { didSet { setNeedsUpdate() } }
     
     open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() } }
     
diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift
index 589ba28f..7a950a80 100644
--- a/VDS/Components/TextFields/InputField/InputField.swift
+++ b/VDS/Components/TextFields/InputField/InputField.swift
@@ -79,13 +79,13 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
     open var fieldType: FieldType = .text { didSet { setNeedsUpdate() } }
 
     /// The text of this textField.
-    open override var text: String? {
+    open override var value: String? {
         get { textField.text }
         set {
             textField.text = newValue
         }
     }
-    
+
     var _showError: Bool = false
     /// Whether not to show the error.
     open override var showError: Bool {
diff --git a/VDS/Components/TextFields/TextArea/TextArea.swift b/VDS/Components/TextFields/TextArea/TextArea.swift
index 92f5525a..4b99eeb3 100644
--- a/VDS/Components/TextFields/TextArea/TextArea.swift
+++ b/VDS/Components/TextFields/TextArea/TextArea.swift
@@ -107,14 +107,15 @@ open class TextArea: EntryFieldBase {
         }
     }
     
-    /// The text of this textField.
-    open override var text: String? {
+    open override var value: String? {
         get { textView.text }
         set {
             textView.text = newValue
+            setNeedsUpdate()
+            
         }
     }
-    
+
     /// UITextView shown in the TextArea.
     open var textView = TextView().with {
         $0.translatesAutoresizingMaskIntoConstraints = false
@@ -184,7 +185,7 @@ open class TextArea: EntryFieldBase {
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
         super.updateView()
-        
+        countRule.maxLength = maxLength
         textView.isEditable = isEnabled
         textView.isEnabled = isEnabled
         textView.surface = surface
@@ -208,6 +209,9 @@ open class TextArea: EntryFieldBase {
         } else {
             characterCounterLabel.text =  ""
         }
+
+        showError = !validator.validate()
+        errorText = validator.errorMessage
         
         icon.size = .medium
         icon.color = iconColorConfiguration.getColor(self)
@@ -246,12 +250,8 @@ open class TextArea: EntryFieldBase {
         let countStr = (count > maxLength ?? 0) ? ("-" + "\(count-(maxLength ?? 0))") : "\(count)"
         if ((maxLength ?? 0) > 0) {
             if (count > (maxLength ?? 0)) {
-                showError = true
-                errorText = "You have exceeded the character limit."
                 return countStr
             } else {
-                showError = false
-                errorText = ""
                 return ("\(countStr)" + "/" + "\(maxLength ?? 0)")
             }
         } else {
@@ -274,6 +274,33 @@ open class TextArea: EntryFieldBase {
         
         textView.textAttributes = textAttributes
     }
+    
+    //--------------------------------------------------
+    // MARK: - Validation
+    //--------------------------------------------------
+    var countRule = CharacterCountRule()
+    lazy var validator: FieldValidator<TextArea> = {
+        let validator = FieldValidator<TextArea>(field: self, rules: [.init(countRule)])
+        return validator
+    }()
+    
+    class CharacterCountRule: Rule {
+        var maxLength: Int?
+        var errorMessage: String = "You have exceeded the character limit."
+        
+        func isValid(value: String?) -> Bool {
+            guard let text = value else { return true }
+
+            if ((maxLength ?? 0) > 0) {
+                if (text.count > (maxLength ?? 0)) {
+                    return false
+                } else {
+                    return true
+                }
+            }
+            return true
+        }
+    }
 }
 
 extension TextArea: UITextViewDelegate {
diff --git a/VDS/Protocols/FormFieldable.swift b/VDS/Protocols/FormFieldable.swift
index fe015120..294f581c 100644
--- a/VDS/Protocols/FormFieldable.swift
+++ b/VDS/Protocols/FormFieldable.swift
@@ -9,10 +9,66 @@ import Foundation
 
 /// Protocol used for a FormField object.
 public protocol FormFieldable {
+    associatedtype ValueType = AnyHashable
     
     /// Unique Id for the Form Field object within a Form.
     var inputId: String? { get set }
     
     /// Value for the Form Field.
-    var value: AnyHashable? { get set }
+    var value: ValueType? { get set }
+}
+
+public struct AnyRule<ValueType> {
+    private let _isValid: (ValueType?) -> Bool
+    public let errorMessage: String
+
+    init<R: Rule>(_ rule: R) where R.ValueType == ValueType {
+        self._isValid = rule.isValid
+        self.errorMessage = rule.errorMessage
+    }
+
+    public func isValid(value: Any?) -> Bool {
+        guard let typedValue = value as? ValueType? else {
+            return false
+        }
+        return _isValid(typedValue)
+    }
+}
+
+public protocol Rule<ValueType> {
+    associatedtype ValueType
+    func isValid(value: ValueType?) -> Bool
+    var errorMessage: String { get }
+}
+
+public class FieldValidator<Field:FormFieldable>{
+    public var field: Field
+    public var rules: [AnyRule<Field.ValueType>]?
+    public var errorMessages = [String]()
+    
+    public init(field: Field, rules: [AnyRule<Field.ValueType>]? = nil) {
+        self.field = field
+        self.rules = rules
+    }
+    
+    public var errorMessage: String? {
+        errorMessages.joined(separator: "\r")
+    }
+    
+    public func validate() -> Bool{
+        errorMessages.removeAll()
+        
+        guard let rules else {
+            return true
+        }
+        
+        for rule in rules {
+            if !rule.isValid(value: field.value) {
+                errorMessages.append(rule.errorMessage)
+                return false
+            }
+        }
+        return true
+    }
+
 }

From 8b591103c8959b1ea3a634942d9316b3c6aff95f Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 5 Mar 2024 14:44:08 -0600
Subject: [PATCH 3/7] updated documentation

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Protocols/FormFieldable.swift | 76 +++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/VDS/Protocols/FormFieldable.swift b/VDS/Protocols/FormFieldable.swift
index 294f581c..9acc3e5a 100644
--- a/VDS/Protocols/FormFieldable.swift
+++ b/VDS/Protocols/FormFieldable.swift
@@ -18,57 +18,85 @@ public protocol FormFieldable {
     var value: ValueType? { get set }
 }
 
-public struct AnyRule<ValueType> {
+/// Protocol for FormFieldable that require internal validation.
+public protocol FormFieldValidatable: FormFieldable {
+    /// Is there an internalError
+    var hasInternalError: Bool { get }
+    /// Internal Error Message that will show.
+    var internalErrorText: String? { get }
+    /// Validator that will run the Field Validation
+    var validator: (any FormFieldValidatorable)? { get set }
+}
+
+/// Struct that will execute the validation.
+public protocol FormFieldValidatorable {
+    associatedtype FieldType: FormFieldable
+    /// FormFieldable to be validated.
+    var field: FieldType { get set }
+    /// Rules that will be applied against the FormFieldable
+    var rules: [AnyRule<FieldType.ValueType>] { get set }
+    /// Error Message that will show.
+    var errorMessage: String? { get }
+    /// Is the FormField valid.
+    var isValid: Bool { get }
+    /// Run the rules against the FormFieldable.
+    func validate()
+}
+
+/// Rule that will be executed against a specific ValueType.
+public protocol Rule<ValueType> {
+    associatedtype ValueType
+    /// Determines if this rule valid for the value passed.
+    func isValid(value: ValueType?) -> Bool
+    /// Error Message to be show if the value is invalid.
+    var errorMessage: String { get }
+}
+
+/// Type Erased Rule for a specific ValueType.
+public struct AnyRule<ValueType>: Rule {
     private let _isValid: (ValueType?) -> Bool
+
     public let errorMessage: String
 
-    init<R: Rule>(_ rule: R) where R.ValueType == ValueType {
+    public init<R: Rule>(_ rule: R) where R.ValueType == ValueType {
         self._isValid = rule.isValid
         self.errorMessage = rule.errorMessage
     }
 
-    public func isValid(value: Any?) -> Bool {
-        guard let typedValue = value as? ValueType? else {
-            return false
-        }
-        return _isValid(typedValue)
+    public func isValid(value: ValueType?) -> Bool {
+        return _isValid(value)
     }
 }
 
-public protocol Rule<ValueType> {
-    associatedtype ValueType
-    func isValid(value: ValueType?) -> Bool
-    var errorMessage: String { get }
-}
 
-public class FieldValidator<Field:FormFieldable>{
+/// Generic Validator for a specific FormFieldable.
+public class FormFieldValidator<Field:FormFieldable>: FormFieldValidatorable{
     public var field: Field
-    public var rules: [AnyRule<Field.ValueType>]?
+    public var rules: [AnyRule<Field.ValueType>]
     public var errorMessages = [String]()
-    
-    public init(field: Field, rules: [AnyRule<Field.ValueType>]? = nil) {
+    public var isValid: Bool = true
+
+    public init(field: Field, rules: [AnyRule<Field.ValueType>]) {
         self.field = field
         self.rules = rules
     }
     
     public var errorMessage: String? {
-        errorMessages.joined(separator: "\r")
+        guard errorMessages.count > 0 else { return nil }
+        return errorMessages.joined(separator: "\r")
     }
     
-    public func validate() -> Bool{
+    public func validate() {
         errorMessages.removeAll()
         
-        guard let rules else {
-            return true
-        }
-        
         for rule in rules {
             if !rule.isValid(value: field.value) {
                 errorMessages.append(rule.errorMessage)
-                return false
+                isValid = false
+                return
             }
         }
-        return true
+        isValid = true
     }
 
 }

From d847bc3859b9e3d5d97a4ca4141bfa2ffa0eda4b Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 5 Mar 2024 14:44:19 -0600
Subject: [PATCH 4/7] refactored for validator

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Components/TextFields/EntryFieldBase.swift    | 11 ++++++++---
 VDS/Components/TextFields/TextArea/TextArea.swift | 11 +++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift
index 390317f0..7389cf79 100644
--- a/VDS/Components/TextFields/EntryFieldBase.swift
+++ b/VDS/Components/TextFields/EntryFieldBase.swift
@@ -13,7 +13,7 @@ import Combine
 
 /// Base Class used to build out a Input controls.
 @objc(VDSEntryField)
-open class EntryFieldBase: Control, Changeable, FormFieldable {
+open class EntryFieldBase: Control, Changeable, FormFieldValidatable {
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -153,8 +153,11 @@ open class EntryFieldBase: Control, Changeable, FormFieldable {
     /// Whether not to show the error.
     open var showError: Bool = false { didSet { setNeedsUpdate() } }
     
+    /// FormFieldValidator
+    open var validator: (any FormFieldValidatorable)?
+
     /// Whether or not to show the internal error
-    open internal(set) var hasInternalError: Bool = false { didSet { setNeedsUpdate() } }
+    open var hasInternalError: Bool { !(validator?.isValid ?? true) }
 
     /// Override UIControl state to add the .error state if showError is true.
     open override var state: UIControl.State {
@@ -175,7 +178,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldable {
         }
     }
     
-    internal var internalErrorText: String? {
+    open var internalErrorText: String? {
         didSet {
             updateContainerView()
             updateErrorLabel()
@@ -323,6 +326,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldable {
         updateHelperLabel()
         
         backgroundColor = surface.color
+        validator?.validate()
+        internalErrorText = validator?.errorMessage
     }
     
     //--------------------------------------------------
diff --git a/VDS/Components/TextFields/TextArea/TextArea.swift b/VDS/Components/TextFields/TextArea/TextArea.swift
index 5db90fff..57222496 100644
--- a/VDS/Components/TextFields/TextArea/TextArea.swift
+++ b/VDS/Components/TextFields/TextArea/TextArea.swift
@@ -127,6 +127,8 @@ open class TextArea: EntryFieldBase {
         $0.isScrollEnabled = false
     }
     
+    open override var maxLength: Int? { willSet { countRule.maxLength = newValue }}
+    
     /// Color configuration for error icon.
     internal var iconColorConfiguration = ControlColorConfiguration().with {
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
@@ -149,6 +151,7 @@ open class TextArea: EntryFieldBase {
     open override func setup() {
         super.setup()
         accessibilityLabel = "TextArea"
+        validator = FormFieldValidator<TextArea>(field: self, rules: [.init(countRule)])
         
         containerStackView.pinToSuperView(.uniform(VDSFormControls.spaceInset))
         minWidthConstraint = containerView.widthAnchor.constraint(greaterThanOrEqualToConstant: containerSize.width)
@@ -189,7 +192,6 @@ open class TextArea: EntryFieldBase {
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
         super.updateView()
-        countRule.maxLength = maxLength
         textView.isEditable = isEnabled
         textView.isEnabled = isEnabled
         textView.surface = surface
@@ -211,9 +213,6 @@ open class TextArea: EntryFieldBase {
         } else {
             characterCounterLabel.text =  ""
         }
-
-        hasInternalError = !validator.validate()
-        internalErrorText = validator.errorMessage
         
         icon.size = .medium
         icon.color = iconColorConfiguration.getColor(self)
@@ -281,10 +280,6 @@ open class TextArea: EntryFieldBase {
     // MARK: - Validation
     //--------------------------------------------------
     var countRule = CharacterCountRule()
-    lazy var validator: FieldValidator<TextArea> = {
-        let validator = FieldValidator<TextArea>(field: self, rules: [.init(countRule)])
-        return validator
-    }()
     
     class CharacterCountRule: Rule {
         var maxLength: Int?

From d459d5f933eed60efe419fe2f822c406a3f6aa08 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 5 Mar 2024 14:45:19 -0600
Subject: [PATCH 5/7] hide the validator

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Components/TextFields/EntryFieldBase.swift | 2 +-
 VDS/Protocols/FormFieldable.swift              | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift
index 7389cf79..5f74e2f7 100644
--- a/VDS/Components/TextFields/EntryFieldBase.swift
+++ b/VDS/Components/TextFields/EntryFieldBase.swift
@@ -154,7 +154,7 @@ open class EntryFieldBase: Control, Changeable, FormFieldValidatable {
     open var showError: Bool = false { didSet { setNeedsUpdate() } }
     
     /// FormFieldValidator
-    open var validator: (any FormFieldValidatorable)?
+    internal var validator: (any FormFieldValidatorable)?
 
     /// Whether or not to show the internal error
     open var hasInternalError: Bool { !(validator?.isValid ?? true) }
diff --git a/VDS/Protocols/FormFieldable.swift b/VDS/Protocols/FormFieldable.swift
index 9acc3e5a..be7ce3ba 100644
--- a/VDS/Protocols/FormFieldable.swift
+++ b/VDS/Protocols/FormFieldable.swift
@@ -24,8 +24,6 @@ public protocol FormFieldValidatable: FormFieldable {
     var hasInternalError: Bool { get }
     /// Internal Error Message that will show.
     var internalErrorText: String? { get }
-    /// Validator that will run the Field Validation
-    var validator: (any FormFieldValidatorable)? { get set }
 }
 
 /// Struct that will execute the validation.

From 90976d773a60b6ec30fb6a74dde1a218d0126471 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 26 Mar 2024 12:43:09 -0500
Subject: [PATCH 6/7] renamed protocol

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Components/TextFields/EntryFieldBase.swift | 2 +-
 VDS/Protocols/FormFieldable.swift              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift
index 5f74e2f7..5d8957fe 100644
--- a/VDS/Components/TextFields/EntryFieldBase.swift
+++ b/VDS/Components/TextFields/EntryFieldBase.swift
@@ -13,7 +13,7 @@ import Combine
 
 /// Base Class used to build out a Input controls.
 @objc(VDSEntryField)
-open class EntryFieldBase: Control, Changeable, FormFieldValidatable {
+open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
     
     //--------------------------------------------------
     // MARK: - Initializers
diff --git a/VDS/Protocols/FormFieldable.swift b/VDS/Protocols/FormFieldable.swift
index be7ce3ba..70a69ee5 100644
--- a/VDS/Protocols/FormFieldable.swift
+++ b/VDS/Protocols/FormFieldable.swift
@@ -19,7 +19,7 @@ public protocol FormFieldable {
 }
 
 /// Protocol for FormFieldable that require internal validation.
-public protocol FormFieldValidatable: FormFieldable {
+public protocol FormFieldInternalValidatable: FormFieldable {
     /// Is there an internalError
     var hasInternalError: Bool { get }
     /// Internal Error Message that will show.
@@ -66,7 +66,6 @@ public struct AnyRule<ValueType>: Rule {
     }
 }
 
-
 /// Generic Validator for a specific FormFieldable.
 public class FormFieldValidator<Field:FormFieldable>: FormFieldValidatorable{
     public var field: Field

From 620fb1e43bec6b831433941dc7b86c19f35b85c2 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 26 Mar 2024 12:48:08 -0500
Subject: [PATCH 7/7] udpated logic

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Components/TextFields/TextArea/TextArea.swift | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/VDS/Components/TextFields/TextArea/TextArea.swift b/VDS/Components/TextFields/TextArea/TextArea.swift
index 57222496..b5fada0c 100644
--- a/VDS/Components/TextFields/TextArea/TextArea.swift
+++ b/VDS/Components/TextFields/TextArea/TextArea.swift
@@ -206,13 +206,8 @@ open class TextArea: EntryFieldBase {
             widthConstraint?.isActive = false
             minWidthConstraint?.isActive = true
         }
-        
-        let characterError = getCharacterCounterText()
-        if let maxLength, maxLength > 0 {
-            characterCounterLabel.text = characterError
-        } else {
-            characterCounterLabel.text =  ""
-        }
+
+        characterCounterLabel.text =  getCharacterCounterText()
         
         icon.size = .medium
         icon.color = iconColorConfiguration.getColor(self)