refactored responder property
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
652088bbb1
commit
e8f225cdc3
@ -66,6 +66,8 @@ open class DropdownSelect: EntryFieldBase {
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Private Properties
|
// MARK: - Private Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
internal override var responder: UIResponder? { dropdownField }
|
||||||
|
|
||||||
internal var minWidthDefault = 66.0
|
internal var minWidthDefault = 66.0
|
||||||
internal var minWidthInlineLabel = 102.0
|
internal var minWidthInlineLabel = 102.0
|
||||||
internal override var minWidth: CGFloat { showInlineLabel ? minWidthInlineLabel : minWidthDefault }
|
internal override var minWidth: CGFloat { showInlineLabel ? minWidthInlineLabel : minWidthDefault }
|
||||||
@ -281,22 +283,6 @@ open class DropdownSelect: EntryFieldBase {
|
|||||||
setNeedsUpdate()
|
setNeedsUpdate()
|
||||||
UIAccessibility.post(notification: .layoutChanged, argument: containerView)
|
UIAccessibility.post(notification: .layoutChanged, argument: containerView)
|
||||||
}
|
}
|
||||||
|
|
||||||
open override var canBecomeFirstResponder: Bool {
|
|
||||||
return dropdownField.canBecomeFirstResponder
|
|
||||||
}
|
|
||||||
|
|
||||||
open override func becomeFirstResponder() -> Bool {
|
|
||||||
return dropdownField.becomeFirstResponder()
|
|
||||||
}
|
|
||||||
|
|
||||||
open override var canResignFirstResponder: Bool {
|
|
||||||
return dropdownField.canResignFirstResponder
|
|
||||||
}
|
|
||||||
|
|
||||||
open override func resignFirstResponder() -> Bool {
|
|
||||||
return dropdownField.resignFirstResponder()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -40,6 +40,8 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Private Properties
|
// MARK: - Private Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
internal var responder: UIResponder? { return nil }
|
||||||
|
|
||||||
internal let mainStackView = UIStackView().with {
|
internal let mainStackView = UIStackView().with {
|
||||||
$0.axis = .vertical
|
$0.axis = .vertical
|
||||||
$0.alignment = .fill
|
$0.alignment = .fill
|
||||||
@ -367,6 +369,22 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
|
|||||||
isReadOnly = false
|
isReadOnly = false
|
||||||
onChange = nil
|
onChange = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
open override var canBecomeFirstResponder: Bool {
|
||||||
|
responder?.canBecomeFirstResponder ?? super.canBecomeFirstResponder
|
||||||
|
}
|
||||||
|
|
||||||
|
open override func becomeFirstResponder() -> Bool {
|
||||||
|
responder?.becomeFirstResponder() ?? super.becomeFirstResponder()
|
||||||
|
}
|
||||||
|
|
||||||
|
open override var canResignFirstResponder: Bool {
|
||||||
|
responder?.canResignFirstResponder ?? super.canResignFirstResponder
|
||||||
|
}
|
||||||
|
|
||||||
|
open override func resignFirstResponder() -> Bool {
|
||||||
|
responder?.resignFirstResponder() ?? super.resignFirstResponder()
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Public Methods
|
// MARK: - Public Methods
|
||||||
|
|||||||
@ -34,6 +34,8 @@ open class InputField: EntryFieldBase {
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Private Properties
|
// MARK: - Private Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
internal override var responder: UIResponder? { textField }
|
||||||
|
|
||||||
internal override var containerBackgroundColor: UIColor {
|
internal override var containerBackgroundColor: UIColor {
|
||||||
if showSuccess {
|
if showSuccess {
|
||||||
return backgroundColorConfiguration.getColor(self)
|
return backgroundColorConfiguration.getColor(self)
|
||||||
@ -102,7 +104,7 @@ open class InputField: EntryFieldBase {
|
|||||||
open var textField = TextField().with {
|
open var textField = TextField().with {
|
||||||
$0.translatesAutoresizingMaskIntoConstraints = false
|
$0.translatesAutoresizingMaskIntoConstraints = false
|
||||||
$0.textStyle = TextStyle.bodyLarge
|
$0.textStyle = TextStyle.bodyLarge
|
||||||
$0.isAccessibilityElement = false
|
$0.isAccessibilityElement = false
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Color configuration for the textField.
|
/// Color configuration for the textField.
|
||||||
@ -280,22 +282,6 @@ open class InputField: EntryFieldBase {
|
|||||||
|
|
||||||
set { super.accessibilityElements = newValue }
|
set { super.accessibilityElements = newValue }
|
||||||
}
|
}
|
||||||
|
|
||||||
open override var canBecomeFirstResponder: Bool {
|
|
||||||
return textField.canBecomeFirstResponder
|
|
||||||
}
|
|
||||||
|
|
||||||
open override func becomeFirstResponder() -> Bool {
|
|
||||||
return textField.becomeFirstResponder()
|
|
||||||
}
|
|
||||||
|
|
||||||
open override var canResignFirstResponder: Bool {
|
|
||||||
return textField.canResignFirstResponder
|
|
||||||
}
|
|
||||||
|
|
||||||
open override func resignFirstResponder() -> Bool {
|
|
||||||
return textField.resignFirstResponder()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
extension InputField: UITextFieldDelegate {
|
extension InputField: UITextFieldDelegate {
|
||||||
@ -308,6 +294,7 @@ extension InputField: UITextFieldDelegate {
|
|||||||
public func textFieldDidEndEditing(_ textField: UITextField) {
|
public func textFieldDidEndEditing(_ textField: UITextField) {
|
||||||
fieldType.handler().textFieldDidEndEditing(self, textField: textField)
|
fieldType.handler().textFieldDidEndEditing(self, textField: textField)
|
||||||
validate()
|
validate()
|
||||||
|
UIAccessibility.post(notification: .layoutChanged, argument: self.containerView)
|
||||||
}
|
}
|
||||||
|
|
||||||
public func textFieldDidChangeSelection(_ textField: UITextField) {
|
public func textFieldDidChangeSelection(_ textField: UITextField) {
|
||||||
|
|||||||
@ -32,6 +32,8 @@ open class TextArea: EntryFieldBase {
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Private Properties
|
// MARK: - Private Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
internal override var responder: UIResponder? { textView }
|
||||||
|
|
||||||
internal var textViewHeightConstraint: NSLayoutConstraint?
|
internal var textViewHeightConstraint: NSLayoutConstraint?
|
||||||
|
|
||||||
internal var inputFieldStackView: UIStackView = {
|
internal var inputFieldStackView: UIStackView = {
|
||||||
@ -159,6 +161,7 @@ open class TextArea: EntryFieldBase {
|
|||||||
.publisher(for: .editingDidEnd)
|
.publisher(for: .editingDidEnd)
|
||||||
.sink { [weak self] _ in
|
.sink { [weak self] _ in
|
||||||
self?.validate()
|
self?.validate()
|
||||||
|
UIAccessibility.post(notification: .layoutChanged, argument: self?.containerView)
|
||||||
}.store(in: &subscribers)
|
}.store(in: &subscribers)
|
||||||
|
|
||||||
textViewHeightConstraint = textView.heightAnchor.constraint(greaterThanOrEqualToConstant: containerSize.height)
|
textViewHeightConstraint = textView.heightAnchor.constraint(greaterThanOrEqualToConstant: containerSize.height)
|
||||||
@ -217,22 +220,6 @@ open class TextArea: EntryFieldBase {
|
|||||||
return stackView
|
return stackView
|
||||||
}
|
}
|
||||||
|
|
||||||
open override var canBecomeFirstResponder: Bool {
|
|
||||||
return textView.canBecomeFirstResponder
|
|
||||||
}
|
|
||||||
|
|
||||||
open override func becomeFirstResponder() -> Bool {
|
|
||||||
return textView.becomeFirstResponder()
|
|
||||||
}
|
|
||||||
|
|
||||||
open override var canResignFirstResponder: Bool {
|
|
||||||
return textView.canResignFirstResponder
|
|
||||||
}
|
|
||||||
|
|
||||||
open override func resignFirstResponder() -> Bool {
|
|
||||||
return textView.resignFirstResponder()
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Private Methods
|
// MARK: - Private Methods
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user