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

Merge remote-tracking branch 'origin/develop' into feature/model_tree_traversal

Browse Source
This commit is contained in:
Kyle Matthew Hedden 2021-03-30 09:24:27 -04:00
commit b394fa426e
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,6 +366,12 @@ import UIKit
setupTextFieldToolbar() setupTextFieldToolbar()
if isSelected { startEditing() } if isSelected { startEditing() }
//Added to override text when view is reloaded.
if let text = model.text, !text.isEmpty {
regexTextFieldOutputIfAvailable()
}
} }
} }

2
MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
View File

@ -685,7 +685,7 @@ public typealias ActionBlock = () -> ()
static func getTextAttachmentImage(name: String = "externalLink", dimension: CGFloat) -> NSTextAttachment { static func getTextAttachmentImage(name: String = "externalLink", dimension: CGFloat) -> NSTextAttachment {
let imageAttachment = NSTextAttachment() let imageAttachment = NSTextAttachment()
imageAttachment.image = MVMCoreUIUtility.imageNamed(name) imageAttachment.image = MVMCoreCache.shared()?.getImageFromRegisteredBundles(name)
imageAttachment.bounds = CGRect(x: 0, y: 0, width: dimension, height: dimension) imageAttachment.bounds = CGRect(x: 0, y: 0, width: dimension, height: dimension)
return imageAttachment return imageAttachment

4
MVMCoreUI/Atomic/Atoms/Views/WebView.swift
View File

@ -16,8 +16,8 @@ import WebKit
var webviewModel: WebViewModel? { var webviewModel: WebViewModel? {
return model as? WebViewModel return model as? WebViewModel
} }
var webView: WKWebView? open var webView: WKWebView?
var overLayer = MVMCoreUICommonViewsUtility.commonView() open var overLayer = MVMCoreUICommonViewsUtility.commonView()
public let loadingSpinner = MFLoadingSpinner(frame: .zero) public let loadingSpinner = MFLoadingSpinner(frame: .zero)
var delegateObject: MVMCoreUIDelegateObject? var delegateObject: MVMCoreUIDelegateObject?
var webViewHeight: NSLayoutConstraint? var webViewHeight: NSLayoutConstraint?

2
MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretAllTextLinks.swift
View File

@ -12,7 +12,7 @@
//-------------------------------------------------- //--------------------------------------------------
public let leftImage = LoadImageView(pinnedEdges: .all) public let leftImage = LoadImageView(pinnedEdges: .all)
public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink() public let eyebrowHeadlineBodyLink = EyebrowHeadlineBodyLink(spacing: 2.0)
public let rightLabel = Label(fontStyle: .RegularBodySmall) public let rightLabel = Label(fontStyle: .RegularBodySmall)
public lazy var rightLabelStackItem: StackItem = { public lazy var rightLabelStackItem: StackItem = {

10
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
View File

@ -22,6 +22,16 @@
get { return model as? EyebrowHeadlineBodyLinkModel } get { return model as? EyebrowHeadlineBodyLinkModel }
} }
//--------------------------------------------------
// MARK: - Initialization
//--------------------------------------------------
public convenience init(spacing: CGFloat) {
self.init(frame: .zero)
stack.stackModel?.spacing = spacing
stack.restack()
}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - MFViewProtocol // MARK: - MFViewProtocol
//-------------------------------------------------- //--------------------------------------------------

2
MVMCoreUI/Atomic/Protocols/ModelProtocols/MoleculeModelProtocol.swift
View File

@ -14,7 +14,7 @@ public protocol MoleculeModelProtocol: ModelProtocol, AccessibilityModelProtocol
public extension MoleculeModelProtocol { public extension MoleculeModelProtocol {
var moleculeName: String { Self.identifier } var moleculeName: String { type(of: self).identifier }
static var categoryName: String { "\(MoleculeModelProtocol.self)" } static var categoryName: String { "\(MoleculeModelProtocol.self)" }