Fix blockquote line height on iOS (#587)

Expensify · Dec 21, 2024 · a068201 · a068201
1 parent f165434
commit a068201
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/apple/MarkdownFormatter.mm b/apple/MarkdownFormatter.mm
@@ -24,10 +24,15 @@ - (nonnull NSAttributedString *)format:(nonnull NSString *)text
                                   type:std::string([markdownRange.type UTF8String])
                                  range:markdownRange.range
                                  depth:markdownRange.depth
-                         markdownStyle:markdownStyle];
+                         markdownStyle:markdownStyle
+                 defaultTextAttributes:defaultTextAttributes];
   }
 
-  RCTApplyBaselineOffset(attributedString);
+  [attributedString.string enumerateSubstringsInRange:NSMakeRange(0, attributedString.length)
+                                              options:NSStringEnumerationByLines | NSStringEnumerationSubstringNotRequired
+                                           usingBlock:^(NSString * _Nullable substring, NSRange substringRange, NSRange enclosingRange, BOOL * _Nonnull stop) {
+    RCTApplyBaselineOffset(attributedString, enclosingRange);
+  }];
 
   [attributedString endEditing];
 
@@ -38,7 +43,9 @@ - (void)applyRangeToAttributedString:(NSMutableAttributedString *)attributedStri
                                 type:(const std::string)type
                                range:(const NSRange)range
                                depth:(const int)depth
-                       markdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle {
+                       markdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle
+               defaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
+{
   if (type == "bold" || type == "italic" || type == "code" || type == "pre" || type == "h1" || type == "emoji") {
     UIFont *font = [attributedString attribute:NSFontAttributeName atIndex:range.location effectiveRange:NULL];
     if (type == "bold") {
@@ -99,7 +106,8 @@ - (void)applyRangeToAttributedString:(NSMutableAttributedString *)attributedStri
     [attributedString addAttribute:NSForegroundColorAttributeName value:markdownStyle.linkColor range:range];
   } else if (type == "blockquote") {
     CGFloat indent = (markdownStyle.blockquoteMarginLeft + markdownStyle.blockquoteBorderWidth + markdownStyle.blockquotePaddingLeft) * depth;
-    NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
+    NSParagraphStyle *defaultParagraphStyle = defaultTextAttributes[NSParagraphStyleAttributeName];
+    NSMutableParagraphStyle *paragraphStyle = defaultParagraphStyle != nil ? [defaultParagraphStyle mutableCopy] : [NSMutableParagraphStyle new];
     paragraphStyle.firstLineHeadIndent = indent;
     paragraphStyle.headIndent = indent;
     [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
@@ -112,12 +120,12 @@ - (void)applyRangeToAttributedString:(NSMutableAttributedString *)attributedStri
   }
 }
 
-static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
+static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText, NSRange attributedTextRange)
 {
   __block CGFloat maximumLineHeight = 0;
 
   [attributedText enumerateAttribute:NSParagraphStyleAttributeName
-                             inRange:NSMakeRange(0, attributedText.length)
+                             inRange:attributedTextRange
                              options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
                           usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
     if (!paragraphStyle) {
@@ -135,7 +143,7 @@ static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
   __block CGFloat maximumFontLineHeight = 0;
 
   [attributedText enumerateAttribute:NSFontAttributeName
-                             inRange:NSMakeRange(0, attributedText.length)
+                             inRange:attributedTextRange
                              options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
                           usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
     if (!font) {
@@ -152,7 +160,7 @@ static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
   CGFloat baseLineOffset = (maximumLineHeight - maximumFontLineHeight) / 2.0;
   [attributedText addAttribute:NSBaselineOffsetAttributeName
                          value:@(baseLineOffset)
-                         range:NSMakeRange(0, attributedText.length)];
+                         range:attributedTextRange];
 }
 
 @end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1497,7 +1497,7 @@ PODS:
     - React-logger (= 0.75.3)
     - React-perflogger (= 0.75.3)
     - React-utils (= 0.75.3)
-  - RNLiveMarkdown (0.1.208):
+  - RNLiveMarkdown (0.1.210):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1517,10 +1517,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/newarch (= 0.1.208)
+    - RNLiveMarkdown/newarch (= 0.1.210)
     - RNReanimated/worklets
     - Yoga
-  - RNLiveMarkdown/newarch (0.1.208):
+  - RNLiveMarkdown/newarch (0.1.210):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1897,7 +1897,7 @@ SPEC CHECKSUMS:
   React-utils: f2afa6acd905ca2ce7bb8ffb4a22f7f8a12534e8
   ReactCodegen: e35c23cdd36922f6d2990c6c1f1b022ade7ad74d
   ReactCommon: 289214026502e6a93484f4a46bcc0efa4f3f2864
-  RNLiveMarkdown: 1ee098c3a830c3133c23fc163b0aff29398a293e
+  RNLiveMarkdown: 687bc45ffb3b4af261f414fea169f10eae5ac261
   RNReanimated: 75df06d3a81fc147b83056ae469512f573365b1d
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: 1354c027ab07c7736f99a3bef16172d6f1b12b47