all nested quotes ranges starts in the beginning of line

Expensify · Feb 20, 2024 · 45226e1 · 45226e1
1 parent 0ac0e3d
commit 45226e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ios/MarkdownLayoutManager.mm b/ios/MarkdownLayoutManager.mm
@@ -10,7 +10,7 @@ - (void)drawBackgroundForGlyphRange:(NSRange)glyphsToShow atPoint:(CGPoint)origi
     RCTMarkdownUtils *markdownUtils = [self valueForKey:@"markdownUtils"];
     [markdownUtils.blockquoteRanges enumerateObjectsUsingBlock:^(NSValue *item, NSUInteger idx, BOOL * _Nonnull stop) {
       NSRange range = [item rangeValue];
-      NSUInteger start = range.location - (nestingLevel * 2); // compensate for the `>` syntax which is not included in range (with optional space after `>`)
+      NSUInteger start = range.location;
       NSUInteger end = start + range.length;
       NSUInteger location = glyphRange.location;
       if (location >= start && location < end) {

diff --git a/ios/RCTMarkdownUtils.mm b/ios/RCTMarkdownUtils.mm
@@ -105,11 +105,11 @@ - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input
     } else if ([type isEqualToString:@"blockquote"]) {
       CGFloat indent = _markdownStyle.blockquoteMarginLeft + _markdownStyle.blockquoteBorderWidth + _markdownStyle.blockquotePaddingLeft;
       NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
-      [_blockquoteRanges addObject:[NSValue valueWithRange:range]];
       NSRange circumferencingRange = [self getCircumferencingBlockquoteRange:range];
       int blockquoteNestLevel = [self getBlockquoteNestLevel:range];
       paragraphStyle.firstLineHeadIndent = indent * blockquoteNestLevel;
       paragraphStyle.headIndent = indent * blockquoteNestLevel;
+      [_blockquoteRanges addObject:[NSValue valueWithRange:circumferencingRange]];
       [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:circumferencingRange];
     } else if ([type isEqualToString:@"pre"]) {
       [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.preColor range:range];