@expensify/react-native-live-markdown 0.1.196 → 0.1.198

package/apple/MarkdownLayoutManager.mm

@@ -5,34 +5,27 @@
 - (void)drawBackgroundForGlyphRange:(NSRange)glyphsToShow atPoint:(CGPoint)origin {
   [super drawBackgroundForGlyphRange:glyphsToShow atPoint:origin];
 
+  NSTextStorage *textStorage = self.textStorage;
+
   [self enumerateLineFragmentsForGlyphRange:glyphsToShow usingBlock:^(CGRect rect, CGRect usedRect, NSTextContainer * _Nonnull textContainer, NSRange glyphRange, BOOL * _Nonnull stop) {
-    __block BOOL isBlockquote = NO;
-    __block int currentDepth = 0;
+    NSNumber *depth = [textStorage attribute:RCTLiveMarkdownBlockquoteDepthAttributeName atIndex:glyphRange.location effectiveRange:nil];
+    if (depth == nil) {
+      return; // not a blockquote
+    }
+
     RCTMarkdownUtils *markdownUtils = [self valueForKey:@"markdownUtils"];
-    [markdownUtils.blockquoteRangesAndLevels enumerateObjectsUsingBlock:^(NSDictionary *item, NSUInteger idx, BOOL * _Nonnull stop) {
-      NSRange range = [[item valueForKey:@"range"] rangeValue];
-      currentDepth = [[item valueForKey:@"depth"] unsignedIntegerValue];
-      NSUInteger start = range.location;
-      NSUInteger end = start + range.length;
-      NSUInteger location = glyphRange.location;
-      if (location >= start && location < end) {
-        isBlockquote = YES;
-        *stop = YES;
-      }
-    }];
-    if (isBlockquote) {
-      CGFloat paddingLeft = origin.x;
-      CGFloat paddingTop = origin.y;
-      CGFloat y = paddingTop + rect.origin.y;
-      CGFloat width = markdownUtils.markdownStyle.blockquoteBorderWidth;
-      CGFloat height = rect.size.height;
-      CGFloat shift = markdownUtils.markdownStyle.blockquoteMarginLeft + markdownUtils.markdownStyle.blockquoteBorderWidth + markdownUtils.markdownStyle.blockquotePaddingLeft;
-      for (int level = 0; level < currentDepth; level++) {
-        CGFloat x =  paddingLeft + (level * shift) + markdownUtils.markdownStyle.blockquoteMarginLeft;
-        CGRect lineRect = CGRectMake(x, y, width, height);
-        [markdownUtils.markdownStyle.blockquoteBorderColor setFill];
-        UIRectFill(lineRect);
-      }
+    CGFloat paddingLeft = origin.x;
+    CGFloat paddingTop = origin.y;
+    CGFloat y = paddingTop + rect.origin.y;
+    CGFloat width = markdownUtils.markdownStyle.blockquoteBorderWidth;
+    CGFloat height = rect.size.height;
+    CGFloat shift = markdownUtils.markdownStyle.blockquoteMarginLeft + markdownUtils.markdownStyle.blockquoteBorderWidth + markdownUtils.markdownStyle.blockquotePaddingLeft;
+  
+    for (NSUInteger level = 0; level < [depth unsignedIntValue]; level++) {
+      CGFloat x = paddingLeft + (level * shift) + markdownUtils.markdownStyle.blockquoteMarginLeft;
+      CGRect lineRect = CGRectMake(x, y, width, height);
+      [markdownUtils.markdownStyle.blockquoteBorderColor setFill];
+      UIRectFill(lineRect);
     }
   }];
 }

package/apple/MarkdownParser.mm

@@ -46,6 +46,10 @@
         const auto &length = static_cast<int>(item.getProperty(rt, "length").asNumber());
         const auto &depth = item.hasProperty(rt, "depth") ? static_cast<int>(item.getProperty(rt, "depth").asNumber()) : 1;
 
+        if (length == 0 || start + length > text.length) {
+          continue;
+        }
+
         NSRange range = NSMakeRange(start, length);
         MarkdownRange *markdownRange = [[MarkdownRange alloc] initWithType:@(type.c_str()) range:range depth:depth];
         [markdownRanges addObject:markdownRange];

package/apple/RCTMarkdownUtils.h

@@ -3,11 +3,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+const NSAttributedStringKey RCTLiveMarkdownBlockquoteDepthAttributeName = @"RCTLiveMarkdownBlockquoteDepth";
+
 @interface RCTMarkdownUtils : NSObject
 
 @property (nonatomic) RCTMarkdownStyle *markdownStyle;
 @property (nonatomic) NSNumber *parserId;
-@property (nonatomic) NSMutableArray<NSDictionary *> *blockquoteRangesAndLevels;
 
 - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey, id>*)attributes;
 

package/apple/RCTMarkdownUtils.mm

@@ -46,8 +46,6 @@
         // 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)];
 
-        _blockquoteRangesAndLevels = [NSMutableArray new];
-
         for (MarkdownRange *markdownRange in markdownRanges) {
             [self applyRangeToAttributedString:attributedString
                                           type:std::string([markdownRange.type UTF8String])
@@ -70,10 +68,6 @@
 }
 
 - (void)applyRangeToAttributedString:(NSMutableAttributedString *)attributedString type:(const std::string)type range:(NSRange)range depth:(const int)depth {
-    if (range.length == 0 || range.location + range.length > attributedString.length) {
-        return;
-    }
-
     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") {
@@ -138,10 +132,7 @@
         paragraphStyle.firstLineHeadIndent = indent;
         paragraphStyle.headIndent = indent;
         [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-        [_blockquoteRangesAndLevels addObject:@{
-            @"range": [NSValue valueWithRange:range],
-            @"depth": @(depth)
-        }];
+        [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;

package/package.json

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