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

fix label overriding itself

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2019-06-21 13:34:02 -04:00
parent 9f038467a9
commit cb8ad83149
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,10 +247,11 @@ public typealias ActionBlock = () -> Void
case "action":
guard let actionLabel = label as? Label else { continue }
actionLabel.addTappableLinkAttribute(range: range,
actionMap: json,
additionalData: additionalData,
delegateObject: delegate)
actionLabel.addDefaultAttributes(range: range, string: attributedString)
actionLabel.clauses.append(ActionableClause(range: range,
actionBlock: actionLabel.createActionBlockFrom(actionMap: json,
additionalData: additionalData,
delegateObject: delegate)))
default:
continue
}
@ -397,6 +398,13 @@ extension Label {
}
}
func addDefaultAttributes(range: NSRange, string: NSAttributedString?) {
guard let string = string else { return }
let mutableAttributedString = NSMutableAttributedString(attributedString: string)
mutableAttributedString.addAttributes([NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue], range: range)
}
fileprivate func setDefaultAttributes(range: NSRange) {
guard let attributedText = attributedText else { return }