Merge pull request #148 from CareEvolution/eschramm/fixMDFooter

Store originalFont for CEVRK1Label to make updateAppearance idempotent
CareEvolution · Sep 3, 2024 · cb7ba59 · cb7ba59
2 parents 7277d72 + c9492ae
commit cb7ba59
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/ORK1Kit/ORK1Kit/Common/CEVRK1Label.h b/ORK1Kit/ORK1Kit/Common/CEVRK1Label.h
@@ -16,5 +16,6 @@
 @interface CEVRK1Label: UILabel
 
 - (NSString * _Nullable)rawText;
+- (UIFont * _Nullable)originalFont;
 
 @end
diff --git a/ORK1Kit/ORK1Kit/Common/CEVRK1Label.m b/ORK1Kit/ORK1Kit/Common/CEVRK1Label.m
@@ -12,17 +12,27 @@
 
 @implementation CEVRK1Label {
     NSString *_rawText;
+    UIFont *_originalFont;
 }
 
 - (void)setText:(NSString * _Nullable)text {
     _rawText = text;
     [self updateAppearance];
 }
 
+- (void)setFont:(UIFont *)font {
+    _originalFont = font;
+    [super setFont:font];
+}
+
 - (NSString * _Nullable)rawText {
     return _rawText;
 }
 
+- (UIFont *)originalFont {
+    return _originalFont;
+}
+
 - (void)updateAppearance {
     // overridden in subclasses
 }

diff --git a/ORK1Kit/ORK1Kit/Common/CEVRK1Theme.m b/ORK1Kit/ORK1Kit/Common/CEVRK1Theme.m
@@ -203,6 +203,7 @@ - (void)updateAppearanceForLabel:(CEVRK1Label *)label ofType:(CEVRK1DisplayTextT
             break;
     }
     NSMutableDictionary *attributes = [self textAttributesForView:label];
+    attributes[NSFontAttributeName] = label.originalFont;
     [self combineIntoAttributes:attributes textStyle:textStyle];
     label.attributedText = [[NSAttributedString alloc] initWithMarkdownRepresentation:[label rawText] attributes:attributes];
 }