CXTDT-563189 - Dropdown Select Readonly Border color
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
6d1809b8f9
commit
63d698af1d
@ -267,7 +267,7 @@ open class DropdownSelect: EntryFieldBase {
|
|||||||
|
|
||||||
open override func updateErrorLabel() {
|
open override func updateErrorLabel() {
|
||||||
super.updateErrorLabel()
|
super.updateErrorLabel()
|
||||||
if !showError && !hasInternalError {
|
if !showError && !hasInternalError || !optionsPicker.isHidden {
|
||||||
statusIcon.name = .downCaret
|
statusIcon.name = .downCaret
|
||||||
}
|
}
|
||||||
statusIcon.surface = surface
|
statusIcon.surface = surface
|
||||||
@ -348,6 +348,7 @@ extension DropdownSelect: UIPickerViewDelegate, UIPickerViewDataSource {
|
|||||||
}
|
}
|
||||||
optionsPicker.isHidden = !optionsPicker.isHidden
|
optionsPicker.isHidden = !optionsPicker.isHidden
|
||||||
updateContainerView()
|
updateContainerView()
|
||||||
|
updateErrorLabel()
|
||||||
}
|
}
|
||||||
|
|
||||||
public func numberOfComponents(in pickerView: UIPickerView) -> Int {
|
public func numberOfComponents(in pickerView: UIPickerView) -> Int {
|
||||||
|
|||||||
@ -139,6 +139,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
|
|||||||
$0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOnlight, forState: [.focused, .error])
|
$0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOnlight, forState: [.focused, .error])
|
||||||
$0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
|
$0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
|
||||||
$0.setSurfaceColors(VDSColor.feedbackErrorOnlight, VDSColor.feedbackErrorOndark, forState: .error)
|
$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])
|
$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 {
|
open override var state: UIControl.State {
|
||||||
get {
|
get {
|
||||||
var state = super.state
|
var state = super.state
|
||||||
if showError || hasInternalError {
|
if isEnabled {
|
||||||
state.insert(.error)
|
if !isReadOnly && (showError || hasInternalError){
|
||||||
|
state.insert(.error)
|
||||||
|
}
|
||||||
|
if isReadOnly {
|
||||||
|
state.insert(.readonly)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
- CXTDT-556996 - RadioboxGroup – Accessibility - Voice over does not render the group position
|
- CXTDT-556996 - RadioboxGroup – Accessibility - Voice over does not render the group position
|
||||||
- CXTDT-560458 - Dropdown & TextArea voiceover behaviour
|
- CXTDT-560458 - Dropdown & TextArea voiceover behaviour
|
||||||
- CXTDT-560485 - Tilelet - Accessibility
|
- CXTDT-560485 - Tilelet - Accessibility
|
||||||
|
- CXTDT-563189 - Dropdown Select Readonly Border color
|
||||||
|
|
||||||
1.0.64
|
1.0.64
|
||||||
----------------
|
----------------
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user