@expensify/react-native-live-markdown 0.1.202 → 0.1.204

package/apple/MarkdownCommitHook.mm

@@ -198,7 +198,7 @@ RootShadowNode::Unshared MarkdownCommitHook::shadowTreeWillCommit(
 
             // apply markdown
             auto newString = [usedUtils parseMarkdown:nsAttributedString
-                                       withAttributes:defaultNSTextAttributes];
+                            withDefaultTextAttributes:defaultNSTextAttributes];
 
             // create a clone of the old TextInputState and update the
             // attributed string box to point to the string with markdown
@@ -247,7 +247,7 @@ RootShadowNode::Unshared MarkdownCommitHook::shadowTreeWillCommit(
 
             // apply markdown
             auto newString = [usedUtils parseMarkdown:nsAttributedString
-                                       withAttributes:defaultNSTextAttributes];
+                            withDefaultTextAttributes:defaultNSTextAttributes];
 
             // create a clone of the old TextInputState and update the
             // attributed string box to point to the string with markdown

package/apple/MarkdownFormatter.h

@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+#import <RNLiveMarkdown/MarkdownRange.h>
+#import <RNLiveMarkdown/RCTMarkdownStyle.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+const NSAttributedStringKey RCTLiveMarkdownBlockquoteDepthAttributeName = @"RCTLiveMarkdownBlockquoteDepth";
+
+@interface MarkdownFormatter : NSObject
+
+- (nonnull NSAttributedString *)format:(nonnull NSString *)text
+             withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
+                    withMarkdownRanges:(nonnull NSArray<MarkdownRange *> *)markdownRanges
+                     withMarkdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle;
+
+NS_ASSUME_NONNULL_END
+
+@end

package/apple/MarkdownFormatter.mm

@@ -0,0 +1,158 @@
+#import "MarkdownFormatter.h"
+#import <React/RCTFont.h>
+
+@implementation MarkdownFormatter
+
+- (nonnull NSAttributedString *)format:(nonnull NSString *)text
+             withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
+                    withMarkdownRanges:(nonnull NSArray<MarkdownRange *> *)markdownRanges
+                     withMarkdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle
+{
+  NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:text attributes:defaultTextAttributes];
+
+  [attributedString beginEditing];
+
+  // If the attributed string ends with underlined text, blurring the single-line input imprints the underline style across the whole string.
+  // It looks like a bug in iOS, as there is no underline style to be found in the attributed string, especially after formatting.
+  // This is a workaround that applies the NSUnderlineStyleNone to the string before iterating over ranges which resolves this problem.
+  [attributedString addAttribute:NSUnderlineStyleAttributeName
+                           value:[NSNumber numberWithInteger:NSUnderlineStyleNone]
+                           range:NSMakeRange(0, attributedString.length)];
+
+  for (MarkdownRange *markdownRange in markdownRanges) {
+    [self applyRangeToAttributedString:attributedString
+                                  type:std::string([markdownRange.type UTF8String])
+                                 range:markdownRange.range
+                                 depth:markdownRange.depth
+                         markdownStyle:markdownStyle];
+  }
+
+  RCTApplyBaselineOffset(attributedString);
+
+  [attributedString endEditing];
+
+  return attributedString;
+}
+
+- (void)applyRangeToAttributedString:(NSMutableAttributedString *)attributedString
+                                type:(const std::string)type
+                               range:(const NSRange)range
+                               depth:(const int)depth
+                       markdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle {
+  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") {
+      font = [RCTFont updateFont:font withWeight:@"bold"];
+    } else if (type == "italic") {
+      font = [RCTFont updateFont:font withStyle:@"italic"];
+    } else if (type == "code") {
+      font = [RCTFont updateFont:font withFamily:markdownStyle.codeFontFamily
+                                            size:[NSNumber numberWithFloat:markdownStyle.codeFontSize]
+                                          weight:nil
+                                            style:nil
+                                          variant:nil
+                                  scaleMultiplier:0];
+    } else if (type == "pre") {
+      font = [RCTFont updateFont:font withFamily:markdownStyle.preFontFamily
+                                            size:[NSNumber numberWithFloat:markdownStyle.preFontSize]
+                                          weight:nil
+                                          style:nil
+                                        variant:nil
+                                scaleMultiplier:0];
+    } else if (type == "h1") {
+      font = [RCTFont updateFont:font withFamily:nil
+                                            size:[NSNumber numberWithFloat:markdownStyle.h1FontSize]
+                                          weight:@"bold"
+                                            style:nil
+                                          variant:nil
+                                  scaleMultiplier:0];
+    } else if (type == "emoji") {
+      font = [RCTFont updateFont:font withFamily:nil
+                                            size:[NSNumber numberWithFloat:markdownStyle.emojiFontSize]
+                                          weight:nil
+                                            style:nil
+                                          variant:nil
+                                  scaleMultiplier:0];
+    }
+    [attributedString addAttribute:NSFontAttributeName value:font range:range];
+  }
+
+  if (type == "syntax") {
+    [attributedString addAttribute:NSForegroundColorAttributeName value:markdownStyle.syntaxColor range:range];
+  } else if (type == "strikethrough") {
+    [attributedString addAttribute:NSStrikethroughStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
+  } else if (type == "code") {
+    [attributedString addAttribute:NSForegroundColorAttributeName value:markdownStyle.codeColor range:range];
+    [attributedString addAttribute:NSBackgroundColorAttributeName value:markdownStyle.codeBackgroundColor range:range];
+  } else if (type == "mention-here") {
+    [attributedString addAttribute:NSForegroundColorAttributeName value:markdownStyle.mentionHereColor range:range];
+    [attributedString addAttribute:NSBackgroundColorAttributeName value:markdownStyle.mentionHereBackgroundColor range:range];
+  } else if (type == "mention-user") {
+    // TODO: change mention color when it mentions current user
+    [attributedString addAttribute:NSForegroundColorAttributeName value:markdownStyle.mentionUserColor range:range];
+    [attributedString addAttribute:NSBackgroundColorAttributeName value:markdownStyle.mentionUserBackgroundColor range:range];
+  } else if (type == "mention-report") {
+    [attributedString addAttribute:NSForegroundColorAttributeName value:markdownStyle.mentionReportColor range:range];
+    [attributedString addAttribute:NSBackgroundColorAttributeName value:markdownStyle.mentionReportBackgroundColor range:range];
+  } else if (type == "link") {
+    [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
+    [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];
+    paragraphStyle.firstLineHeadIndent = indent;
+    paragraphStyle.headIndent = indent;
+    [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
+    [attributedString addAttribute:RCTLiveMarkdownBlockquoteDepthAttributeName value:@(depth) range:range];
+  } else if (type == "pre") {
+    [attributedString addAttribute:NSForegroundColorAttributeName value:markdownStyle.preColor range:range];
+    NSRange rangeForBackground = [[attributedString string] characterAtIndex:range.location] == '\n' ? NSMakeRange(range.location + 1, range.length - 1) : range;
+    [attributedString addAttribute:NSBackgroundColorAttributeName value:markdownStyle.preBackgroundColor range:rangeForBackground];
+    // TODO: pass background color and ranges to layout manager
+  }
+}
+
+static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
+{
+  __block CGFloat maximumLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSParagraphStyleAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
+    if (!paragraphStyle) {
+      return;
+    }
+
+    maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
+  }];
+
+  if (maximumLineHeight == 0) {
+    // `lineHeight` was not specified, nothing to do.
+    return;
+  }
+
+  __block CGFloat maximumFontLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
+    if (!font) {
+      return;
+    }
+
+    maximumFontLineHeight = MAX(font.lineHeight, maximumFontLineHeight);
+  }];
+
+  if (maximumLineHeight < maximumFontLineHeight) {
+    return;
+  }
+
+  CGFloat baseLineOffset = (maximumLineHeight - maximumFontLineHeight) / 2.0;
+  [attributedText addAttribute:NSBaselineOffsetAttributeName
+                         value:@(baseLineOffset)
+                         range:NSMakeRange(0, attributedText.length)];
+}
+
+@end

package/apple/MarkdownLayoutManager.h

@@ -1,5 +1,6 @@
 #import <UIKit/UIKit.h>
 #import <RNLiveMarkdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/MarkdownFormatter.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/apple/MarkdownParser.h

@@ -5,7 +5,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MarkdownParser : NSObject
 
-- (NSArray<MarkdownRange *> *)parse:(NSString *)text withParserId:(NSNumber *)parserId;
+- (NSArray<MarkdownRange *> *)parse:(nonnull NSString *)text
+                       withParserId:(nonnull NSNumber *)parserId;
 
 NS_ASSUME_NONNULL_END
 

package/apple/MarkdownParser.mm

@@ -9,7 +9,9 @@
   NSArray<MarkdownRange *> *_prevMarkdownRanges;
 }
 
-- (NSArray<MarkdownRange *> *)parse:(NSString *)text withParserId:(nonnull NSNumber *)parserId {
+- (NSArray<MarkdownRange *> *)parse:(nonnull NSString *)text
+                       withParserId:(nonnull NSNumber *)parserId
+{
   @synchronized (self) {
     if ([text isEqualToString:_prevText] && [parserId isEqualToNumber:_prevParserId]) {
       return _prevMarkdownRanges;

package/apple/RCTBackedTextFieldDelegateAdapter+Markdown.mm

@@ -19,7 +19,7 @@
   if (markdownUtils != nil) {
     RCTUITextField *backedTextInputView = [self valueForKey:@"_backedTextInputView"];
     UITextRange *range = backedTextInputView.selectedTextRange;
-    backedTextInputView.attributedText = [markdownUtils parseMarkdown:backedTextInputView.attributedText withAttributes:backedTextInputView.defaultTextAttributes];
+    backedTextInputView.attributedText = [markdownUtils parseMarkdown:backedTextInputView.attributedText withDefaultTextAttributes:backedTextInputView.defaultTextAttributes];
     [backedTextInputView setSelectedTextRange:range notifyDelegate:YES];
   }
 

package/apple/RCTBaseTextInputView+Markdown.mm

@@ -16,7 +16,7 @@
 {
   RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
   if (markdownUtils != nil) {
-    attributedText = [markdownUtils parseMarkdown:attributedText withAttributes:self.backedTextInputView.defaultTextAttributes];
+    attributedText = [markdownUtils parseMarkdown:attributedText withDefaultTextAttributes:self.backedTextInputView.defaultTextAttributes];
   }
 
   // Call the original method
@@ -46,7 +46,7 @@
   if (markdownUtils != nil) {
     id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
     NSAttributedString *oldAttributedText = backedTextInputView.attributedText;
-    NSAttributedString *newAttributedText = [markdownUtils parseMarkdown:oldAttributedText withAttributes:backedTextInputView.defaultTextAttributes];
+    NSAttributedString *newAttributedText = [markdownUtils parseMarkdown:oldAttributedText withDefaultTextAttributes:backedTextInputView.defaultTextAttributes];
     UITextRange *range = backedTextInputView.selectedTextRange;
 
     // update attributed text without emitting onSelectionChange event

package/apple/RCTMarkdownUtils.h

@@ -3,14 +3,13 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-const NSAttributedStringKey RCTLiveMarkdownBlockquoteDepthAttributeName = @"RCTLiveMarkdownBlockquoteDepth";
-
 @interface RCTMarkdownUtils : NSObject
 
 @property (nonatomic) RCTMarkdownStyle *markdownStyle;
 @property (nonatomic) NSNumber *parserId;
 
-- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey, id>*)attributes;
+- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input
+            withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes;
 
 @end
 

package/apple/RCTMarkdownUtils.mm

@@ -1,16 +1,13 @@
 #import <RNLiveMarkdown/RCTMarkdownUtils.h>
-#import <RNLiveMarkdown/MarkdownGlobal.h>
 #import <RNLiveMarkdown/MarkdownParser.h>
-#import "react_native_assert.h"
-#import <React/RCTAssert.h>
-#import <React/RCTFont.h>
-#include <jsi/jsi.h>
+#import <RNLiveMarkdown/MarkdownFormatter.h>
 
 @implementation RCTMarkdownUtils {
   MarkdownParser *_markdownParser;
+  MarkdownFormatter *_markdownFormatter;
   NSString *_prevInputString;
   NSAttributedString *_prevAttributedString;
-  NSDictionary<NSAttributedStringKey, id> *_prevTextAttributes;
+  NSDictionary<NSAttributedStringKey, id> *_prevDefaultTextAttributes;
   __weak RCTMarkdownStyle *_prevMarkdownStyle;
   __weak NSNumber *_prevParserId;
 }
@@ -19,169 +16,39 @@
 {
   if (self = [super init]) {
     _markdownParser = [MarkdownParser new];
+    _markdownFormatter = [MarkdownFormatter new];
   }
 
   return self;
 }
 
-- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey,id> *)attributes
+- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input
+            withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
 {
-    @synchronized (self) {
-        if (input == nil) {
-            return nil;
-        }
-
-        NSString *inputString = [input string];
-        if ([inputString isEqualToString:_prevInputString] && [attributes isEqualToDictionary:_prevTextAttributes] && [_markdownStyle isEqual:_prevMarkdownStyle] && [_parserId isEqualToNumber:_prevParserId]) {
-            return _prevAttributedString;
-        }
-
-        NSArray<MarkdownRange *> *markdownRanges = [_markdownParser parse:inputString withParserId:_parserId];
-
-        NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:inputString attributes:attributes];
-        [attributedString beginEditing];
-
-        // If the attributed string ends with underlined text, blurring the single-line input imprints the underline style across the whole string.
-        // It looks like a bug in iOS, as there is no underline style to be found in the attributed string, especially after formatting.
-        // This is a workaround that applies the NSUnderlineStyleNone to the string before iterating over ranges which resolves this problem.
-        [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleNone] range:NSMakeRange(0, attributedString.length)];
-
-        for (MarkdownRange *markdownRange in markdownRanges) {
-            [self applyRangeToAttributedString:attributedString
-                                          type:std::string([markdownRange.type UTF8String])
-                                         range:markdownRange.range
-                                         depth:markdownRange.depth];
-        }
-
-        RCTApplyBaselineOffset(attributedString);
-
-        [attributedString endEditing];
-
-        _prevInputString = inputString;
-        _prevAttributedString = attributedString;
-        _prevTextAttributes = attributes;
-        _prevMarkdownStyle = _markdownStyle;
-        _prevParserId = _parserId;
-
-        return attributedString;
+  @synchronized (self) {
+    if (input == nil) {
+      return nil;
     }
-}
 
-- (void)applyRangeToAttributedString:(NSMutableAttributedString *)attributedString type:(const std::string)type range:(NSRange)range depth:(const int)depth {
-    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") {
-            font = [RCTFont updateFont:font withWeight:@"bold"];
-        } else if (type == "italic") {
-            font = [RCTFont updateFont:font withStyle:@"italic"];
-        } else if (type == "code") {
-            font = [RCTFont updateFont:font withFamily:_markdownStyle.codeFontFamily
-                                                  size:[NSNumber numberWithFloat:_markdownStyle.codeFontSize]
-                                                weight:nil
-                                                 style:nil
-                                               variant:nil
-                                       scaleMultiplier:0];
-        } else if (type == "pre") {
-            font = [RCTFont updateFont:font withFamily:_markdownStyle.preFontFamily
-                                                  size:[NSNumber numberWithFloat:_markdownStyle.preFontSize]
-                                                weight:nil
-                                                style:nil
-                                              variant:nil
-                                      scaleMultiplier:0];
-        } else if (type == "h1") {
-            font = [RCTFont updateFont:font withFamily:nil
-                                                  size:[NSNumber numberWithFloat:_markdownStyle.h1FontSize]
-                                                weight:@"bold"
-                                                 style:nil
-                                               variant:nil
-                                       scaleMultiplier:0];
-        } else if (type == "emoji") {
-            font = [RCTFont updateFont:font withFamily:nil
-                                                  size:[NSNumber numberWithFloat:_markdownStyle.emojiFontSize]
-                                                weight:nil
-                                                 style:nil
-                                               variant:nil
-                                       scaleMultiplier:0];
-        }
-        [attributedString addAttribute:NSFontAttributeName value:font range:range];
+    NSString *inputString = [input string];
+    if ([inputString isEqualToString:_prevInputString] && [defaultTextAttributes isEqualToDictionary:_prevDefaultTextAttributes] && [_markdownStyle isEqual:_prevMarkdownStyle] && [_parserId isEqualToNumber:_prevParserId]) {
+      return _prevAttributedString;
     }
 
-    if (type == "syntax") {
-        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.syntaxColor range:range];
-    } else if (type == "strikethrough") {
-        [attributedString addAttribute:NSStrikethroughStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
-    } else if (type == "code") {
-        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.codeColor range:range];
-        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.codeBackgroundColor range:range];
-    } else if (type == "mention-here") {
-        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionHereColor range:range];
-        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionHereBackgroundColor range:range];
-    } else if (type == "mention-user") {
-        // TODO: change mention color when it mentions current user
-        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionUserColor range:range];
-        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionUserBackgroundColor range:range];
-    } else if (type == "mention-report") {
-        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionReportColor range:range];
-        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionReportBackgroundColor range:range];
-    } else if (type == "link") {
-        [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
-        [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];
-        paragraphStyle.firstLineHeadIndent = indent;
-        paragraphStyle.headIndent = indent;
-        [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-        [attributedString addAttribute:RCTLiveMarkdownBlockquoteDepthAttributeName value:@(depth) range:range];
-    } else if (type == "pre") {
-        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.preColor range:range];
-        NSRange rangeForBackground = [[attributedString string] characterAtIndex:range.location] == '\n' ? NSMakeRange(range.location + 1, range.length - 1) : range;
-        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.preBackgroundColor range:rangeForBackground];
-        // TODO: pass background color and ranges to layout manager
-    }
-}
+    NSArray<MarkdownRange *> *markdownRanges = [_markdownParser parse:inputString withParserId:_parserId];
 
-static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
-{
-  __block CGFloat maximumLineHeight = 0;
-
-  [attributedText enumerateAttribute:NSParagraphStyleAttributeName
-                             inRange:NSMakeRange(0, attributedText.length)
-                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
-    if (!paragraphStyle) {
-      return;
-    }
+    NSAttributedString *attributedString = [_markdownFormatter format:inputString
+                                            withDefaultTextAttributes:defaultTextAttributes
+                                                   withMarkdownRanges:markdownRanges
+                                                    withMarkdownStyle:_markdownStyle];
+    _prevInputString = inputString;
+    _prevAttributedString = attributedString;
+    _prevDefaultTextAttributes = defaultTextAttributes;
+    _prevMarkdownStyle = _markdownStyle;
+    _prevParserId = _parserId;
 
-    maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
-  }];
-
-  if (maximumLineHeight == 0) {
-    // `lineHeight` was not specified, nothing to do.
-    return;
+    return attributedString;
   }
-
-  __block CGFloat maximumFontLineHeight = 0;
-
-  [attributedText enumerateAttribute:NSFontAttributeName
-                             inRange:NSMakeRange(0, attributedText.length)
-                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
-    if (!font) {
-      return;
-    }
-
-    maximumFontLineHeight = MAX(font.lineHeight, maximumFontLineHeight);
-  }];
-
-  if (maximumLineHeight < maximumFontLineHeight) {
-    return;
-  }
-
-  CGFloat baseLineOffset = (maximumLineHeight - maximumFontLineHeight) / 2.0;
-  [attributedText addAttribute:NSBaselineOffsetAttributeName
-                         value:@(baseLineOffset)
-                         range:NSMakeRange(0, attributedText.length)];
 }
 
 @end

package/apple/RCTTextInputComponentView+Markdown.mm

@@ -18,7 +18,7 @@ using namespace expensify::livemarkdown;
   if (markdownUtils != nil) {
     // force Markdown formatting on first render because `_setAttributedText` is called before `setMarkdownUtils`
     RCTUITextField *backedTextInputView = [self getBackedTextInputView];
-    backedTextInputView.attributedText = [markdownUtils parseMarkdown:backedTextInputView.attributedText withAttributes:backedTextInputView.defaultTextAttributes];
+    backedTextInputView.attributedText = [markdownUtils parseMarkdown:backedTextInputView.attributedText withDefaultTextAttributes:backedTextInputView.defaultTextAttributes];
   }
 }
 
@@ -36,7 +36,7 @@ using namespace expensify::livemarkdown;
   RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
   RCTUITextField *backedTextInputView = [self getBackedTextInputView];
   if (markdownUtils != nil && backedTextInputView != nil) {
-    attributedString = [markdownUtils parseMarkdown:attributedString withAttributes:backedTextInputView.defaultTextAttributes];
+    attributedString = [markdownUtils parseMarkdown:attributedString withDefaultTextAttributes:backedTextInputView.defaultTextAttributes];
   } else {
     // If markdownUtils is undefined, the text input hasn't been mounted yet. It will
     // update its state with the unformatted attributed string, we want to prevent displaying

package/apple/RCTUITextView+Markdown.mm

@@ -17,7 +17,7 @@
   RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
   if (markdownUtils != nil) {
     UITextRange *range = self.selectedTextRange;
-    super.attributedText = [markdownUtils parseMarkdown:self.attributedText withAttributes:self.defaultTextAttributes];
+    super.attributedText = [markdownUtils parseMarkdown:self.attributedText withDefaultTextAttributes:self.defaultTextAttributes];
     [super setSelectedTextRange:range]; // prevents cursor from jumping at the end when typing in the middle of the text
     self.typingAttributes = self.defaultTextAttributes; // removes indent in new line when typing after blockquote
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.202",
+  "version": "0.1.204",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",