From 63d698af1d02c0e2c450ed1c729284f77d7112e5 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Tue, 28 May 2024 09:31:47 -0500
Subject: [PATCH] CXTDT-563189 - Dropdown Select Readonly Border color

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 VDS/Components/DropdownSelect/DropdownSelect.swift |  3 ++-
 VDS/Components/TextFields/EntryFieldBase.swift     | 11 +++++++++--
 VDS/SupportingFiles/ReleaseNotes.txt               |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/VDS/Components/DropdownSelect/DropdownSelect.swift b/VDS/Components/DropdownSelect/DropdownSelect.swift
index 54007c5a..d2f495e6 100644
--- a/VDS/Components/DropdownSelect/DropdownSelect.swift
+++ b/VDS/Components/DropdownSelect/DropdownSelect.swift
@@ -267,7 +267,7 @@ open class DropdownSelect: EntryFieldBase {
     
     open override func updateErrorLabel() {
         super.updateErrorLabel()
-        if !showError && !hasInternalError {
+        if !showError && !hasInternalError || !optionsPicker.isHidden {
             statusIcon.name = .downCaret
         }
         statusIcon.surface = surface
@@ -348,6 +348,7 @@ extension DropdownSelect: UIPickerViewDelegate, UIPickerViewDataSource {
         }
         optionsPicker.isHidden = !optionsPicker.isHidden
         updateContainerView()
+        updateErrorLabel()
     }
     
     public func numberOfComponents(in pickerView: UIPickerView) -> Int {
diff --git a/VDS/Components/TextFields/EntryFieldBase.swift b/VDS/Components/TextFields/EntryFieldBase.swift
index 8cedb2f8..024ed7ba 100644
--- a/VDS/Components/TextFields/EntryFieldBase.swift
+++ b/VDS/Components/TextFields/EntryFieldBase.swift
@@ -139,6 +139,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOnlight, forState: [.focused, .error])
         $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
         $0.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error)
+        $0.setSurfaceColors(VDSFormControlsColor.borderReadonlyOnlight, VDSFormControlsColor.borderReadonlyOndark, forState: .readonly)
+        $0.setSurfaceColors(VDSFormControlsColor.borderReadonlyOnlight, VDSFormControlsColor.borderReadonlyOndark, forState: [.readonly,.error])
         $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.disabled,.error])
     }
     
@@ -192,8 +194,13 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
     open override var state: UIControl.State {
         get {
             var state = super.state
-            if showError || hasInternalError {
-                state.insert(.error)
+            if isEnabled {
+                if !isReadOnly && (showError || hasInternalError){
+                    state.insert(.error)
+                }
+                if isReadOnly {
+                    state.insert(.readonly)
+                }
             }
             return state
         }
diff --git a/VDS/SupportingFiles/ReleaseNotes.txt b/VDS/SupportingFiles/ReleaseNotes.txt
index ac767368..43c608df 100644
--- a/VDS/SupportingFiles/ReleaseNotes.txt
+++ b/VDS/SupportingFiles/ReleaseNotes.txt
@@ -3,6 +3,7 @@
 - CXTDT-556996 - RadioboxGroup – Accessibility - Voice over does not render the group position
 - CXTDT-560458 - Dropdown & TextArea voiceover behaviour
 - CXTDT-560485 - Tilelet - Accessibility
+- CXTDT-563189 - Dropdown Select Readonly Border color
 
 1.0.64
 ----------------