From fb7760a329f05d56455d0346dc85210f7ae2ba7c Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Fri, 15 May 2020 10:55:46 -0400
Subject: [PATCH] moving validator to parent

---
 .../Atomic/Atoms/TextFields/EntryField.swift  | 29 +++++++++++++++++++
 .../Atoms/TextFields/TextEntryField.swift     | 22 ++++----------
 .../Atoms/TextFields/TextViewEntryField.swift | 22 ++++----------
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
index e54cb80f..3a5084c6 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
@@ -49,6 +49,9 @@ import UIKit
     
     public var isValid: Bool = false
     
+    /// Validate on each entry in the textField. Default: true
+    public var validateEachCharacter: Bool = true
+    
     //--------------------------------------------------
     // MARK: - Computed Properties
     //--------------------------------------------------
@@ -229,6 +232,32 @@ import UIKit
         entryFieldContainer.updateView(size)
     }
     
+    //--------------------------------------------------
+    // MARK: - Validation
+    //--------------------------------------------------
+    
+    /// Executes on .textDidBeginEditingNotification
+    @objc func startEditing() {
+        isSelected = true
+    }
+    
+    /// Executes on .textDidChangeNotification (each character entry)
+    @objc func valueChanged() {
+        guard validateEachCharacter else { return }
+    }
+    
+    /// Executes on .textDidEndEditingNotification
+    @objc func endInputing() {
+        isSelected = false
+        resignFirstResponder()
+
+        // Don't show error till user starts typing.
+        guard text?.count ?? 0 != 0 else {
+            showError = false
+            return
+        }
+    }
+    
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index 5b131fe6..969fdfd4 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -51,9 +51,6 @@ import UIKit
     
     private var observingForChange: Bool = false
     
-    /// Validate on each entry in the textField. Default: true
-    public var validateEachCharacter: Bool = true
-    
     /// Validate when user resigns editing. Default: true
     public var validateWhenDoneEditing: Bool = true
     
@@ -261,27 +258,20 @@ import UIKit
     }
     
     /// Executes on UITextField.textDidBeginEditingNotification
-    @objc func startEditing() {
-        isSelected = true
+    @objc override func startEditing() {
+        super.startEditing()
         textField.becomeFirstResponder()
     }
     
     /// Executes on UITextField.textDidChangeNotification (each character entry)
-    @objc func valueChanged() {
-        guard validateEachCharacter else { return }
-        isSelected = true
+    @objc override func valueChanged() {
+        super.valueChanged()
         validateTextField()
     }
     
     /// Executes on UITextField.textDidEndEditingNotification
-    @objc func endInputing() {
-        resignFirstResponder()
-
-        // Don't show error till user starts typing.
-        guard text?.count ?? 0 != 0 else {
-            showError = false
-            return
-        }
+    @objc override func endInputing() {
+        super.endInputing()
 
         if let isValid = textEntryFieldModel?.isValid {
             self.isValid = isValid
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
index 9cbf2c57..4331701c 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
@@ -24,9 +24,6 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     // MARK: - Properties
     //--------------------------------------------------
     
-    /// Validate on each entry in the textView. Default: true
-    public var validateEachCharacter: Bool = true
-    
     private var observingForChange: Bool = false
     
     //--------------------------------------------------
@@ -194,27 +191,20 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     }
     
     /// Executes on UITextView.textDidBeginEditingNotification
-    @objc func startEditing() {
-        isSelected = true
+    @objc override func startEditing() {
+        super.startEditing()
         _ = textView.becomeFirstResponder()
     }
     
     /// Executes on UITextView.textDidChangeNotification (each character entry)
-    @objc func valueChanged() {
-        guard validateEachCharacter else { return }
+    @objc override func valueChanged() {
+        super.valueChanged()
         validateTextView()
     }
     
     /// Executes on UITextView.textDidEndEditingNotification
-    @objc func endInputing() {
-        isSelected = false
-        resignFirstResponder()
-
-        // Don't show error till user starts typing.
-        guard text?.count ?? 0 != 0 else {
-            showError = false
-            return
-        }
+    @objc override func endInputing() {
+        super.endInputing()
 
         if let isValid = textViewEntryFieldModel?.isValid {
             self.isValid = isValid