mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored value to be readOnly

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-04-23 16:39:50 -05:00
parent 7e2fdb30e3
commit bb705d8155
5 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
VDS/Components/DropdownSelect/DropdownSelect.swift
View File

@ -37,6 +37,11 @@ open class DropdownSelect: EntryFieldBase {
/// Allows unique ID to be passed to the element.
open var selectId: Int? { didSet { setNeedsUpdate() }}
/// Current SelectedItem Value
open override var value: String? {
selectedItem?.value
}
/// Current SelectedItem
open var selectedItem: DropdownOptionModel? {
guard let selectId else { return nil }
@ -228,7 +233,6 @@ open class DropdownSelect: EntryFieldBase {
open func updateSelectedOptionLabel(option: DropdownOptionModel? = nil) {
selectedOptionLabel.text = option?.text ?? ""
value = option?.value
}
open override func updateErrorLabel() {
@ -278,6 +282,7 @@ extension DropdownSelect: UIPickerViewDelegate, UIPickerViewDataSource {
guard options.count > row else { return }
selectId = row
updateSelectedOptionLabel(option: options[row])
sendActions(for: .valueChanged)
self.onItemSelected?(row, options[row])
}
}

10
VDS/Components/TextFields/EntryFieldBase.swift
View File

@ -201,15 +201,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
open var inputId: String? { didSet { setNeedsUpdate() } }
/// The text of this textField.
internal var _value: String?
open var value: String? {
get { _value }
set {
if let newValue, newValue != _value {
_value = newValue
sendActions(for: .valueChanged)
}
}
get { fatalError("must be read from subclass")}
}
open var defaultValue: AnyHashable? { didSet { setNeedsUpdate() } }
@ -306,7 +299,6 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
transparentBackground = false
width = nil
inputId = nil
value = nil
defaultValue = nil
required = false
readOnly = false

90
VDS/Components/TextFields/InputField/InputField.swift
View File

@ -30,15 +30,15 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
public required init?(coder: NSCoder) {
super.init(coder: coder)
}
//--------------------------------------------------
// MARK: - Enums
//--------------------------------------------------
/// Enum used to describe the input type.
public enum FieldType: String, CaseIterable {
case text, number, calendar, inlineAction, password, creditCard, tel, date, securityCode
case text, number, inlineAction, password, creditCard, tel, date, securityCode
}
//--------------------------------------------------
// MARK: - Private Properties
//--------------------------------------------------
@ -50,9 +50,9 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
$0.spacing = 12
}
}()
internal var minWidthConstraint: NSLayoutConstraint?
//--------------------------------------------------
// MARK: - Public Properties
//--------------------------------------------------
@ -73,39 +73,29 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
$0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true)
$0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: false)
}.eraseToAnyColorable()
/// Representing the type of input.
open var fieldType: FieldType = .text { didSet { setNeedsUpdate() } }
open var leftIcon: Icon = Icon().with { $0.size = .medium }
open var actionTextLink = TextLink().with { $0.contentEdgeInsets = .top(-2) }
open var actionTextLinkModel: TextLinkModel? { didSet { setNeedsUpdate() } }
/// The text of this TextField.
private var _text: String?
open var text: String? {
get { _text }
get { textField.text }
set {
if let newValue, newValue != _text {
_text = newValue
textField.text = newValue
value = newValue
}
setNeedsUpdate()
textField.text = newValue
}
}
/// The value of this textField.
/// Value for the textField
open override var value: String? {
didSet {
if text != value {
text = value
}
}
textField.text
}
var _showError: Bool = false
/// Whether not to show the error.
open override var showError: Bool {
@ -172,10 +162,10 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
textField.heightAnchor.constraint(equalToConstant: 20).isActive = true
textField
.textPublisher
.sink { [weak self] text in
self?.value = text
.sink { [weak self] newText in
self?.text = newText
self?.sendActions(for: .valueChanged)
if newText.isEmpty { self?.passwordActionType = .show }
}.store(in: &subscribers)
stackView.addArrangedSubview(successLabel)
@ -259,13 +249,13 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
}
}
}
open func updateFieldType() {
textField.isSecureTextEntry = false
var minWidth: CGFloat = 40.0
var iconName: Icon.Name?
var actionLinkModel: InputField.TextLinkModel?
var leftIconName: Icon.Name?
var actionModel: InputField.TextLinkModel?
var toolTipModel: Tooltip.TooltipModel?
switch fieldType {
@ -275,14 +265,22 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
case .number:
break
case .calendar:
break
case .inlineAction:
minWidth = 102.0
case .password:
textField.isSecureTextEntry = true
let isHide = passwordActionType == .hide
let buttonText = isHide ? hidePasswordButtonText : showPasswordButtonText
let isSecureTextEntry = !isHide
let nextPasswordActionType = passwordActionType.toggle()
if let text, !text.isEmpty {
actionModel = .init(text: buttonText,
onClick: { [weak self] _ in
guard let self else { return }
self.passwordActionType = nextPasswordActionType
})
textField.isSecureTextEntry = isSecureTextEntry
}
minWidth = 62.0
case .creditCard:
@ -302,13 +300,14 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
//leftIcon
leftIcon.surface = surface
leftIcon.color = iconColorConfiguration.getColor(self)
leftIcon.name = iconName
leftIcon.isHidden = iconName == nil
leftIcon.name = leftIconName
leftIcon.isHidden = leftIconName == nil
//actionLink
actionTextLink.surface = surface
if let actionTextLinkModel = actionLinkModel {
actionTextLink.text = actionTextLinkModel.text
if let actionModel {
actionTextLink.text = actionModel.text
actionTextLink.onClick = actionModel.onClick
actionTextLink.isHidden = false
containerStackView.setCustomSpacing(VDSLayout.space2X, after: statusIcon)
} else {
@ -330,4 +329,21 @@ open class InputField: EntryFieldBase, UITextFieldDelegate {
//tooltip
self.tooltipModel = toolTipModel
}
//--------------------------------------------------
// MARK: - Password
//--------------------------------------------------
enum PasswordAction {
case show, hide
func toggle() -> PasswordAction {
self == .hide ? .show : .hide
}
}
internal var passwordActionType: PasswordAction = .show { didSet { setNeedsUpdate() } }
open var hidePasswordButtonText: String = "Hide" { didSet { setNeedsUpdate() } }
open var showPasswordButtonText: String = "Show" { didSet { setNeedsUpdate() } }
}

14
VDS/Components/TextFields/TextArea/TextArea.swift
View File

@ -102,24 +102,16 @@ open class TextArea: EntryFieldBase {
/// The text of this TextArea.
private var _text: String?
open var text: String? {
get { _text }
get { textView.text }
set {
if let newValue, newValue != _text {
_text = newValue
textView.text = newValue
value = newValue
}
textView.text = newValue
setNeedsUpdate()
}
}
/// The value of this textField.
open override var value: String? {
didSet {
if text != value {
text = value
}
}
return textView.text
}
/// UITextView shown in the TextArea.

2
VDS/Protocols/FormFieldable.swift
View File

@ -15,7 +15,7 @@ public protocol FormFieldable {
var inputId: String? { get set }
/// Value for the Form Field.
var value: ValueType? { get set }
var value: ValueType? { get }
}
/// Protocol for FormFieldable that require internal validation.