react-native-enriched 0.1.6 → 0.2.1

package/ios/utils/FontExtension.mm

@@ -4,16 +4,19 @@
 @implementation UIFont (FontExtension)
 
 - (BOOL)isBold {
-  return (self.fontDescriptor.symbolicTraits & UIFontDescriptorTraitBold) == UIFontDescriptorTraitBold;
+  return (self.fontDescriptor.symbolicTraits & UIFontDescriptorTraitBold) ==
+         UIFontDescriptorTraitBold;
 }
 
 - (UIFont *)setBold {
-  if([self isBold]) {
+  if ([self isBold]) {
     return self;
   }
-  UIFontDescriptorSymbolicTraits newTraits = (self.fontDescriptor.symbolicTraits | UIFontDescriptorTraitBold);
-  UIFontDescriptor *fontDescriptor = [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
-  if(fontDescriptor != nullptr) {
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits | UIFontDescriptorTraitBold);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
     return [UIFont fontWithDescriptor:fontDescriptor size:0];
   } else {
     RCTLogWarn(@"[EnrichedTextInput]: Couldn't apply bold trait to the font.");
@@ -22,68 +25,80 @@
 }
 
 - (UIFont *)removeBold {
-  if(![self isBold]) {
+  if (![self isBold]) {
     return self;
   }
-  UIFontDescriptorSymbolicTraits newTraits = (self.fontDescriptor.symbolicTraits ^ UIFontDescriptorTraitBold);
-  UIFontDescriptor *fontDescriptor = [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
-  if(fontDescriptor != nullptr) {
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits ^ UIFontDescriptorTraitBold);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
     return [UIFont fontWithDescriptor:fontDescriptor size:0];
   } else {
-    RCTLogWarn(@"[EnrichedTextInput]: Couldn't remove bold trait from the font.");
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't remove bold trait from the font.");
     return self;
   }
 }
 
 - (BOOL)isItalic {
-  return (self.fontDescriptor.symbolicTraits & UIFontDescriptorTraitItalic) == UIFontDescriptorTraitItalic;
+  return (self.fontDescriptor.symbolicTraits & UIFontDescriptorTraitItalic) ==
+         UIFontDescriptorTraitItalic;
 }
 
 - (UIFont *)setItalic {
-  if([self isItalic]) {
+  if ([self isItalic]) {
     return self;
   }
-  UIFontDescriptorSymbolicTraits newTraits = (self.fontDescriptor.symbolicTraits | UIFontDescriptorTraitItalic);
-  UIFontDescriptor *fontDescriptor = [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
-  if(fontDescriptor != nullptr) {
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits | UIFontDescriptorTraitItalic);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
     return [UIFont fontWithDescriptor:fontDescriptor size:0];
   } else {
-    RCTLogWarn(@"[EnrichedTextInput]: Couldn't apply italic trait to the font.");
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't apply italic trait to the font.");
     return self;
   }
 }
 
 - (UIFont *)removeItalic {
-  if(![self isItalic]) {
+  if (![self isItalic]) {
     return self;
   }
-  UIFontDescriptorSymbolicTraits newTraits = (self.fontDescriptor.symbolicTraits ^ UIFontDescriptorTraitItalic);
-  UIFontDescriptor *fontDescriptor = [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
-  if(fontDescriptor != nullptr) {
+  UIFontDescriptorSymbolicTraits newTraits =
+      (self.fontDescriptor.symbolicTraits ^ UIFontDescriptorTraitItalic);
+  UIFontDescriptor *fontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSymbolicTraits:newTraits];
+  if (fontDescriptor != nullptr) {
     return [UIFont fontWithDescriptor:fontDescriptor size:0];
   } else {
-    RCTLogWarn(@"[EnrichedTextInput]: Couldn't remove italic trait from the font.");
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't remove italic trait from the font.");
     return self;
   }
 }
 
 - (UIFont *)withFontTraits:(UIFont *)from {
-  UIFont* newFont = self;
-  if([from isBold]) {
+  UIFont *newFont = self;
+  if ([from isBold]) {
     newFont = [newFont setBold];
   }
-  if([from isItalic]) {
+  if ([from isItalic]) {
     newFont = [newFont setItalic];
   }
   return newFont;
 }
 
 - (UIFont *)setSize:(CGFloat)size {
-  UIFontDescriptor *newFontDescriptor = [self.fontDescriptor fontDescriptorWithSize:size];
-  if(newFontDescriptor != nullptr) {
+  UIFontDescriptor *newFontDescriptor =
+      [self.fontDescriptor fontDescriptorWithSize:size];
+  if (newFontDescriptor != nullptr) {
     return [UIFont fontWithDescriptor:newFontDescriptor size:0];
   } else {
-    RCTLogWarn(@"[EnrichedTextInput]: Couldn't apply heading style to the font.");
+    RCTLogWarn(
+        @"[EnrichedTextInput]: Couldn't apply heading style to the font.");
     return self;
   }
 }

package/ios/utils/ImageData.h

@@ -0,0 +1,10 @@
+#pragma once
+#import <UIKit/UIKit.h>
+
+@interface ImageData : NSObject
+
+@property NSString *uri;
+@property CGFloat width;
+@property CGFloat height;
+
+@end

package/ios/utils/ImageData.mm

@@ -0,0 +1,4 @@
+#import "ImageData.h"
+
+@implementation ImageData
+@end

package/ios/utils/LayoutManagerExtension.h

@@ -2,5 +2,5 @@
 #import <UIKit/UIKit.h>
 
 @interface NSLayoutManager (LayoutManagerExtension)
-@property (nonatomic, weak) id input;
+@property(nonatomic, weak) id input;
 @end

package/ios/utils/LayoutManagerExtension.mm

@@ -1,8 +1,9 @@
 #import "LayoutManagerExtension.h"
-#import <objc/runtime.h>
+#import "ColorExtension.h"
 #import "EnrichedTextInputView.h"
-#import "StyleHeaders.h"
 #import "ParagraphsUtils.h"
+#import "StyleHeaders.h"
+#import <objc/runtime.h>
 
 @implementation NSLayoutManager (LayoutManagerExtension)
 
@@ -13,12 +14,8 @@ static void const *kInputKey = &kInputKey;
 }
 
 - (void)setInput:(id)value {
-  objc_setAssociatedObject(
-    self,
-    kInputKey,
-    value,
-    OBJC_ASSOCIATION_RETAIN_NONATOMIC
-  );
+  objc_setAssociatedObject(self, kInputKey, value,
+                           OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 + (void)load {
@@ -29,128 +26,356 @@ static void const *kInputKey = &kInputKey;
     SEL swizzledSelector = @selector(my_drawBackgroundForGlyphRange:atPoint:);
     Method originalMethod = class_getInstanceMethod(myClass, originalSelector);
     Method swizzledMethod = class_getInstanceMethod(myClass, swizzledSelector);
-    
-    BOOL didAddMethod = class_addMethod(myClass, originalSelector,
-      method_getImplementation(swizzledMethod),
-      method_getTypeEncoding(swizzledMethod)
-    );
-    
-    if(didAddMethod) {
+
+    BOOL didAddMethod = class_addMethod(
+        myClass, originalSelector, method_getImplementation(swizzledMethod),
+        method_getTypeEncoding(swizzledMethod));
+
+    if (didAddMethod) {
       class_replaceMethod(myClass, swizzledSelector,
-        method_getImplementation(originalMethod),
-        method_getTypeEncoding(originalMethod)
-      );
+                          method_getImplementation(originalMethod),
+                          method_getTypeEncoding(originalMethod));
     } else {
       method_exchangeImplementations(originalMethod, swizzledMethod);
     }
   });
 }
 
-- (void)my_drawBackgroundForGlyphRange:(NSRange)glyphRange atPoint:(CGPoint)origin {
+- (void)my_drawBackgroundForGlyphRange:(NSRange)glyphRange
+                               atPoint:(CGPoint)origin {
   [self my_drawBackgroundForGlyphRange:glyphRange atPoint:origin];
-  
+
   EnrichedTextInputView *typedInput = (EnrichedTextInputView *)self.input;
-  if(typedInput == nullptr) { return; }
-  
-  BlockQuoteStyle *bqStyle = typedInput->stylesDict[@([BlockQuoteStyle getStyleType])];
-  if(bqStyle == nullptr) { return; }
-  
-  NSRange inputRange = NSMakeRange(0, typedInput->textView.textStorage.length);
-  
-  // it isn't the most performant but we have to check for all the blockquotes each time and redraw them
-  NSArray *allBlockquotes = [bqStyle findAllOccurences:inputRange];
-  
-  for(StylePair *pair in allBlockquotes) {
-    NSRange paragraphRange = [typedInput->textView.textStorage.string paragraphRangeForRange:[pair.rangeValue rangeValue]];
-    NSRange paragraphGlyphRange = [self glyphRangeForCharacterRange:paragraphRange actualCharacterRange:nullptr];
-    [self enumerateLineFragmentsForGlyphRange:paragraphGlyphRange
-      usingBlock:^(CGRect rect, CGRect usedRect, NSTextContainer * _Nonnull textContainer, NSRange glyphRange, BOOL * _Nonnull stop) {
-        CGFloat paddingLeft = origin.x;
-        CGFloat paddingTop = origin.y;
-        CGFloat x = paddingLeft;
-        CGFloat y = paddingTop + rect.origin.y;
-        CGFloat width = [typedInput->config blockquoteBorderWidth];
-        CGFloat height = rect.size.height;
-        
-        CGRect lineRect = CGRectMake(x, y, width, height);
-        [[typedInput->config blockquoteBorderColor] setFill];
-        UIRectFill(lineRect);
-      }
-    ];
+  if (typedInput == nullptr) {
+    return;
+  }
+
+  NSRange visibleCharRange = [self characterRangeForGlyphRange:glyphRange
+                                              actualGlyphRange:NULL];
+
+  [self drawBlockQuotes:typedInput
+                 origin:origin
+       visibleCharRange:visibleCharRange];
+  [self drawLists:typedInput origin:origin visibleCharRange:visibleCharRange];
+  [self drawCodeBlocks:typedInput
+                origin:origin
+      visibleCharRange:visibleCharRange];
+}
+
+- (void)drawCodeBlocks:(EnrichedTextInputView *)typedInput
+                origin:(CGPoint)origin
+      visibleCharRange:(NSRange)visibleCharRange {
+  CodeBlockStyle *codeBlockStyle =
+      typedInput->stylesDict[@([CodeBlockStyle getStyleType])];
+  if (codeBlockStyle == nullptr) {
+    return;
+  }
+
+  NSArray<StylePair *> *allCodeBlocks =
+      [codeBlockStyle findAllOccurences:visibleCharRange];
+  NSArray<StylePair *> *mergedCodeBlocks =
+      [self mergeContiguousStylePairs:allCodeBlocks];
+  UIColor *bgColor = [[typedInput->config codeBlockBgColor]
+      colorWithAlphaIfNotTransparent:0.4];
+  CGFloat radius = [typedInput->config codeBlockBorderRadius];
+  [bgColor setFill];
+
+  for (StylePair *pair in mergedCodeBlocks) {
+    NSRange blockCharacterRange = [pair.rangeValue rangeValue];
+    if (blockCharacterRange.length == 0)
+      continue;
+
+    NSArray *paragraphs =
+        [ParagraphsUtils getSeparateParagraphsRangesIn:typedInput->textView
+                                                 range:blockCharacterRange];
+    if (paragraphs.count == 0)
+      continue;
+
+    NSRange firstParagraphRange =
+        [((NSValue *)[paragraphs firstObject]) rangeValue];
+    NSRange lastParagraphRange =
+        [((NSValue *)[paragraphs lastObject]) rangeValue];
+
+    for (NSValue *paragraphValue in paragraphs) {
+      NSRange paragraphCharacterRange = [paragraphValue rangeValue];
+
+      BOOL isFirstParagraph =
+          NSEqualRanges(paragraphCharacterRange, firstParagraphRange);
+      BOOL isLastParagraph =
+          NSEqualRanges(paragraphCharacterRange, lastParagraphRange);
+
+      NSRange paragraphGlyphRange =
+          [self glyphRangeForCharacterRange:paragraphCharacterRange
+                       actualCharacterRange:NULL];
+
+      __block BOOL isFirstLineOfParagraph = YES;
+
+      [self
+          enumerateLineFragmentsForGlyphRange:paragraphGlyphRange
+                                   usingBlock:^(
+                                       CGRect rect, CGRect usedRect,
+                                       NSTextContainer *_Nonnull textContainer,
+                                       NSRange glyphRange,
+                                       BOOL *_Nonnull stop) {
+                                     CGRect lineBgRect = rect;
+                                     lineBgRect.origin.x = origin.x;
+                                     lineBgRect.origin.y += origin.y;
+                                     lineBgRect.size.width =
+                                         textContainer.size.width;
+
+                                     UIRectCorner cornersForThisLine = 0;
+
+                                     if (isFirstParagraph &&
+                                         isFirstLineOfParagraph) {
+                                       cornersForThisLine =
+                                           UIRectCornerTopLeft |
+                                           UIRectCornerTopRight;
+                                     }
+
+                                     BOOL isLastLineOfParagraph =
+                                         (NSMaxRange(glyphRange) >=
+                                          NSMaxRange(paragraphGlyphRange));
+
+                                     if (isLastParagraph &&
+                                         isLastLineOfParagraph) {
+                                       cornersForThisLine =
+                                           cornersForThisLine |
+                                           UIRectCornerBottomLeft |
+                                           UIRectCornerBottomRight;
+                                     }
+
+                                     UIBezierPath *path = [UIBezierPath
+                                         bezierPathWithRoundedRect:lineBgRect
+                                                 byRoundingCorners:
+                                                     cornersForThisLine
+                                                       cornerRadii:CGSizeMake(
+                                                                       radius,
+                                                                       radius)];
+                                     [path fill];
+
+                                     isFirstLineOfParagraph = NO;
+                                   }];
+    }
+  }
+}
+
+- (NSArray<StylePair *> *)mergeContiguousStylePairs:
+    (NSArray<StylePair *> *)pairs {
+  if (pairs.count == 0) {
+    return @[];
+  }
+
+  NSMutableArray<StylePair *> *mergedPairs = [[NSMutableArray alloc] init];
+  StylePair *currentPair = pairs[0];
+  NSRange currentRange = [currentPair.rangeValue rangeValue];
+  for (NSUInteger i = 1; i < pairs.count; i++) {
+    StylePair *nextPair = pairs[i];
+    NSRange nextRange = [nextPair.rangeValue rangeValue];
+
+    // The Gap Check:
+    // NSMaxRange(currentRange) is where the current block ends.
+    // nextRange.location is where the next block starts.
+    if (NSMaxRange(currentRange) == nextRange.location) {
+      // They touch perfectly (no gap). Merge them.
+      currentRange.length += nextRange.length;
+    } else {
+      // There is a gap (indices don't match).
+      // 1. Save the finished block.
+      StylePair *mergedPair = [[StylePair alloc] init];
+      mergedPair.rangeValue = [NSValue valueWithRange:currentRange];
+      mergedPair.styleValue = currentPair.styleValue;
+      [mergedPairs addObject:mergedPair];
+
+      // 2. Start a brand new block.
+      currentPair = nextPair;
+      currentRange = nextRange;
+    }
+  }
+
+  // Add the final block
+  StylePair *lastPair = [[StylePair alloc] init];
+  lastPair.rangeValue = [NSValue valueWithRange:currentRange];
+  lastPair.styleValue = currentPair.styleValue;
+  [mergedPairs addObject:lastPair];
+
+  return mergedPairs;
+}
+
+- (void)drawBlockQuotes:(EnrichedTextInputView *)typedInput
+                 origin:(CGPoint)origin
+       visibleCharRange:(NSRange)visibleCharRange {
+  BlockQuoteStyle *bqStyle =
+      typedInput->stylesDict[@([BlockQuoteStyle getStyleType])];
+  if (bqStyle == nullptr) {
+    return;
+  }
+
+  NSArray *allBlockquotes = [bqStyle findAllOccurences:visibleCharRange];
+
+  for (StylePair *pair in allBlockquotes) {
+    NSRange paragraphRange = [typedInput->textView.textStorage.string
+        paragraphRangeForRange:[pair.rangeValue rangeValue]];
+    NSRange paragraphGlyphRange =
+        [self glyphRangeForCharacterRange:paragraphRange
+                     actualCharacterRange:nullptr];
+    [self
+        enumerateLineFragmentsForGlyphRange:paragraphGlyphRange
+                                 usingBlock:^(
+                                     CGRect rect, CGRect usedRect,
+                                     NSTextContainer *_Nonnull textContainer,
+                                     NSRange glyphRange, BOOL *_Nonnull stop) {
+                                   CGFloat paddingLeft = origin.x;
+                                   CGFloat paddingTop = origin.y;
+                                   CGFloat x = paddingLeft;
+                                   CGFloat y = paddingTop + rect.origin.y;
+                                   CGFloat width =
+                                       [typedInput
+                                               ->config blockquoteBorderWidth];
+                                   CGFloat height = rect.size.height;
+
+                                   CGRect lineRect =
+                                       CGRectMake(x, y, width, height);
+                                   [[typedInput->config blockquoteBorderColor]
+                                       setFill];
+                                   UIRectFill(lineRect);
+                                 }];
+  }
+}
+
+- (void)drawLists:(EnrichedTextInputView *)typedInput
+              origin:(CGPoint)origin
+    visibleCharRange:(NSRange)visibleCharRange {
+  UnorderedListStyle *ulStyle =
+      typedInput->stylesDict[@([UnorderedListStyle getStyleType])];
+  OrderedListStyle *olStyle =
+      typedInput->stylesDict[@([OrderedListStyle getStyleType])];
+  if (ulStyle == nullptr || olStyle == nullptr) {
+    return;
   }
-    
-  UnorderedListStyle *ulStyle = typedInput->stylesDict[@([UnorderedListStyle getStyleType])];
-  OrderedListStyle *olStyle = typedInput->stylesDict[@([OrderedListStyle getStyleType])];
-  if(ulStyle == nullptr || olStyle == nullptr) { return; }
-  
-  // also not the most performant but we redraw all the lists
+
   NSMutableArray *allLists = [[NSMutableArray alloc] init];
-  [allLists addObjectsFromArray:[ulStyle findAllOccurences:inputRange]];
-  [allLists addObjectsFromArray:[olStyle findAllOccurences:inputRange]];
-  
-  for(StylePair *pair in allLists) {
+  [allLists addObjectsFromArray:[ulStyle findAllOccurences:visibleCharRange]];
+  [allLists addObjectsFromArray:[olStyle findAllOccurences:visibleCharRange]];
+
+  for (StylePair *pair in allLists) {
     NSParagraphStyle *pStyle = (NSParagraphStyle *)pair.styleValue;
     NSDictionary *markerAttributes = @{
-      NSFontAttributeName: [typedInput->config orderedListMarkerFont],
-      NSForegroundColorAttributeName: [typedInput->config orderedListMarkerColor]
+      NSFontAttributeName : [typedInput->config orderedListMarkerFont],
+      NSForegroundColorAttributeName :
+          [typedInput->config orderedListMarkerColor]
     };
-    
-    NSArray *paragraphs = [ParagraphsUtils getSeparateParagraphsRangesIn:typedInput->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] input:typedInput];
-          
-          if(pStyle.textLists.firstObject.markerFormat == NSTextListMarkerDecimal) {
-            CGFloat gapWidth = [typedInput->config orderedListGapWidth];
-            CGFloat markerWidth = [marker sizeWithAttributes:markerAttributes].width;
-            CGFloat markerX = usedRect.origin.x - gapWidth - markerWidth/2;
-            
-            [marker drawAtPoint:CGPointMake(markerX, usedRect.origin.y + origin.y) withAttributes:markerAttributes];
-          } else {
-            CGFloat gapWidth = [typedInput->config unorderedListGapWidth];
-            CGFloat bulletSize = [typedInput->config unorderedListBulletSize];
-            CGFloat bulletX = usedRect.origin.x - gapWidth - bulletSize/2;
-            CGFloat centerY = CGRectGetMidY(usedRect);
-            
-            CGContextRef context = UIGraphicsGetCurrentContext();
-            CGContextSaveGState(context); {
-              [[typedInput->config unorderedListBulletColor] setFill];
-              CGContextAddArc(context, bulletX, centerY, bulletSize/2, 0, 2 * M_PI, YES);
-              CGContextFillPath(context);
-            }
-            CGContextRestoreGState(context);
-          }
-          // only first line of a list gets its marker drawn
-          *stop = YES;
-        }
-      ];
+
+    NSArray *paragraphs = [ParagraphsUtils
+        getSeparateParagraphsRangesIn:typedInput->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]
+                                                 input:typedInput];
+
+                                     if (pStyle.textLists.firstObject
+                                             .markerFormat ==
+                                         NSTextListMarkerDecimal) {
+                                       CGFloat gapWidth =
+                                           [typedInput->config
+                                                   orderedListGapWidth];
+                                       CGFloat markerWidth =
+                                           [marker sizeWithAttributes:
+                                                       markerAttributes]
+                                               .width;
+                                       CGFloat markerX = usedRect.origin.x -
+                                                         gapWidth -
+                                                         markerWidth / 2;
+
+                                       [marker drawAtPoint:CGPointMake(
+                                                               markerX,
+                                                               usedRect.origin
+                                                                       .y +
+                                                                   origin.y)
+                                            withAttributes:markerAttributes];
+                                     } else {
+                                       CGFloat gapWidth =
+                                           [typedInput->config
+                                                   unorderedListGapWidth];
+                                       CGFloat bulletSize =
+                                           [typedInput->config
+                                                   unorderedListBulletSize];
+                                       CGFloat bulletX = usedRect.origin.x -
+                                                         gapWidth -
+                                                         bulletSize / 2;
+                                       CGFloat centerY =
+                                           CGRectGetMidY(usedRect);
+
+                                       CGContextRef context =
+                                           UIGraphicsGetCurrentContext();
+                                       CGContextSaveGState(context);
+                                       {
+                                         [[typedInput->config
+                                                 unorderedListBulletColor]
+                                             setFill];
+                                         CGContextAddArc(
+                                             context, bulletX, centerY,
+                                             bulletSize / 2, 0, 2 * M_PI, YES);
+                                         CGContextFillPath(context);
+                                       }
+                                       CGContextRestoreGState(context);
+                                     }
+                                     // only first line of a list gets its
+                                     // marker drawn
+                                     *stop = YES;
+                                   }];
     }
   }
 }
 
-- (NSString *)markerForList:(NSTextList *)list charIndex:(NSUInteger)index input:(EnrichedTextInputView *)input {
-  if(list.markerFormat == NSTextListMarkerDecimal) {
+- (NSString *)markerForList:(NSTextList *)list
+                  charIndex:(NSUInteger)index
+                      input:(EnrichedTextInputView *)input {
+  if (list.markerFormat == NSTextListMarkerDecimal) {
     NSString *fullText = input->textView.textStorage.string;
     NSInteger itemNumber = 1;
-    
-    NSRange currentParagraph = [fullText paragraphRangeForRange:NSMakeRange(index, 0)];
-    if(currentParagraph.location > 0) {
-      OrderedListStyle *olStyle = input->stylesDict[@([OrderedListStyle getStyleType])];
-      
+
+    NSRange currentParagraph =
+        [fullText paragraphRangeForRange:NSMakeRange(index, 0)];
+    if (currentParagraph.location > 0) {
+      OrderedListStyle *olStyle =
+          input->stylesDict[@([OrderedListStyle getStyleType])];
+
       NSInteger prevParagraphsCount = 0;
-      NSInteger recentParagraphLocation = [fullText paragraphRangeForRange:NSMakeRange(currentParagraph.location - 1, 0)].location;
-      
+      NSInteger recentParagraphLocation =
+          [fullText
+              paragraphRangeForRange:NSMakeRange(currentParagraph.location - 1,
+                                                 0)]
+              .location;
+
       // seek for previous lists
-      while(true) {
-        if([olStyle detectStyle:NSMakeRange(recentParagraphLocation, 0)]) {
+      while (true) {
+        if ([olStyle detectStyle:NSMakeRange(recentParagraphLocation, 0)]) {
           prevParagraphsCount += 1;
-          
-          if(recentParagraphLocation > 0) {
-            recentParagraphLocation = [fullText paragraphRangeForRange:NSMakeRange(recentParagraphLocation - 1, 0)].location;
+
+          if (recentParagraphLocation > 0) {
+            recentParagraphLocation =
+                [fullText
+                    paragraphRangeForRange:NSMakeRange(
+                                               recentParagraphLocation - 1, 0)]
+                    .location;
           } else {
             break;
           }
@@ -158,10 +383,10 @@ static void const *kInputKey = &kInputKey;
           break;
         }
       }
-      
+
       itemNumber = prevParagraphsCount + 1;
     }
-    
+
     return [NSString stringWithFormat:@"%ld.", (long)(itemNumber)];
   } else {
     return @"•";

package/ios/utils/MentionParams.h

@@ -6,4 +6,3 @@
 @property NSString *indicator;
 @property NSString *attributes;
 @end
-

package/ios/utils/MentionStyleProps.h

@@ -1,7 +1,7 @@
 #pragma once
-#import <UIKit/UIKit.h>
 #import "TextDecorationLineEnum.h"
 #import "string"
+#import <UIKit/UIKit.h>
 #import <folly/dynamic.h>
 
 @interface MentionStyleProps : NSObject