Fixed font invalidation of attributedString in MessageLabel

zhongwuzw · zhongwuzw · commit bdfb9885904e · 2018-04-06T11:00:42.000+08:00
diff --git a/Sources/Views/Cells/TextMessageCell.swift b/Sources/Views/Cells/TextMessageCell.swift
@@ -45,7 +45,7 @@ open class TextMessageCell: MessageContentCell {
         super.apply(layoutAttributes)
         if let attributes = layoutAttributes as? MessagesCollectionViewLayoutAttributes {
             messageLabel.textInsets = attributes.messageLabelInsets
-            messageLabel.font = attributes.messageLabelFont
+            messageLabel.messageLabelFont = attributes.messageLabelFont
             messageLabel.frame = messageContainerView.bounds
         }
     }
@@ -81,6 +81,9 @@ open class TextMessageCell: MessageContentCell {
             case .text(let text), .emoji(let text):
                 messageLabel.text = text
                 messageLabel.textColor = textColor
+                if let font = messageLabel.messageLabelFont {
+                    messageLabel.font = font
+                }
             case .attributedText(let text):
                 messageLabel.attributedText = text
             default:
diff --git a/Sources/Views/MessageLabel.swift b/Sources/Views/MessageLabel.swift
@@ -112,6 +112,8 @@ open class MessageLabel: UILabel {
             if !isConfiguring { setNeedsDisplay() }
         }
     }
+    
+    internal var messageLabelFont: UIFont?
 
     private var attributesNeedUpdate = false
 

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,8 @@ open class MessageLabel: UILabel {`
`112`	`112`	`if !isConfiguring { setNeedsDisplay() }`
`113`	`113`	`}`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ internal var messageLabelFont: UIFont?`
`115`	`117`
`116`	`118`	`private var attributesNeedUpdate = false`
`117`	`119`