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

Merge branch 'bugfix/layout_timing_9_1' into 'release/9_1_0'

Browse Source 
error checks

See merge request BPHV_MIPS/mvm_core_ui!742
This commit is contained in:
Pfeil, Scott Robert 2021-07-23 01:44:32 +00:00
commit e9b1c4b64b
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift
View File

@ -88,14 +88,18 @@ import UIKit
} }
@objc public override func dismissFieldInput(_ sender: Any?) { @objc public override func dismissFieldInput(_ sender: Any?) {
performDropdownAction() if !textField.isFirstResponder {
performDropdownAction()
}
super.dismissFieldInput(sender) super.dismissFieldInput(sender)
} }
func performDropdownAction() { func performDropdownAction() {
if let baseDropdownEntryFieldModel = baseDropdownEntryFieldModel, let actionModel = baseDropdownEntryFieldModel.action { guard let baseDropdownEntryFieldModel = baseDropdownEntryFieldModel,
let additionalDataWithSource = additionalData.dictionaryAdding(key: KeySourceModel, value: baseDropdownEntryFieldModel) let actionModel = baseDropdownEntryFieldModel.action
MVMCoreActionHandler.shared()?.asyncHandleAction(with: actionModel, additionalData: additionalDataWithSource, delegateObject: delegateObject) else { return }
}
let additionalDataWithSource = additionalData.dictionaryAdding(key: KeySourceModel, value: baseDropdownEntryFieldModel)
MVMCoreActionHandler.shared()?.asyncHandleAction(with: actionModel, additionalData: additionalDataWithSource, delegateObject: delegateObject)
} }
} }

4
MVMCoreUI/Containers/Views/EntryFieldContainer.swift
View File

@ -270,7 +270,9 @@ import UIKit
bottomBar?.frame = CGRect(x: 0, y: bounds.height - size, width: bounds.width, height: size) bottomBar?.frame = CGRect(x: 0, y: bounds.height - size, width: bounds.width, height: size)
if updateMoleculeLayout || heightChanged { if updateMoleculeLayout || heightChanged {
delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self) DispatchQueue.main.async { [self] in
delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
}
} }
setNeedsDisplay() setNeedsDisplay()