fix: draw marker for only the first line of a list point (#108)

Author: szydlovsky

ios/utils/LayoutManagerExtension.mm

@@ -3,6 +3,7 @@
 #import "EditorManager.h"
 #import "ReactNativeRichTextEditorView.h"
 #import "StyleHeaders.h"
+#import "ParagraphsUtils.h"
 
 @implementation NSLayoutManager (LayoutManagerExtension)
 
@@ -77,42 +78,47 @@ - (void)my_drawBackgroundForGlyphRange:(NSRange)glyphRange atPoint:(CGPoint)orig
   [allLists addObjectsFromArray:[olStyle findAllOccurences:editorRange]];
 
   for(StylePair *pair in allLists) {
-    NSRange paragraphRange = [typedEditor->textView.textStorage.string paragraphRangeForRange:[pair.rangeValue rangeValue]];
-    NSRange paragraphGlyphRange = [self glyphRangeForCharacterRange:paragraphRange actualCharacterRange:nullptr];
-    
     NSParagraphStyle *pStyle = (NSParagraphStyle *)pair.styleValue;
     NSDictionary *markerAttributes = @{
       NSFontAttributeName: [typedEditor->config primaryFont],
       NSForegroundColorAttributeName: [typedEditor->config primaryColor]
     };
 
-    [self enumerateLineFragmentsForGlyphRange:paragraphGlyphRange
-      usingBlock:^(CGRect rect, CGRect usedRect, NSTextContainer *container, NSRange lineGlyphRange, BOOL *stop) {
-        NSString *marker = [self markerForList:pStyle.textLists.firstObject charIndex:[self characterIndexForGlyphAtIndex:lineGlyphRange.location] editor:typedEditor];
-        
-        if(pStyle.textLists.firstObject.markerFormat == NSTextListMarkerDecimal) {
-          CGFloat gapWidth = [typedEditor->config orderedListGapWidth];
-          CGFloat markerWidth = [marker sizeWithAttributes:markerAttributes].width;
-          CGFloat rightEdge = usedRect.origin.x - gapWidth;
-          CGFloat numberX = rightEdge - markerWidth;
-          
-          [marker drawAtPoint:CGPointMake(numberX, usedRect.origin.y + origin.y) withAttributes:markerAttributes];
-        } else {
-          CGFloat gapWidth = [typedEditor->config unorderedListGapWidth];
-          CGFloat bulletSize = [typedEditor->config unorderedListBulletSize];
-          CGFloat bulletX = usedRect.origin.x - gapWidth - bulletSize;
-          CGFloat centerY = CGRectGetMidY(usedRect);
+    NSArray *paragraphs = [ParagraphsUtils getSeparateParagraphsRangesIn:typedEditor->textView range:[pair.rangeValue rangeValue]];
+    
+    for(NSValue *paragraph in paragraphs) {
+      NSRange paragraphGlyphRange = [self glyphRangeForCharacterRange:[paragraph rangeValue] actualCharacterRange:nullptr];
+      
+      [self enumerateLineFragmentsForGlyphRange:paragraphGlyphRange
+        usingBlock:^(CGRect rect, CGRect usedRect, NSTextContainer *container, NSRange lineGlyphRange, BOOL *stop) {
+          NSString *marker = [self markerForList:pStyle.textLists.firstObject charIndex:[self characterIndexForGlyphAtIndex:lineGlyphRange.location] editor:typedEditor];
 
-          CGContextRef context = UIGraphicsGetCurrentContext();
-          CGContextSaveGState(context); {
-            [[typedEditor->config unorderedListBulletColor] setFill];
-            CGContextAddArc(context, bulletX, centerY, bulletSize/2, 0, 2 * M_PI, YES);
-            CGContextFillPath(context);
+          if(pStyle.textLists.firstObject.markerFormat == NSTextListMarkerDecimal) {
+            CGFloat gapWidth = [typedEditor->config orderedListGapWidth];
+            CGFloat markerWidth = [marker sizeWithAttributes:markerAttributes].width;
+            CGFloat rightEdge = usedRect.origin.x - gapWidth;
+            CGFloat numberX = rightEdge - markerWidth;
+            
+            [marker drawAtPoint:CGPointMake(numberX, usedRect.origin.y + origin.y) withAttributes:markerAttributes];
+          } else {
+            CGFloat gapWidth = [typedEditor->config unorderedListGapWidth];
+            CGFloat bulletSize = [typedEditor->config unorderedListBulletSize];
+            CGFloat bulletX = usedRect.origin.x - gapWidth - bulletSize;
+            CGFloat centerY = CGRectGetMidY(usedRect);
+            
+            CGContextRef context = UIGraphicsGetCurrentContext();
+            CGContextSaveGState(context); {
+              [[typedEditor->config unorderedListBulletColor] setFill];
+              CGContextAddArc(context, bulletX, centerY, bulletSize/2, 0, 2 * M_PI, YES);
+              CGContextFillPath(context);
+            }
+            CGContextRestoreGState(context);
           }
-          CGContextRestoreGState(context);
+          // only first line of a list gets its marker drawn
+          *stop = YES;
         }
-      }
-    ];
+      ];
+    }
   }
 }