From cb981e29a9f3847951ef579be204408f8e56aecc Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Mon, 15 Feb 2021 10:37:15 -0500
Subject: [PATCH] latest

---
 .../Item Dropdown/ItemDropdownEntryFieldModel.swift    |  5 +----
 .../Item Dropdown/MultiItemDropdownEntryField.swift    |  8 ++++++--
 .../MultiItemDropdownEntryFieldModel.swift             | 10 +++++-----
 .../Atoms/FormFields/TextFields/TextEntryField.swift   | 10 ++++------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift
index 06a14380..bf7416e6 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift	
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift	
@@ -49,10 +49,7 @@
         
         if let selectedIndex = try typeContainer.decodeIfPresent(Int.self, forKey: .selectedIndex) {
             self.selectedIndex = selectedIndex
-        }
-        
-        if let index = selectedIndex {
-            baseValue = options.indices.contains(index) ? options[index] : nil
+            baseValue = options.indices.contains(selectedIndex) ? options[selectedIndex] : nil
         }
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift
index 55aa6855..a2f90ee2 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift	
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryField.swift	
@@ -60,9 +60,11 @@ open class MultiItemDropdownEntryField: BaseItemPickerEntryField {
               let rowText = dropdownModel?.selectedRowText
         else { return }
         
+        // Update observing function and update text UI.
         observeDropdownChange?(text ?? "", rowText)
         text = rowText
         
+        // Set row index value of selected component.
         for component in 0..<componentCount {
             let pickerIndex = pickerView?.selectedRow(inComponent: component)
             dropdownModel?.selectedIndexes[component] = pickerIndex
@@ -88,6 +90,7 @@ open class MultiItemDropdownEntryField: BaseItemPickerEntryField {
               let rowText = dropdownModel?.selectedRowText
         else { return }
         
+        // update observing function with most recent selection.
         observeDropdownSelection?(rowText)
     }
     
@@ -101,8 +104,9 @@ open class MultiItemDropdownEntryField: BaseItemPickerEntryField {
         guard let model = model as? MultiItemDropdownEntryFieldModel else { return }
         
         if let pickerView = pickerView  {
-            for (component, index) in model.selectedIndexes {
-                self.pickerView(pickerView, didSelectRow: index, inComponent: component)
+            // Select initial rows if selectedIndexes retains value.
+            for (component, row) in model.selectedIndexes {
+                self.pickerView(pickerView, didSelectRow: row, inComponent: component)
             }
         }
     }
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift
index 4c4a3eb6..dc4d2177 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift	
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift	
@@ -31,20 +31,20 @@ import Foundation
         return selectedRowText
     }
     
-    /// A string of the picker row concatenated by whitespace.
+    /// A string of the picker row concatenated by whitespace or delimiters if provided.
     public var selectedRowText: String {
         
         var text = ""
         
         for i in 0..<components.count {
             let pickerIndex = selectedIndexes[i] ?? 0
-            if i < components.count, let delimiters = delimiters {
-                text += components[i][pickerIndex] + delimiters[pickerIndex]
+            
+            if i < components.count - 1, let delimiters = delimiters {
+                text += components[i][pickerIndex] + delimiters[i]
                 
             } else {
-                
+                text += components[i][pickerIndex] + (i == components.count - 1 ? "" : " ")
             }
-            text += components[i][pickerIndex] + (i == components.count - 1 ? "" : " ")
         }
         
         return text
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
index e961eddd..fde5bfc4 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
@@ -105,13 +105,11 @@ import UIKit
                 let range = NSRange(newText.startIndex..., in: newText)
                 
                 if let regex = try? NSRegularExpression(pattern: regex) {
-                    let afterText = regex.stringByReplacingMatches(in: newText,
-                                                                   range: range,
-                                                                   withTemplate: mask
-                    )
-                    print(afterText)
+                    let maskedText = regex.stringByReplacingMatches(in: newText,
+                                                                    range: range,
+                                                                    withTemplate: mask)
+                    textField.text = maskedText
                 }
-                
             } else {
                 textField.text = newValue
             }