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

Merge branch 'release/9_1_0' into 'develop'

Browse Source 
release/9_1_0 hotfix merge

See merge request BPHV_MIPS/mvm_core_ui!737
This commit is contained in:
Suresh, Kamlesh Jain 2021-07-28 14:36:15 +00:00
commit 75b78d157e
5 changed files with 19 additions and 8 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)
} }
} }

5
MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
View File

@ -207,6 +207,11 @@ open class Carousel: View {
pageIndex = 0 pageIndex = 0
} }
open override func reset() {
super.reset()
pagingView?.reset()
}
var pagingMoleculeName: String? var pagingMoleculeName: String?
/// Sets up the paging molecule /// Sets up the paging molecule

2
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -23,7 +23,7 @@ import UIKit
} }
/// Set if this page is containted in a manager. /// Set if this page is containted in a manager.
public var manager: (UIViewController & MVMCoreViewManagerProtocol)? public weak var manager: (UIViewController & MVMCoreViewManagerProtocol)?
/// A temporary iVar backer for delegateObject() until we change the protocol /// A temporary iVar backer for delegateObject() until we change the protocol
public lazy var delegateObjectIVar: MVMCoreUIDelegateObject = { public lazy var delegateObjectIVar: MVMCoreUIDelegateObject = {

2
MVMCoreUI/Containers/NavigationController.swift
View File

@ -10,7 +10,7 @@ import UIKit
@objcMembers open class NavigationController: UINavigationController, MVMCoreViewManagerViewControllerProtocol { @objcMembers open class NavigationController: UINavigationController, MVMCoreViewManagerViewControllerProtocol {
public var separatorView: Line? public var separatorView: Line?
public var manager: (UIViewController & MVMCoreViewManagerProtocol)? public weak var manager: (UIViewController & MVMCoreViewManagerProtocol)?
/// Getter for the main navigation controller /// Getter for the main navigation controller
public static func navigationController() -> Self? { public static func navigationController() -> Self? {

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()