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

added/updated isValid(range:

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-03-20 15:24:35 -05:00
parent d360ddffa1
commit 9203b6cab5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
VDS/Components/Label/Attributes/LabelAttributeModel.swift
View File

@ -31,11 +31,21 @@ extension LabelAttributeModel {
} }
public func isValidRange(on attributedString: NSMutableAttributedString) -> Bool { public func isValidRange(on attributedString: NSMutableAttributedString) -> Bool {
range.location + range.length <= attributedString.string.count attributedString.isValid(range: range)
}
}
public extension String {
func isValid(range: NSRange) -> Bool {
range.location >= 0 && range.length > 0 && range.location + range.length <= count
} }
} }
public extension NSAttributedString { public extension NSAttributedString {
func isValid(range: NSRange) -> Bool {
range.location >= 0 && range.length > 0 && range.location + range.length <= length
}
func createAttributeModels() -> [(any LabelAttributeModel)] { func createAttributeModels() -> [(any LabelAttributeModel)] {
var attributes: [any VDS.LabelAttributeModel] = [] var attributes: [any VDS.LabelAttributeModel] = []
enumerateAttributes(in: NSMakeRange(0, length)) { attributeMap, range, stop in enumerateAttributes(in: NSMakeRange(0, length)) { attributeMap, range, stop in
@ -61,6 +71,7 @@ public extension NSAttributedString {
extension NSMutableAttributedString { extension NSMutableAttributedString {
public func apply(attribute: any LabelAttributeModel) { public func apply(attribute: any LabelAttributeModel) {
guard isValid(range: attribute.range) else { return }
attribute.setAttribute(on: self) attribute.setAttribute(on: self)
} }