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

Merge branch 'feature/fixes_stack_and_label_link' into 'develop'

Browse Source 
Fix for label and molecule stack

See merge request BPHV_MIPS/mvm_core_ui!157
This commit is contained in:
Pfeil, Scott Robert 2019-10-23 09:02:57 -04:00
commit ddc9288da1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,7 +308,7 @@ public typealias ActionBlock = () -> ()
guard let actionLabel = label as? Label else { continue }
actionLabel.addActionAttributes(range: range, string: attributedString)
let actionBlock = actionLabel.createActionBlockFrom(actionMap: json, additionalData: additionalData, delegateObject: delegate)
let actionBlock = actionLabel.createActionBlockFrom(actionMap: attribute, additionalData: additionalData, delegateObject: delegate)
actionLabel.appendActionableClause(range: range, actionBlock: actionBlock)
default:

2
MVMCoreUI/Organisms/MoleculeStackView.swift
View File

@ -190,7 +190,7 @@ public class MoleculeStackView: ViewConstrainingView {
return "stack<>"
}
var name = "stack<"
for case let item as [AnyHashable: AnyHashable] in molecules {
for case let item as [AnyHashable: Any] in molecules {
if let molecule = item.optionalDictionaryForKey(KeyMolecule), let moleculeName = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(withJSON: molecule)?.name?(forReuse: molecule, delegateObject: delegateObject) ?? molecule.optionalStringForKey(KeyMoleculeName) {
name.append(moleculeName + ",")
}