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

identity and callback.

Browse Source
This commit is contained in:
Kevin G Christiano 2019-11-25 12:27:32 -05:00
parent dc8293b08b
commit cfffbabe58
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
View File

@ -275,7 +275,7 @@ import UIKit
var selectPreviousField = false var selectPreviousField = false
for (index, box) in Array(digitBoxes.reversed()).enumerated() { for (index, box) in Array(digitBoxes.reversed()).enumerated() {
if box.digitField == currentTextField { if box.digitField === currentTextField {
if index == digitBoxes.count - 1 { if index == digitBoxes.count - 1 {
return return
} else { } else {
@ -298,7 +298,7 @@ import UIKit
var selectNextField = false var selectNextField = false
for (index, box) in digitBoxes.enumerated() { for (index, box) in digitBoxes.enumerated() {
if box.digitField == currentTextField { if box.digitField === currentTextField {
if index == digitBoxes.count - 1 { if index == digitBoxes.count - 1 {
return return
} else { } else {
@ -404,7 +404,7 @@ extension DigitEntryField {
} }
digitBoxes.forEach { digitBoxes.forEach {
if $0.digitField == textField { if $0.digitField === textField {
selectedDigitBox = $0 selectedDigitBox = $0
$0.isSelected = true $0.isSelected = true
return return
@ -417,7 +417,7 @@ extension DigitEntryField {
@objc public func textFieldDidEndEditing(_ textField: UITextField) { @objc public func textFieldDidEndEditing(_ textField: UITextField) {
digitBoxes.forEach { digitBoxes.forEach {
if $0.digitField == textField { if $0.digitField === textField {
selectedDigitBox = nil selectedDigitBox = nil
$0.isSelected = false $0.isSelected = false
return return

14
MVMCoreUI/Atoms/TextFields/ItemDropdownEntryField.swift
View File

@ -22,6 +22,8 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
/// When selecting for first responder, allow initial selected value to appear in empty text field. /// When selecting for first responder, allow initial selected value to appear in empty text field.
public var setInitialValueInTextField = true public var setInitialValueInTextField = true
public var observeDropdownChange: ((String)->())?
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Initializer // MARK: - Initializer
//-------------------------------------------------- //--------------------------------------------------
@ -64,6 +66,8 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
@objc private func setInitialValueFromPicker() { @objc private func setInitialValueFromPicker() {
guard !pickerData.isEmpty else { return }
if setInitialValueInTextField, let pickerIndex = pickerView?.selectedRow(inComponent: 0) { if setInitialValueInTextField, let pickerIndex = pickerView?.selectedRow(inComponent: 0) {
text = pickerData[pickerIndex] text = pickerData[pickerIndex]
} }
@ -74,6 +78,16 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
setInitialValueFromPicker() setInitialValueFromPicker()
} }
@objc override func endInputing() {
super.endInputing()
guard !pickerData.isEmpty else { return }
if let pickerIndex = pickerView?.selectedRow(inComponent: 0) {
observeDropdownChange?(pickerData[pickerIndex])
}
}
} }
// MARK:- Base Picker Delegate // MARK:- Base Picker Delegate

6
MVMCoreUI/Atoms/TextFields/TextEntryField.swift
View File

@ -89,11 +89,7 @@ import UIKit
// MARK: - Property Observers // MARK: - Property Observers
//-------------------------------------------------- //--------------------------------------------------
public var validationBlock: ((_ value: String?) -> Bool)? { public var validationBlock: ((_ value: String?) -> Bool)?
didSet { //valueChanged()
}
}
public override var errorMessage: String? { public override var errorMessage: String? {
didSet { didSet {