#92 Fixed cachedAttribute's font

malcommac · malcommac · commit 5628ad448a42 · 2019-12-11T18:44:06.000+01:00
diff --git a/Sources/SwiftRichString/Style/Style.swift b/Sources/SwiftRichString/Style/Style.swift
@@ -616,6 +616,9 @@ public class Style: StyleProtocol {
 		// string to generate a single attributes dictionary for `NSAttributedString`.
 		let fontAttributes = self.fontData?.attributes ?? [:]
 		self.cachedAttributes = self.innerAttributes.merging(fontAttributes) { (_, new) in return new }
+        if let font = self.fontData?.font {
+            self.cachedAttributes?[.font] = font
+        }
 		return self.cachedAttributes!
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -616,6 +616,9 @@ public class Style: StyleProtocol {`
`616`	`616`	// string to generate a single attributes dictionary for `NSAttributedString`.
`617`	`617`	`let fontAttributes = self.fontData?.attributes ?? [:]`
`618`	`618`	`self.cachedAttributes = self.innerAttributes.merging(fontAttributes) { (_, new) in return new }`
	`619`	`+ if let font = self.fontData?.font {`
	`620`	`+ self.cachedAttributes?[.font] = font`
	`621`	`+ }`
`619`	`622`	`return self.cachedAttributes!`
`620`	`623`	`}`
`621`	`624`