react-native-enriched 0.3.0 → 0.4.1

package/ios/EnrichedTextInputView.mm

@@ -1,10 +1,12 @@
 #import "EnrichedTextInputView.h"
 #import "CoreText/CoreText.h"
+#import "ImageAttachment.h"
 #import "LayoutManagerExtension.h"
 #import "ParagraphAttributesUtils.h"
 #import "RCTFabricComponentsPlugins.h"
 #import "StringExtension.h"
 #import "StyleHeaders.h"
+#import "TextBlockTapGestureRecognizer.h"
 #import "UIView+React.h"
 #import "WordsUtils.h"
 #import "ZeroWidthSpaceUtils.h"
@@ -26,7 +28,8 @@
 using namespace facebook::react;
 
 @interface EnrichedTextInputView () <RCTEnrichedTextInputViewViewProtocol,
-                                     UITextViewDelegate, NSObject>
+                                     UITextViewDelegate,
+                                     UIGestureRecognizerDelegate, NSObject>
 
 @end
 
@@ -46,6 +49,7 @@ using namespace facebook::react;
   UIColor *_placeholderColor;
   BOOL _emitFocusBlur;
   BOOL _emitTextChange;
+  NSMutableDictionary<NSValue *, UIImageView *> *_attachmentViews;
 }
 
 // MARK: - Component utils
@@ -116,6 +120,8 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
         [[UnorderedListStyle alloc] initWithInput:self],
     @([OrderedListStyle getStyleType]) :
         [[OrderedListStyle alloc] initWithInput:self],
+    @([CheckboxListStyle getStyleType]) :
+        [[CheckboxListStyle alloc] initWithInput:self],
     @([BlockQuoteStyle getStyleType]) :
         [[BlockQuoteStyle alloc] initWithInput:self],
     @([CodeBlockStyle getStyleType]) :
@@ -141,63 +147,70 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       @([H4Style getStyleType]), @([H5Style getStyleType]),
       @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
       @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([H2Style getStyleType]) : @[
       @([H1Style getStyleType]), @([H3Style getStyleType]),
       @([H4Style getStyleType]), @([H5Style getStyleType]),
       @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
       @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([H3Style getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
       @([H4Style getStyleType]), @([H5Style getStyleType]),
       @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
       @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([H4Style getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
       @([H3Style getStyleType]), @([H5Style getStyleType]),
       @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
       @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([H5Style getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
       @([H3Style getStyleType]), @([H4Style getStyleType]),
       @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
       @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([H6Style getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
       @([H3Style getStyleType]), @([H4Style getStyleType]),
       @([H5Style getStyleType]), @([UnorderedListStyle getStyleType]),
       @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([UnorderedListStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
       @([H3Style getStyleType]), @([H4Style getStyleType]),
       @([H5Style getStyleType]), @([H6Style getStyleType]),
       @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([OrderedListStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
       @([H3Style getStyleType]), @([H4Style getStyleType]),
       @([H5Style getStyleType]), @([H6Style getStyleType]),
       @([UnorderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
+    ],
+    @([CheckboxListStyle getStyleType]) : @[
+      @([H1Style getStyleType]), @([H2Style getStyleType]),
+      @([H3Style getStyleType]), @([H4Style getStyleType]),
+      @([H5Style getStyleType]), @([H6Style getStyleType]),
+      @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
+      @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])
     ],
     @([BlockQuoteStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
       @([H3Style getStyleType]), @([H4Style getStyleType]),
       @([H5Style getStyleType]), @([H6Style getStyleType]),
       @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
-      @([CodeBlockStyle getStyleType])
+      @([CodeBlockStyle getStyleType]), @([CheckboxListStyle getStyleType])
     ],
     @([CodeBlockStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
@@ -207,7 +220,8 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       @([UnderlineStyle getStyleType]), @([StrikethroughStyle getStyleType]),
       @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
       @([BlockQuoteStyle getStyleType]), @([InlineCodeStyle getStyleType]),
-      @([MentionStyle getStyleType]), @([LinkStyle getStyleType])
+      @([MentionStyle getStyleType]), @([LinkStyle getStyleType]),
+      @([CheckboxListStyle getStyleType])
     ],
     @([ImageStyle getStyleType]) :
         @[ @([LinkStyle getStyleType]), @([MentionStyle getStyleType]) ]
@@ -233,12 +247,14 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     @([H6Style getStyleType]) : @[],
     @([UnorderedListStyle getStyleType]) : @[],
     @([OrderedListStyle getStyleType]) : @[],
+    @([CheckboxListStyle getStyleType]) : @[],
     @([BlockQuoteStyle getStyleType]) : @[],
     @([CodeBlockStyle getStyleType]) : @[],
     @([ImageStyle getStyleType]) : @[ @([InlineCodeStyle getStyleType]) ]
   } mutableCopy];
 
   parser = [[InputParser alloc] initWithInput:self];
+  _attachmentViews = [[NSMutableDictionary alloc] init];
 }
 
 - (void)setupTextView {
@@ -250,6 +266,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   textView.input = self;
   textView.layoutManager.input = self;
   textView.adjustsFontForContentSizeCategory = YES;
+  [textView addGestureRecognizer:[[TextBlockTapGestureRecognizer alloc]
+                                     initWithInput:self
+                                            action:@selector(onTextBlockTap:)]];
 }
 
 - (void)setupPlaceholderLabel {
@@ -596,6 +615,37 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     stylePropChanged = YES;
   }
 
+  if (newViewProps.htmlStyle.ulCheckbox.boxSize !=
+      oldViewProps.htmlStyle.ulCheckbox.boxSize) {
+    [newConfig
+        setCheckboxListBoxSize:newViewProps.htmlStyle.ulCheckbox.boxSize];
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.ulCheckbox.gapWidth !=
+      oldViewProps.htmlStyle.ulCheckbox.gapWidth) {
+    [newConfig
+        setCheckboxListGapWidth:newViewProps.htmlStyle.ulCheckbox.gapWidth];
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.ulCheckbox.marginLeft !=
+      oldViewProps.htmlStyle.ulCheckbox.marginLeft) {
+    [newConfig
+        setCheckboxListMarginLeft:newViewProps.htmlStyle.ulCheckbox.marginLeft];
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.ulCheckbox.boxColor !=
+      oldViewProps.htmlStyle.ulCheckbox.boxColor) {
+    if (isColorMeaningful(newViewProps.htmlStyle.ulCheckbox.boxColor)) {
+      [newConfig setCheckboxListBoxColor:RCTUIColorFromSharedColor(
+                                             newViewProps.htmlStyle.ulCheckbox
+                                                 .boxColor)];
+      stylePropChanged = YES;
+    }
+  }
+
   if (newViewProps.htmlStyle.a.textDecorationLine !=
       oldViewProps.htmlStyle.a.textDecorationLine) {
     NSString *objcString =
@@ -1024,28 +1074,6 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       _activeStyles = newActiveStyles;
       _blockedStyles = newBlockedStyles;
 
-      emitter->onChangeStateDeprecated({
-          .isBold = [self isStyleActive:[BoldStyle getStyleType]],
-          .isItalic = [self isStyleActive:[ItalicStyle getStyleType]],
-          .isUnderline = [self isStyleActive:[UnderlineStyle getStyleType]],
-          .isStrikeThrough =
-              [self isStyleActive:[StrikethroughStyle getStyleType]],
-          .isInlineCode = [self isStyleActive:[InlineCodeStyle getStyleType]],
-          .isLink = [self isStyleActive:[LinkStyle getStyleType]],
-          .isMention = [self isStyleActive:[MentionStyle getStyleType]],
-          .isH1 = [self isStyleActive:[H1Style getStyleType]],
-          .isH2 = [self isStyleActive:[H2Style getStyleType]],
-          .isH3 = [self isStyleActive:[H3Style getStyleType]],
-          .isH4 = [self isStyleActive:[H4Style getStyleType]],
-          .isH5 = [self isStyleActive:[H5Style getStyleType]],
-          .isH6 = [self isStyleActive:[H6Style getStyleType]],
-          .isUnorderedList =
-              [self isStyleActive:[UnorderedListStyle getStyleType]],
-          .isOrderedList = [self isStyleActive:[OrderedListStyle getStyleType]],
-          .isBlockQuote = [self isStyleActive:[BlockQuoteStyle getStyleType]],
-          .isCodeBlock = [self isStyleActive:[CodeBlockStyle getStyleType]],
-          .isImage = [self isStyleActive:[ImageStyle getStyleType]],
-      });
       emitter->onChangeState(
           {.bold = GET_STYLE_STATE([BoldStyle getStyleType]),
            .italic = GET_STYLE_STATE([ItalicStyle getStyleType]),
@@ -1064,7 +1092,8 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
            .orderedList = GET_STYLE_STATE([OrderedListStyle getStyleType]),
            .blockQuote = GET_STYLE_STATE([BlockQuoteStyle getStyleType]),
            .codeBlock = GET_STYLE_STATE([CodeBlockStyle getStyleType]),
-           .image = GET_STYLE_STATE([ImageStyle getStyleType])});
+           .image = GET_STYLE_STATE([ImageStyle getStyleType]),
+           .checkboxList = GET_STYLE_STATE([CheckboxListStyle getStyleType])});
     }
   }
 
@@ -1175,6 +1204,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     [self toggleParagraphStyle:[UnorderedListStyle getStyleType]];
   } else if ([commandName isEqualToString:@"toggleOrderedList"]) {
     [self toggleParagraphStyle:[OrderedListStyle getStyleType]];
+  } else if ([commandName isEqualToString:@"toggleCheckboxList"]) {
+    BOOL checked = [args[0] boolValue];
+    [self toggleCheckboxList:checked];
   } else if ([commandName isEqualToString:@"toggleBlockQuote"]) {
     [self toggleParagraphStyle:[BlockQuoteStyle getStyleType]];
   } else if ([commandName isEqualToString:@"toggleCodeBlock"]) {
@@ -1282,6 +1314,32 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
 }
 
+- (void)emitOnPasteImagesEvent:(NSArray<NSDictionary *> *)images {
+  auto emitter = [self getEventEmitter];
+  if (emitter != nullptr) {
+    std::vector<EnrichedTextInputViewEventEmitter::OnPasteImagesImages>
+        imagesVector;
+    imagesVector.reserve(images.count);
+
+    for (NSDictionary *img in images) {
+      NSString *uri = img[@"uri"];
+      NSString *type = img[@"type"];
+      double width = [img[@"width"] doubleValue];
+      double height = [img[@"height"] doubleValue];
+
+      EnrichedTextInputViewEventEmitter::OnPasteImagesImages imageStruct = {
+          .uri = [uri toCppString],
+          .type = [type toCppString],
+          .width = width,
+          .height = height};
+
+      imagesVector.push_back(imageStruct);
+    }
+
+    emitter->onPasteImages({.images = imagesVector});
+  }
+}
+
 - (void)emitOnMentionDetectedEvent:(NSString *)text
                          indicator:(NSString *)indicator
                         attributes:(NSString *)attributes {
@@ -1369,6 +1427,24 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
 }
 
+- (void)toggleCheckboxList:(BOOL)checked {
+  CheckboxListStyle *checkboxListStyleClass =
+      (CheckboxListStyle *)stylesDict[@([CheckboxListStyle getStyleType])];
+  if (checkboxListStyleClass == nullptr) {
+    return;
+  }
+  // we always pass whole paragraph/s range to these styles
+  NSRange paragraphRange = [textView.textStorage.string
+      paragraphRangeForRange:textView.selectedRange];
+
+  if ([self handleStyleBlocksAndConflicts:[CheckboxListStyle getStyleType]
+                                    range:paragraphRange]) {
+    [checkboxListStyleClass applyStyleWithCheckedValue:checked
+                                               inRange:paragraphRange];
+    [self anyTextMayHaveBeenModified];
+  }
+}
+
 - (void)addLinkAt:(NSInteger)start
               end:(NSInteger)end
              text:(NSString *)text
@@ -1587,27 +1663,6 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     [codeBlockStyle manageCodeBlockFontAndColor];
   }
 
-  // improper headings fix
-  H1Style *h1Style = stylesDict[@([H1Style getStyleType])];
-  H2Style *h2Style = stylesDict[@([H2Style getStyleType])];
-  H3Style *h3Style = stylesDict[@([H3Style getStyleType])];
-  H4Style *h4Style = stylesDict[@([H4Style getStyleType])];
-  H5Style *h5Style = stylesDict[@([H5Style getStyleType])];
-  H6Style *h6Style = stylesDict[@([H6Style getStyleType])];
-
-  bool headingStylesDefined = h1Style != nullptr && h2Style != nullptr &&
-                              h3Style != nullptr && h4Style != nullptr &&
-                              h5Style != nullptr && h6Style != nullptr;
-
-  if (headingStylesDefined) {
-    [h1Style handleImproperHeadings];
-    [h2Style handleImproperHeadings];
-    [h3Style handleImproperHeadings];
-    [h4Style handleImproperHeadings];
-    [h5Style handleImproperHeadings];
-    [h6Style handleImproperHeadings];
-  }
-
   // mentions management: removal and editing
   MentionStyle *mentionStyleClass =
       (MentionStyle *)stylesDict[@([MentionStyle getStyleType])];
@@ -1662,6 +1717,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   [self tryUpdatingHeight];
   // update active styles as well
   [self tryUpdatingActiveStyles];
+  [self layoutAttachments];
   // update drawing - schedule debounced relayout
   [self scheduleRelayoutIfNeeded];
 }
@@ -1768,6 +1824,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
   UnorderedListStyle *uStyle = stylesDict[@([UnorderedListStyle getStyleType])];
   OrderedListStyle *oStyle = stylesDict[@([OrderedListStyle getStyleType])];
+  CheckboxListStyle *cbLStyle = stylesDict[@([CheckboxListStyle getStyleType])];
   BlockQuoteStyle *bqStyle = stylesDict[@([BlockQuoteStyle getStyleType])];
   CodeBlockStyle *cbStyle = stylesDict[@([CodeBlockStyle getStyleType])];
   LinkStyle *linkStyle = stylesDict[@([LinkStyle getStyleType])];
@@ -1787,6 +1844,8 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       [uStyle tryHandlingListShorcutInRange:range replacementText:text] ||
       [oStyle handleBackspaceInRange:range replacementText:text] ||
       [oStyle tryHandlingListShorcutInRange:range replacementText:text] ||
+      [cbLStyle handleBackspaceInRange:range replacementText:text] ||
+      [cbLStyle handleNewlinesInRange:range replacementText:text] ||
       [bqStyle handleBackspaceInRange:range replacementText:text] ||
       [cbStyle handleBackspaceInRange:range replacementText:text] ||
       [linkStyle handleLeadingLinkReplacement:range replacementText:text] ||
@@ -1798,6 +1857,12 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       [h4Style handleNewlinesInRange:range replacementText:text] ||
       [h5Style handleNewlinesInRange:range replacementText:text] ||
       [h6Style handleNewlinesInRange:range replacementText:text] ||
+      [h1Style handleBackspaceInRange:range replacementText:text] ||
+      [h2Style handleBackspaceInRange:range replacementText:text] ||
+      [h3Style handleBackspaceInRange:range replacementText:text] ||
+      [h4Style handleBackspaceInRange:range replacementText:text] ||
+      [h5Style handleBackspaceInRange:range replacementText:text] ||
+      [h6Style handleBackspaceInRange:range replacementText:text] ||
       [ZeroWidthSpaceUtils handleBackspaceInRange:range
                                   replacementText:text
                                             input:self] ||
@@ -1819,6 +1884,14 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     return NO;
   }
 
+  // Tapping near a link causes iOS to re-derive typingAttributes from
+  // character attributes after textViewDidChangeSelection returns, undoing
+  // the cleanup in manageSelectionBasedChanges. Strip them again here, right
+  // before insertion, so new text never inherits link styling.
+  if (linkStyle != nullptr) {
+    [linkStyle manageLinkTypingAttributes];
+  }
+
   return YES;
 }
 
@@ -1890,6 +1963,51 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
 }
 
+- (void)onTextBlockTap:(TextBlockTapGestureRecognizer *)gr {
+  if (gr.state != UIGestureRecognizerStateEnded)
+    return;
+  if (![self->textView isFirstResponder]) {
+    [self->textView becomeFirstResponder];
+  }
+
+  switch (gr.tapKind) {
+
+  case TextBlockTapKindCheckbox: {
+    CheckboxListStyle *checkboxStyle =
+        (CheckboxListStyle *)stylesDict[@([CheckboxListStyle getStyleType])];
+
+    if (checkboxStyle) {
+      NSUInteger charIndex = (NSUInteger)gr.characterIndex;
+      [checkboxStyle toggleCheckedAt:charIndex];
+      [self anyTextMayHaveBeenModified];
+
+      NSString *fullText = textView.textStorage.string;
+      NSRange paragraphRange =
+          [fullText paragraphRangeForRange:NSMakeRange(charIndex, 0)];
+      NSUInteger endOfLineIndex = NSMaxRange(paragraphRange);
+
+      // If the paragraph ends with a newline, step back by 1 so the cursor
+      // stays on the current line instead of jumping to the next one.
+      if (endOfLineIndex > 0 && endOfLineIndex <= fullText.length) {
+        unichar lastChar = [fullText characterAtIndex:endOfLineIndex - 1];
+        if ([[NSCharacterSet newlineCharacterSet] characterIsMember:lastChar]) {
+          endOfLineIndex--;
+        }
+      }
+
+      // Move the cursor to the end of the currently tapped checkbox line.
+      // Without this, the cursor may remain at its previous position,
+      // potentially inside a different checkbox line.
+      textView.selectedRange = NSMakeRange(endOfLineIndex, 0);
+    }
+    break;
+  }
+
+  default:
+    break;
+  }
+}
+
 // MARK: - Media attachments delegate
 
 - (void)mediaAttachmentDidUpdate:(NSTextAttachment *)attachment {
@@ -1915,6 +2033,107 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   [storage edited:NSTextStorageEditedAttributes
                range:foundRange
       changeInLength:0];
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self layoutAttachments];
+  });
+}
+
+// MARK: - Image/GIF Overlay Management
+
+- (void)layoutAttachments {
+  NSTextStorage *storage = textView.textStorage;
+  NSMutableDictionary<NSValue *, UIImageView *> *activeAttachmentViews =
+      [NSMutableDictionary dictionary];
+
+  // Iterate over the entire text to find ImageAttachments
+  [storage enumerateAttribute:NSAttachmentAttributeName
+                      inRange:NSMakeRange(0, storage.length)
+                      options:0
+                   usingBlock:^(id value, NSRange range, BOOL *stop) {
+                     if ([value isKindOfClass:[ImageAttachment class]]) {
+                       ImageAttachment *attachment = (ImageAttachment *)value;
+
+                       CGRect rect = [self frameForAttachment:attachment
+                                                      atRange:range];
+
+                       // Get or Create the UIImageView for this specific
+                       // attachment key
+                       NSValue *key =
+                           [NSValue valueWithNonretainedObject:attachment];
+                       UIImageView *imgView = _attachmentViews[key];
+
+                       if (!imgView) {
+                         // It doesn't exist yet, create it
+                         imgView = [[UIImageView alloc] initWithFrame:rect];
+                         imgView.contentMode = UIViewContentModeScaleAspectFit;
+                         imgView.tintColor = [UIColor labelColor];
+
+                         // Add it directly to the TextView
+                         [textView addSubview:imgView];
+                       }
+
+                       // Update position (in case text moved/scrolled)
+                       if (!CGRectEqualToRect(imgView.frame, rect)) {
+                         imgView.frame = rect;
+                       }
+                       UIImage *targetImage =
+                           attachment.storedAnimatedImage ?: attachment.image;
+
+                       // Only set if different to avoid resetting the animation
+                       // loop
+                       if (imgView.image != targetImage) {
+                         imgView.image = targetImage;
+                       }
+
+                       // Ensure it is visible on top
+                       imgView.hidden = NO;
+                       [textView bringSubviewToFront:imgView];
+
+                       activeAttachmentViews[key] = imgView;
+                       // Remove from the old map so we know it has been claimed
+                       [_attachmentViews removeObjectForKey:key];
+                     }
+                   }];
+
+  // Everything remaining in _attachmentViews is dead or off-screen
+  for (UIImageView *danglingView in _attachmentViews.allValues) {
+    [danglingView removeFromSuperview];
+  }
+  _attachmentViews = activeAttachmentViews;
 }
 
+- (CGRect)frameForAttachment:(ImageAttachment *)attachment
+                     atRange:(NSRange)range {
+  NSLayoutManager *layoutManager = textView.layoutManager;
+  NSTextContainer *textContainer = textView.textContainer;
+  NSTextStorage *storage = textView.textStorage;
+
+  NSRange glyphRange = [layoutManager glyphRangeForCharacterRange:range
+                                             actualCharacterRange:NULL];
+  CGRect glyphRect = [layoutManager boundingRectForGlyphRange:glyphRange
+                                              inTextContainer:textContainer];
+
+  CGRect lineRect =
+      [layoutManager lineFragmentRectForGlyphAtIndex:glyphRange.location
+                                      effectiveRange:NULL];
+  CGSize attachmentSize = attachment.bounds.size;
+
+  UIFont *font = [storage attribute:NSFontAttributeName
+                            atIndex:range.location
+                     effectiveRange:NULL];
+  if (!font) {
+    font = [config primaryFont];
+  }
+
+  // Calculate (Baseline Alignment)
+  CGFloat targetY =
+      CGRectGetMaxY(lineRect) + font.descender - attachmentSize.height;
+  CGRect rect =
+      CGRectMake(glyphRect.origin.x + textView.textContainerInset.left,
+                 targetY + textView.textContainerInset.top,
+                 attachmentSize.width, attachmentSize.height);
+
+  return CGRectIntegral(rect);
+}
 @end

package/ios/config/InputConfig.h

@@ -88,4 +88,14 @@
 - (NSRegularExpression *)parsedLinkRegex;
 - (void)invalidateFonts;
 - (NSNumber *)scaledPrimaryFontSize;
+- (CGFloat)checkboxListBoxSize;
+- (void)setCheckboxListBoxSize:(CGFloat)newValue;
+- (CGFloat)checkboxListGapWidth;
+- (void)setCheckboxListGapWidth:(CGFloat)newValue;
+- (CGFloat)checkboxListMarginLeft;
+- (void)setCheckboxListMarginLeft:(CGFloat)newValue;
+- (UIColor *)checkboxListBoxColor;
+- (void)setCheckboxListBoxColor:(UIColor *)newValue;
+- (UIImage *)checkboxCheckedImage;
+- (UIImage *)checkboxUncheckedImage;
 @end

package/ios/config/InputConfig.mm

@@ -47,6 +47,12 @@
   UIColor *_codeBlockBgColor;
   LinkRegexConfig *_linkRegexConfig;
   NSRegularExpression *_parsedLinkRegex;
+  CGFloat _checkboxListBoxSize;
+  CGFloat _checkboxListGapWidth;
+  CGFloat _checkboxListMarginLeft;
+  UIColor *_checkboxListBoxColor;
+  UIImage *_checkboxCheckedImage;
+  UIImage *_checkboxUncheckedImage;
 }
 
 - (instancetype)init {
@@ -101,6 +107,12 @@
   copy->_codeBlockBorderRadius = _codeBlockBorderRadius;
   copy->_linkRegexConfig = [_linkRegexConfig copy];
   copy->_parsedLinkRegex = [_parsedLinkRegex copy];
+  copy->_checkboxListBoxSize = _checkboxListBoxSize;
+  copy->_checkboxListGapWidth = _checkboxListGapWidth;
+  copy->_checkboxListMarginLeft = _checkboxListMarginLeft;
+  copy->_checkboxListBoxColor = [_checkboxListBoxColor copy];
+  copy->_checkboxCheckedImage = _checkboxCheckedImage;
+  copy->_checkboxUncheckedImage = _checkboxUncheckedImage;
   return copy;
 }
 
@@ -527,4 +539,111 @@
   return @(scaledSize);
 }
 
+- (CGFloat)checkboxListBoxSize {
+  return _checkboxListBoxSize;
+}
+
+- (void)setCheckboxListBoxSize:(CGFloat)newValue {
+  if (_checkboxListBoxSize != newValue) {
+    _checkboxListBoxSize = newValue;
+    // Invalidate checkbox images because box size changed
+    _checkboxCheckedImage = nil;
+    _checkboxUncheckedImage = nil;
+  }
+}
+
+- (CGFloat)checkboxListGapWidth {
+  return _checkboxListGapWidth;
+}
+
+- (void)setCheckboxListGapWidth:(CGFloat)newValue {
+  _checkboxListGapWidth = newValue;
+}
+
+- (CGFloat)checkboxListMarginLeft {
+  return _checkboxListMarginLeft;
+}
+
+- (void)setCheckboxListMarginLeft:(CGFloat)newValue {
+  _checkboxListMarginLeft = newValue;
+}
+
+- (UIColor *)checkboxListBoxColor {
+  return _checkboxListBoxColor;
+}
+
+- (void)setCheckboxListBoxColor:(UIColor *)newValue {
+  if (_checkboxListBoxColor != newValue) {
+    _checkboxListBoxColor = newValue;
+    // Invalidate checkbox images because color changed
+    _checkboxCheckedImage = nil;
+    _checkboxUncheckedImage = nil;
+  }
+}
+
+- (UIImage *)checkboxCheckedImage {
+  if (!_checkboxCheckedImage) {
+    _checkboxCheckedImage = [self generateCheckboxImage:YES];
+  }
+  return _checkboxCheckedImage;
+}
+
+- (UIImage *)checkboxUncheckedImage {
+  if (!_checkboxUncheckedImage) {
+    _checkboxUncheckedImage = [self generateCheckboxImage:NO];
+  }
+  return _checkboxUncheckedImage;
+}
+
+- (UIImage *)generateCheckboxImage:(BOOL)isChecked {
+  CGFloat boxSize = self.checkboxListBoxSize;
+  UIColor *boxColor = self.checkboxListBoxColor ?: [UIColor blackColor];
+
+  UIGraphicsBeginImageContextWithOptions(CGSizeMake(boxSize, boxSize), NO, 0.0);
+  CGRect localRect = CGRectMake(0, 0, boxSize, boxSize);
+  CGFloat cornerRadius = boxSize * 0.15f;
+  CGFloat strokeWidth = boxSize * 0.1f;
+  CGRect insetRect =
+      CGRectInset(localRect, strokeWidth / 2.0, strokeWidth / 2.0);
+
+  // Draw Box
+  UIBezierPath *boxPath = [UIBezierPath bezierPathWithRoundedRect:insetRect
+                                                     cornerRadius:cornerRadius];
+  [boxPath setLineWidth:strokeWidth];
+
+  if (isChecked) {
+    [[boxColor colorWithAlphaComponent:1.0] setFill];
+    [boxPath fill];
+    [[boxColor colorWithAlphaComponent:1.0] setStroke];
+    [boxPath stroke];
+
+    // Draw Checkmark
+    UIBezierPath *checkPath = [UIBezierPath bezierPath];
+    CGFloat startX = insetRect.origin.x + insetRect.size.width * 0.25;
+    CGFloat startY = insetRect.origin.y + insetRect.size.height * 0.5;
+    CGFloat midX = insetRect.origin.x + insetRect.size.width * 0.45;
+    CGFloat midY = insetRect.origin.y + insetRect.size.height * 0.65;
+    CGFloat endX = insetRect.origin.x + insetRect.size.width * 0.75;
+    CGFloat endY = insetRect.origin.y + insetRect.size.height * 0.35;
+
+    [checkPath moveToPoint:CGPointMake(startX, startY)];
+    [checkPath addLineToPoint:CGPointMake(midX, midY)];
+    [checkPath addLineToPoint:CGPointMake(endX, endY)];
+
+    [checkPath setLineWidth:strokeWidth * 1.5];
+    [[UIColor whiteColor] setStroke];
+    [checkPath setLineCapStyle:kCGLineCapRound];
+    [checkPath setLineJoinStyle:kCGLineJoinRound];
+    [checkPath stroke];
+  } else {
+    [[boxColor colorWithAlphaComponent:1.0] setStroke];
+    [boxPath stroke];
+  }
+
+  UIImage *result = UIGraphicsGetImageFromCurrentImageContext();
+  UIGraphicsEndImageContext();
+
+  return result;
+}
+
 @end