fix: use NSTextAttachment

Author: kacperzolkiewski

ios/styles/ImageStyle.mm

@@ -107,7 +107,7 @@ - (void)addImage:(NSString *)uri {
   data.uri = uri;
 
   NSMutableDictionary *attributes = [@{
-    NSAttachmentAttributeName: [self prepareSpacerAttachement],
+    NSAttachmentAttributeName: [self prepareImageAttachement:uri],
     ImageAttributeName: data,
   } mutableCopy];
 
@@ -129,21 +129,17 @@ - (void)addImage:(NSString *)uri {
   [_input->textView.textStorage endEditing];
 }
 
--(NSTextAttachment *)prepareSpacerAttachement
+-(NSTextAttachment *)prepareImageAttachement:(NSString *)uri
 {
-  NSTextAttachment *spacerAttachment = [[NSTextAttachment alloc] init];
-  spacerAttachment.bounds = CGRectMake(0, 0, [_input->config imageWidth], [_input->config imageHeight]);
-  spacerAttachment.image = [self prepareTransparentImage];
+  NSURL *url = [NSURL URLWithString:uri];
+  NSData *imgData = [NSData dataWithContentsOfURL:url];
+  UIImage *image = [UIImage imageWithData:imgData];
 
-  return spacerAttachment;
-}
+  NSTextAttachment *attachment = [[NSTextAttachment alloc] init];
+  attachment.image = image;
+  attachment.bounds = CGRectMake(0, 0, [_input->config imageWidth], [_input->config imageHeight]);
 
-// Helper to create a 1x1 transparent image
-- (UIImage *)prepareTransparentImage {
-    UIGraphicsBeginImageContextWithOptions(CGSizeMake(1, 1), NO, 0.0);
-    UIImage *blank = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    return blank;
+  return attachment;
 }
 
 @end

ios/utils/LayoutManagerExtension.mm

@@ -3,7 +3,6 @@
 #import "EnrichedTextInputView.h"
 #import "StyleHeaders.h"
 #import "ParagraphsUtils.h"
-#import "ImageData.h"
 
 @implementation NSLayoutManager (LayoutManagerExtension)
 
@@ -58,8 +57,6 @@ - (void)my_drawBackgroundForGlyphRange:(NSRange)glyphRange atPoint:(CGPoint)orig
 
   NSRange inputRange = NSMakeRange(0, typedInput->textView.textStorage.length);
 
-  [self drawImages:typedInput origin:origin inputRange:inputRange];
-  
   // 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];
 
@@ -135,48 +132,6 @@ - (void)my_drawBackgroundForGlyphRange:(NSRange)glyphRange atPoint:(CGPoint)orig
   }
 }
 
--(void)drawImages:(EnrichedTextInputView *)typedInput origin:(CGPoint)origin inputRange:(NSRange)inputRange
-{
-  ImageStyle *imgStyle = typedInput->stylesDict[@([ImageStyle getStyleType])];
-  
-  if (imgStyle == nullptr) { return; }
-    NSArray *allImages = [imgStyle findAllOccurences:inputRange];
-      
-    for (StylePair *pair in allImages) {
-      ImageData *imageData = (ImageData *)pair.styleValue;
-      NSRange imageCharRange = [pair.rangeValue rangeValue];
-      
-      // Convert Character Range to Glyph Range
-      NSRange imageGlyphRange = [self glyphRangeForCharacterRange:imageCharRange actualCharacterRange:NULL];
-      
-      // Get the Text Container (needed for rect calculation)
-      NSTextContainer *textContainer = [self textContainerForGlyphAtIndex:imageGlyphRange.location effectiveRange:NULL];
-      
-      // boundingRectForGlyphRange gives us the calculated space for the \uFFFC character
-      CGRect imageRect = [self boundingRectForGlyphRange:imageGlyphRange inTextContainer:textContainer];
-      
-      imageRect.origin.x += origin.x;
-      imageRect.origin.y += origin.y;
-      imageRect.size.width = [typedInput->config imageWidth];
-      imageRect.size.height = [typedInput->config imageHeight];
-            
-      UIImage *imageToDraw = nil;
-      
-      if (imageData.uri) {
-        NSURL *url = [NSURL URLWithString:imageData.uri];
-        imageToDraw = [UIImage imageWithContentsOfFile:url.path];
-      }
-      
-      if (imageToDraw) {
-        [imageToDraw drawInRect:imageRect];
-      } else {
-        // Draw a placeholder box if image failed to load
-        [[UIColor lightGrayColor] setFill];
-        UIRectFill(imageRect);
-      }
-    }
-}
-
 - (NSString *)markerForList:(NSTextList *)list charIndex:(NSUInteger)index input:(EnrichedTextInputView *)input {
   if(list.markerFormat == NSTextListMarkerDecimal) {
     NSString *fullText = input->textView.textStorage.string;