react-native-enriched-markdown 0.3.0 → 0.4.0-nightly-20260228-6747e87e4

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockStyleContext.kt

@@ -24,35 +24,18 @@ data class BlockStyle(
   val color: Int,
 )
 
-private class MutableBlockStyle {
-  var fontSize: Float = 0f
-  var fontFamily: String = ""
-  var fontWeight: String = ""
-  var color: Int = 0
-  var isDirty: Boolean = false
-
-  fun updateFrom(style: BaseBlockStyle) {
-    fontSize = style.fontSize
-    fontFamily = style.fontFamily
-    fontWeight = style.fontWeight
-    color = style.color
-    isDirty = true
-  }
-
-  fun toImmutable(): BlockStyle = BlockStyle(fontSize, fontFamily, fontWeight, color)
-
-  fun clear() {
-    isDirty = false
-  }
-}
+private data class BlockStyleEntry(
+  val blockType: BlockType,
+  val blockStyle: BlockStyle,
+  val headingLevel: Int,
+)
 
 class BlockStyleContext {
   var currentBlockType = BlockType.NONE
     private set
 
-  private val mutableBlockStyle = MutableBlockStyle()
-  private var cachedBlockStyle: BlockStyle? = null
   private var currentHeadingLevel = 0
+  private val blockStyleStack = ArrayDeque<BlockStyleEntry>()
 
   var blockquoteDepth = 0
   var listDepth = 0
@@ -64,37 +47,58 @@ class BlockStyleContext {
 
   enum class ListType { UNORDERED, ORDERED }
 
-  private fun updateBlockStyle(
+  private fun pushBlockStyle(
     type: BlockType,
     style: BaseBlockStyle,
     headingLevel: Int = 0,
   ) {
+    val entry =
+      BlockStyleEntry(
+        blockType = type,
+        blockStyle = BlockStyle(style.fontSize, style.fontFamily, style.fontWeight, style.color),
+        headingLevel = headingLevel,
+      )
+
+    blockStyleStack.addLast(entry)
     currentBlockType = type
     currentHeadingLevel = headingLevel
-    mutableBlockStyle.updateFrom(style)
-    cachedBlockStyle = null
   }
 
-  fun setParagraphStyle(style: ParagraphStyle) = updateBlockStyle(BlockType.PARAGRAPH, style)
+  fun popBlockStyle() {
+    if (blockStyleStack.isNotEmpty()) {
+      blockStyleStack.removeLast()
+    }
+
+    val parentStyle = blockStyleStack.lastOrNull()
+    if (parentStyle != null) {
+      currentBlockType = parentStyle.blockType
+      currentHeadingLevel = parentStyle.headingLevel
+    } else {
+      currentBlockType = BlockType.NONE
+      currentHeadingLevel = 0
+    }
+  }
+
+  fun setParagraphStyle(style: ParagraphStyle) = pushBlockStyle(BlockType.PARAGRAPH, style)
 
   fun setHeadingStyle(
     style: HeadingStyle,
     level: Int,
-  ) = updateBlockStyle(BlockType.HEADING, style, level)
+  ) = pushBlockStyle(BlockType.HEADING, style, level)
 
-  fun setBlockquoteStyle(style: BlockquoteStyle) = updateBlockStyle(BlockType.BLOCKQUOTE, style)
+  fun setBlockquoteStyle(style: BlockquoteStyle) = pushBlockStyle(BlockType.BLOCKQUOTE, style)
 
   fun setUnorderedListStyle(style: ListStyle) {
     listType = ListType.UNORDERED
-    updateBlockStyle(BlockType.UNORDERED_LIST, style)
+    pushBlockStyle(BlockType.UNORDERED_LIST, style)
   }
 
   fun setOrderedListStyle(style: ListStyle) {
     listType = ListType.ORDERED
-    updateBlockStyle(BlockType.ORDERED_LIST, style)
+    pushBlockStyle(BlockType.ORDERED_LIST, style)
   }
 
-  fun setCodeBlockStyle(style: CodeBlockStyle) = updateBlockStyle(BlockType.CODE_BLOCK, style)
+  fun setCodeBlockStyle(style: CodeBlockStyle) = pushBlockStyle(BlockType.CODE_BLOCK, style)
 
   fun isInsideBlockElement(): Boolean = blockquoteDepth > 0 || listDepth > 0
 
@@ -117,39 +121,26 @@ class BlockStyleContext {
   }
 
   fun clearListStyle() {
+    popBlockStyle()
+
     if (listDepth == 0) {
-      reset()
+      listType = null
+      listItemNumber = 0
+      orderedListItemNumbers.clear()
     }
   }
 
-  private fun reset() {
-    clearBlockStyle()
-    listType = null
-    listItemNumber = 0
-    orderedListItemNumbers.clear()
-  }
-
   fun requireBlockStyle(): BlockStyle {
-    if (!mutableBlockStyle.isDirty) {
-      throw IllegalStateException(
+    val entry = blockStyleStack.lastOrNull()
+    return entry?.blockStyle
+      ?: throw IllegalStateException(
         "BlockStyle is null. Inline renderers must be used within a block context.",
       )
-    }
-
-    return cachedBlockStyle ?: mutableBlockStyle.toImmutable().also { cachedBlockStyle = it }
-  }
-
-  fun clearBlockStyle() {
-    currentBlockType = BlockType.NONE
-    mutableBlockStyle.clear()
-    cachedBlockStyle = null
-    currentHeadingLevel = 0
   }
 
   fun resetForNewRender() {
+    blockStyleStack.clear()
     currentBlockType = BlockType.NONE
-    mutableBlockStyle.clear()
-    cachedBlockStyle = null
     currentHeadingLevel = 0
     blockquoteDepth = 0
     listDepth = 0

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/BlockquoteRenderer.kt

@@ -30,7 +30,7 @@ class BlockquoteRenderer(
     try {
       factory.renderChildren(node, builder, onLinkPress, onLinkLongPress)
     } finally {
-      context.clearBlockStyle()
+      context.popBlockStyle()
       context.blockquoteDepth = depth
     }
 

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/CodeBlockRenderer.kt

@@ -34,7 +34,7 @@ class CodeBlockRenderer(
     try {
       factory.renderChildren(node, builder, onLinkPress, onLinkLongPress)
     } finally {
-      context.clearBlockStyle()
+      context.popBlockStyle()
     }
 
     if (builder.length == contentStart) return

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/HeadingRenderer.kt

@@ -23,12 +23,13 @@ class HeadingRenderer(
     val start = builder.length
 
     val headingStyle = config.style.headingStyles[level]!!
-    factory.blockStyleContext.setHeadingStyle(headingStyle, level)
+    val blockStyleContext = factory.blockStyleContext
+    blockStyleContext.setHeadingStyle(headingStyle, level)
 
     try {
       factory.renderChildren(node, builder, onLinkPress, onLinkLongPress)
     } finally {
-      factory.blockStyleContext.clearBlockStyle()
+      blockStyleContext.popBlockStyle()
     }
 
     val end = builder.length

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListContextManager.kt

@@ -1,7 +1,6 @@
 package com.swmansion.enriched.markdown.renderer
 
 import com.swmansion.enriched.markdown.styles.ListStyle
-import com.swmansion.enriched.markdown.styles.StyleConfig
 
 /**
  * Manages list context transitions (entering/exiting lists, handling nesting, etc.).
@@ -16,7 +15,6 @@ import com.swmansion.enriched.markdown.styles.StyleConfig
  */
 class ListContextManager(
   private val context: BlockStyleContext,
-  private val styleConfig: StyleConfig,
 ) {
   /**
    * Captures the state when entering a list, needed for proper restoration when exiting.
@@ -37,7 +35,7 @@ class ListContextManager(
    */
   fun enterList(
     listType: BlockStyleContext.ListType,
-    style: Any,
+    style: ListStyle,
   ): ListEntryState {
     val previousDepth = context.listDepth
     val isNested = previousDepth > 0
@@ -53,11 +51,11 @@ class ListContextManager(
     context.listDepth = previousDepth + 1
     when (listType) {
       BlockStyleContext.ListType.ORDERED -> {
-        context.setOrderedListStyle(style as ListStyle)
+        context.setOrderedListStyle(style)
       }
 
       BlockStyleContext.ListType.UNORDERED -> {
-        context.setUnorderedListStyle(style as ListStyle)
+        context.setUnorderedListStyle(style)
       }
     }
     context.resetListItemNumber()
@@ -71,35 +69,21 @@ class ListContextManager(
 
   /**
    * Exits a list context. Handles:
-   * - Clearing list style (only if top-level, depth == 0)
+   * - Popping current list block style from stack
    * - Decrementing list depth back to previousDepth
    * - Restoring parent list item numbers from stack (if applicable)
-   * - Restoring parent list context (if nested) so subsequent parent items render correctly
+   * - Restoring parent list metadata (if nested) so subsequent parent items render correctly
    */
   fun exitList(entryState: ListEntryState) {
-    context.clearListStyle()
     context.listDepth = entryState.previousDepth
+    context.clearListStyle()
 
     if (entryState.wasNestedInOrderedList) {
       context.popOrderedListItemNumber()
     }
 
     if (entryState.previousDepth > 0) {
-      restoreParentListContext(entryState.parentListType)
-    }
-  }
-
-  private fun restoreParentListContext(parentListType: BlockStyleContext.ListType?) {
-    when (parentListType) {
-      BlockStyleContext.ListType.UNORDERED -> {
-        context.setUnorderedListStyle(styleConfig.listStyle)
-      }
-
-      BlockStyleContext.ListType.ORDERED -> {
-        context.setOrderedListStyle(styleConfig.listStyle)
-      }
-
-      null -> {}
+      context.listType = entryState.parentListType
     }
   }
 }

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/ListRenderer.kt

@@ -22,7 +22,7 @@ class ListRenderer(
     val listStyle = config.style.listStyle
     val listType = if (isOrdered) BlockStyleContext.ListType.ORDERED else BlockStyleContext.ListType.UNORDERED
 
-    val contextManager = ListContextManager(factory.blockStyleContext, config.style)
+    val contextManager = ListContextManager(factory.blockStyleContext)
     val entryState = contextManager.enterList(listType, listStyle)
 
     // For top-level lists, insert marginTop spacer before rendering content

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/ParagraphRenderer.kt

@@ -36,7 +36,7 @@ class ParagraphRenderer(
     try {
       factory.renderChildren(node, builder, onLinkPress, onLinkLongPress)
     } finally {
-      context.clearBlockStyle()
+      context.popBlockStyle()
     }
 
     if (builder.length > start) {

package/ios/EnrichedMarkdownText.mm

@@ -2,9 +2,9 @@
 #import "AccessibilityInfo.h"
 #import "AttributedRenderer.h"
 #import "CodeBlockBackground.h"
+#import "ENRMImageAttachment.h"
 #import "ENRMMarkdownParser.h"
 #import "EditMenuUtils.h"
-#import "EnrichedMarkdownImageAttachment.h"
 #import "FontScaleObserver.h"
 #import "FontUtils.h"
 #import "LastElementUtils.h"

package/ios/attachments/{EnrichedMarkdownImageAttachment.h → ENRMImageAttachment.h}

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Images are loaded asynchronously and scaled dynamically based on text container width.
  * Supports inline and block images with custom height and border radius from config.
  */
-@interface EnrichedMarkdownImageAttachment : NSTextAttachment
+@interface ENRMImageAttachment : NSTextAttachment
 
 @property (nonatomic, readonly) NSString *imageURL;
 @property (nonatomic, readonly) BOOL isInline;

package/ios/attachments/ENRMImageAttachment.m

@@ -0,0 +1,271 @@
+#import "ENRMImageAttachment.h"
+#import "RuntimeKeys.h"
+#import "StyleConfig.h"
+#import <React/RCTLog.h>
+#import <objc/runtime.h>
+
+@interface ENRMImageAttachment ()
+
+@property (nonatomic, readwrite) NSString *imageURL;
+@property (nonatomic, weak) StyleConfig *styleConfiguration;
+@property (nonatomic, assign) BOOL isInline;
+@property (nonatomic, assign) CGFloat cachedHeight;
+@property (nonatomic, assign) CGFloat cachedBorderRadius;
+@property (nonatomic, weak) NSTextContainer *textContainer;
+@property (nonatomic, weak) UITextView *textView;
+@property (nonatomic, strong) UIImage *originalImage;
+@property (nonatomic, strong) UIImage *loadedImage;
+@property (nonatomic, strong) NSURLSessionDataTask *loadingTask;
+
+@end
+
+@implementation ENRMImageAttachment
+
+- (instancetype)initWithImageURL:(NSString *)imageURL config:(StyleConfig *)config isInline:(BOOL)isInline
+{
+  self = [super init];
+  if (self) {
+    _imageURL = imageURL;
+    _styleConfiguration = config;
+    _isInline = isInline;
+
+    _cachedHeight = isInline ? [config inlineImageSize] : [config imageHeight];
+    _cachedBorderRadius = [config imageBorderRadius];
+
+    [self setupPlaceholder];
+    [self startDownloadingImage];
+  }
+  return self;
+}
+
+- (CGRect)attachmentBoundsForTextContainer:(NSTextContainer *)textContainer
+                      proposedLineFragment:(CGRect)lineFragment
+                             glyphPosition:(CGPoint)position
+                            characterIndex:(NSUInteger)characterIndex
+{
+  CGFloat height = self.cachedHeight;
+  CGFloat width = self.isInline ? height : (lineFragment.size.width > 0 ? lineFragment.size.width : height);
+
+  if (self.isInline) {
+    UIFont *appliedFont = nil;
+    NSLayoutManager *layoutManager = textContainer.layoutManager;
+    NSTextStorage *textStorage = layoutManager.textStorage;
+
+    if (textStorage && characterIndex < textStorage.length) {
+      appliedFont = [textStorage attribute:NSFontAttributeName atIndex:characterIndex effectiveRange:NULL];
+    }
+
+    // Determine the vertical alignment:
+    // Center against the font's Capital Height if available,
+    // otherwise center within the line fragment.
+    CGFloat verticalOffset;
+    if (appliedFont) {
+      verticalOffset = (appliedFont.capHeight - height) / 2.0;
+    } else {
+      verticalOffset = (lineFragment.size.height - height) / 2.0;
+    }
+
+    return CGRectMake(0, verticalOffset, width, height);
+  }
+
+  return CGRectMake(0, 0, width, height);
+}
+
+- (UIImage *)imageForBounds:(CGRect)imageBounds
+              textContainer:(NSTextContainer *)textContainer
+             characterIndex:(NSUInteger)characterIndex
+{
+  self.textContainer = textContainer;
+
+  if (self.originalImage && imageBounds.size.width > 0) {
+    CGFloat currentWidth = imageBounds.size.width;
+
+    BOOL isFirstLoad = (self.loadedImage == nil);
+    BOOL hasWidthChanged = !self.isInline && self.loadedImage && fabs(self.loadedImage.size.width - currentWidth) > 1.0;
+
+    if (isFirstLoad || hasWidthChanged) {
+      self.bounds = imageBounds;
+      [self processAndApplyImage:self.originalImage withTargetWidth:currentWidth];
+    }
+  }
+
+  return self.loadedImage ?: self.image;
+}
+
+- (void)handleLoadedImage:(UIImage *)image
+{
+  if (!image) {
+    return;
+  }
+
+  self.originalImage = image;
+  CGFloat targetWidth = self.isInline ? self.cachedHeight : self.bounds.size.width;
+
+  // If bounds width isn't known yet (image loaded before layout), defer scaling
+  // until imageForBounds: provides the real width via the text system.
+  if (!self.isInline && targetWidth <= self.cachedHeight) {
+    return;
+  }
+
+  [self processAndApplyImage:image withTargetWidth:targetWidth];
+}
+
+- (void)processAndApplyImage:(UIImage *)image withTargetWidth:(CGFloat)targetWidth
+{
+  if (targetWidth <= 0) {
+    return;
+  }
+
+  __weak typeof(self) weakSelf = self;
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    __strong typeof(weakSelf) strongSelf = weakSelf;
+    if (!strongSelf)
+      return;
+
+    UIImage *processedImage = [strongSelf createScaledImage:image
+                                                    toWidth:targetWidth
+                                                     height:strongSelf.cachedHeight
+                                               borderRadius:strongSelf.cachedBorderRadius];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+      strongSelf.loadedImage = processedImage;
+
+      if (strongSelf.isInline) {
+        strongSelf.image = processedImage;
+        strongSelf.bounds = CGRectMake(0, 0, strongSelf.cachedHeight, strongSelf.cachedHeight);
+      } else {
+        strongSelf.image = image;
+      }
+
+      [strongSelf refreshDisplay];
+    });
+  });
+}
+
+- (UIImage *)createScaledImage:(UIImage *)image
+                       toWidth:(CGFloat)targetWidth
+                        height:(CGFloat)targetHeight
+                  borderRadius:(CGFloat)radius
+{
+  CGFloat sourceWidth = image.size.width;
+  CGFloat sourceHeight = image.size.height;
+
+  CGFloat drawingWidth, drawingHeight;
+
+  if (!self.isInline && sourceWidth > 0 && sourceHeight > 0) {
+    CGFloat aspectRatioScale = targetWidth / sourceWidth;
+    drawingWidth = targetWidth;
+    drawingHeight = sourceHeight * aspectRatioScale;
+  } else {
+    drawingWidth = targetWidth;
+    drawingHeight = targetHeight;
+  }
+
+  CGFloat xOffset = (targetWidth - drawingWidth) / 2.0;
+  CGFloat yOffset = (targetHeight - drawingHeight) / 2.0;
+  CGRect drawingRect = CGRectMake(xOffset, yOffset, drawingWidth, drawingHeight);
+
+  UIGraphicsImageRenderer *renderer =
+      [[UIGraphicsImageRenderer alloc] initWithSize:CGSizeMake(targetWidth, targetHeight)];
+
+  return [renderer imageWithActions:^(UIGraphicsImageRendererContext *context) {
+    if (radius > 0) {
+      CGRect clippingRect = CGRectIntersection(CGRectMake(0, 0, targetWidth, targetHeight), drawingRect);
+      UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:clippingRect cornerRadius:radius];
+      [path addClip];
+    }
+    [image drawInRect:drawingRect];
+  }];
+}
+
+- (void)refreshDisplay
+{
+  UITextView *textView = [self fetchAssociatedTextView];
+  if (!textView) {
+    return;
+  }
+
+  NSRange attachmentRange = [self findAttachmentRangeInText:textView.attributedText];
+  if (attachmentRange.location == NSNotFound) {
+    return;
+  }
+
+  [textView.layoutManager invalidateDisplayForCharacterRange:attachmentRange];
+  if (!self.isInline) {
+    [textView.layoutManager invalidateLayoutForCharacterRange:attachmentRange actualCharacterRange:NULL];
+  }
+}
+
+- (UITextView *)fetchAssociatedTextView
+{
+  if (self.textView) {
+    return self.textView;
+  }
+
+  if (!self.textContainer) {
+    return nil;
+  }
+
+  // Look up the text view via the associated object key stored on the container
+  self.textView = objc_getAssociatedObject(self.textContainer, kTextViewKey);
+  return self.textView;
+}
+
+- (void)setupPlaceholder
+{
+  CGFloat size = self.cachedHeight;
+  self.bounds = CGRectMake(0, 0, size, size);
+
+  UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize:CGSizeMake(size, size)];
+  self.image = [renderer imageWithActions:^(UIGraphicsImageRendererContext *context){
+      // Generates an empty transparent placeholder
+  }];
+}
+
+- (void)startDownloadingImage
+{
+  if (self.imageURL.length == 0) {
+    return;
+  }
+
+  NSURL *url = [NSURL URLWithString:self.imageURL];
+  if (!url) {
+    return;
+  }
+
+  __weak typeof(self) weakSelf = self;
+  self.loadingTask = [[NSURLSession sharedSession]
+        dataTaskWithURL:url
+      completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+        if (data && !error) {
+          UIImage *downloadedImage = [UIImage imageWithData:data];
+          dispatch_async(dispatch_get_main_queue(), ^{ [weakSelf handleLoadedImage:downloadedImage]; });
+        }
+      }];
+
+  [self.loadingTask resume];
+}
+
+- (NSRange)findAttachmentRangeInText:(NSAttributedString *)attributedString
+{
+  __block NSRange foundRange = NSMakeRange(NSNotFound, 0);
+
+  [attributedString enumerateAttribute:NSAttachmentAttributeName
+                               inRange:NSMakeRange(0, attributedString.length)
+                               options:0
+                            usingBlock:^(id value, NSRange range, BOOL *stop) {
+                              if (value == self) {
+                                foundRange = range;
+                                *stop = YES;
+                              }
+                            }];
+
+  return foundRange;
+}
+
+- (void)dealloc
+{
+  [_loadingTask cancel];
+}
+
+@end

package/ios/renderer/{ImageRenderer.h → ENRMImageRenderer.h}

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ImageRenderer : NSObject <NodeRenderer>
+@interface ENRMImageRenderer : NSObject <NodeRenderer>
 
 - (instancetype)initWithRendererFactory:(id)rendererFactory config:(id)config;
 

package/ios/renderer/{ImageRenderer.m → ENRMImageRenderer.m}

@@ -1,5 +1,5 @@
-#import "ImageRenderer.h"
-#import "EnrichedMarkdownImageAttachment.h"
+#import "ENRMImageRenderer.h"
+#import "ENRMImageAttachment.h"
 #import "MarkdownASTNode.h"
 #import "RenderContext.h"
 #import "RendererFactory.h"
@@ -8,7 +8,7 @@
 static const unichar kLineBreak = '\n';
 static const unichar kZeroWidthSpace = 0x200B;
 
-@implementation ImageRenderer {
+@implementation ENRMImageRenderer {
   RendererFactory *_rendererFactory;
   StyleConfig *_config;
 }
@@ -22,8 +22,6 @@ static const unichar kZeroWidthSpace = 0x200B;
   return self;
 }
 
-#pragma mark - Rendering
-
 - (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
 {
   NSString *imageURL = node.attributes[@"url"];
@@ -32,9 +30,9 @@ static const unichar kZeroWidthSpace = 0x200B;
   }
 
   BOOL isInline = [self isInlineImageInOutput:output];
-  EnrichedMarkdownImageAttachment *attachment = [[EnrichedMarkdownImageAttachment alloc] initWithImageURL:imageURL
-                                                                                                   config:_config
-                                                                                                 isInline:isInline];
+  ENRMImageAttachment *attachment = [[ENRMImageAttachment alloc] initWithImageURL:imageURL
+                                                                           config:_config
+                                                                         isInline:isInline];
 
   NSUInteger startIndex = output.length;
 
@@ -47,8 +45,6 @@ static const unichar kZeroWidthSpace = 0x200B;
   [context registerImageRange:imageRange altText:altText url:imageURL];
 }
 
-#pragma mark - Private Helpers
-
 - (NSString *)extractTextFromNode:(MarkdownASTNode *)node
 {
   if (!node)

package/ios/renderer/RendererFactory.m

@@ -2,9 +2,9 @@
 #import "BlockquoteRenderer.h"
 #import "CodeBlockRenderer.h"
 #import "CodeRenderer.h"
+#import "ENRMImageRenderer.h"
 #import "EmphasisRenderer.h"
 #import "HeadingRenderer.h"
-#import "ImageRenderer.h"
 #import "LinkRenderer.h"
 #import "ListItemRenderer.h"
 #import "ListRenderer.h"
@@ -80,7 +80,7 @@
     case MarkdownNodeTypeCode:
       return [[CodeRenderer alloc] initWithRendererFactory:self config:_config];
     case MarkdownNodeTypeImage:
-      return [[ImageRenderer alloc] initWithRendererFactory:self config:_config];
+      return [[ENRMImageRenderer alloc] initWithRendererFactory:self config:_config];
     case MarkdownNodeTypeBlockquote:
       return [[BlockquoteRenderer alloc] initWithRendererFactory:self config:_config];
     case MarkdownNodeTypeListItem:

package/ios/utils/HTMLGenerator.m

@@ -1,7 +1,7 @@
 #import "HTMLGenerator.h"
 #import "BlockquoteBorder.h"
 #import "CodeBackground.h"
-#import "EnrichedMarkdownImageAttachment.h"
+#import "ENRMImageAttachment.h"
 #import "LastElementUtils.h"
 #import "ListItemRenderer.h"
 #import "ParagraphStyleUtils.h"
@@ -456,8 +456,8 @@ static void generateInlineHTML(NSMutableString *html, NSAttributedString *attrib
 
                         if ([text containsString:kObjectReplacementChar]) {
                           id attachment = attrs[NSAttachmentAttributeName];
-                          if ([attachment isKindOfClass:[EnrichedMarkdownImageAttachment class]]) {
-                            EnrichedMarkdownImageAttachment *img = (EnrichedMarkdownImageAttachment *)attachment;
+                          if ([attachment isKindOfClass:[ENRMImageAttachment class]]) {
+                            ENRMImageAttachment *img = (ENRMImageAttachment *)attachment;
                             if (img.imageURL) {
                               if (img.isInline) {
                                 [html appendFormat:

package/ios/utils/MarkdownExtractor.m

@@ -1,6 +1,6 @@
 #import "MarkdownExtractor.h"
 #import "BlockquoteBorder.h"
-#import "EnrichedMarkdownImageAttachment.h"
+#import "ENRMImageAttachment.h"
 #import "LastElementUtils.h"
 #import "ListItemRenderer.h"
 #import "RuntimeKeys.h"
@@ -136,8 +136,8 @@ NSString *_Nullable extractMarkdownFromAttributedString(NSAttributedString *attr
 
                         // Images and Thematic Breaks
                         NSTextAttachment *attachment = attrs[NSAttachmentAttributeName];
-                        if ([attachment isKindOfClass:[EnrichedMarkdownImageAttachment class]]) {
-                          EnrichedMarkdownImageAttachment *img = (EnrichedMarkdownImageAttachment *)attachment;
+                        if ([attachment isKindOfClass:[ENRMImageAttachment class]]) {
+                          ENRMImageAttachment *img = (ENRMImageAttachment *)attachment;
                           if (!img.imageURL)
                             return;
 

package/ios/utils/PasteboardUtils.h

@@ -25,7 +25,7 @@ NSString *_Nullable markdownForRange(NSAttributedString *attributedText, NSRange
                                      NSString *_Nullable cachedMarkdown);
 
 /**
- * Returns remote image URLs (http/https only) from EnrichedMarkdownImageAttachments in the given range.
+ * Returns remote image URLs (http/https only) from ENRMImageAttachments in the given range.
  */
 NSArray<NSString *> *imageURLsInRange(NSAttributedString *attributedText, NSRange range);
 

package/ios/utils/PasteboardUtils.m

@@ -1,5 +1,5 @@
 #import "PasteboardUtils.h"
-#import "EnrichedMarkdownImageAttachment.h"
+#import "ENRMImageAttachment.h"
 #import "HTMLGenerator.h"
 #import "MarkdownExtractor.h"
 #import "RTFExportUtils.h"
@@ -121,10 +121,10 @@ NSArray<NSString *> *imageURLsInRange(NSAttributedString *attributedText, NSRang
                              inRange:range
                              options:0
                           usingBlock:^(id value, NSRange r, BOOL *stop) {
-                            if (![value isKindOfClass:[EnrichedMarkdownImageAttachment class]])
+                            if (![value isKindOfClass:[ENRMImageAttachment class]])
                               return;
 
-                            NSString *url = ((EnrichedMarkdownImageAttachment *)value).imageURL;
+                            NSString *url = ((ENRMImageAttachment *)value).imageURL;
                             if ([url hasPrefix:@"http://"] || [url hasPrefix:@"https://"]) {
                               [urls addObject:url];
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-enriched-markdown",
-  "version": "0.3.0",
+  "version": "0.4.0-nightly-20260228-6747e87e4",
   "description": "Markdown Text component for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/ios/attachments/EnrichedMarkdownImageAttachment.m

@@ -1,185 +0,0 @@
-#import "EnrichedMarkdownImageAttachment.h"
-#import "RuntimeKeys.h"
-#import "StyleConfig.h"
-#import <React/RCTLog.h>
-#import <objc/runtime.h>
-
-@interface EnrichedMarkdownImageAttachment ()
-@property (nonatomic, readwrite) NSString *imageURL;
-@property (nonatomic, weak) StyleConfig *config;
-@property (nonatomic, assign) BOOL isInline;
-@property (nonatomic, assign) CGFloat cachedHeight;
-@property (nonatomic, assign) CGFloat cachedBorderRadius;
-@property (nonatomic, weak) NSTextContainer *textContainer;
-@property (nonatomic, weak) UITextView *textView;
-@property (nonatomic, strong) UIImage *originalImage;
-@property (nonatomic, strong) UIImage *loadedImage;
-@property (nonatomic, strong) NSURLSessionDataTask *loadingTask;
-@end
-
-@implementation EnrichedMarkdownImageAttachment
-
-- (instancetype)initWithImageURL:(NSString *)imageURL config:(StyleConfig *)config isInline:(BOOL)isInline
-{
-  if (self = [super init]) {
-    _imageURL = imageURL;
-    _config = config;
-    _isInline = isInline;
-    _cachedHeight = isInline ? [config inlineImageSize] : [config imageHeight];
-    _cachedBorderRadius = [config imageBorderRadius];
-
-    [self setupPlaceholder];
-    [self loadImage];
-  }
-  return self;
-}
-
-- (CGRect)attachmentBoundsForTextContainer:(NSTextContainer *)textContainer
-                      proposedLineFragment:(CGRect)lineFrag
-                             glyphPosition:(CGPoint)position
-                            characterIndex:(NSUInteger)charIndex
-{
-  CGFloat height = self.cachedHeight;
-  CGFloat width = self.isInline ? height : (lineFrag.size.width > 0 ? lineFrag.size.width : height);
-  return CGRectMake(0, 0, width, height);
-}
-
-- (UIImage *)imageForBounds:(CGRect)imageBounds
-              textContainer:(NSTextContainer *)textContainer
-             characterIndex:(NSUInteger)charIndex
-{
-  self.textContainer = textContainer;
-
-  // If width is now known but we haven't scaled yet, trigger it
-  if (self.originalImage && !self.loadedImage && imageBounds.size.width > 0) {
-    self.bounds = imageBounds;
-    [self handleLoadedImage:self.originalImage];
-  }
-
-  return self.loadedImage ?: self.image;
-}
-
-- (void)handleLoadedImage:(UIImage *)image
-{
-  if (!image)
-    return;
-  self.originalImage = image;
-
-  __weak typeof(self) weakSelf = self;
-  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    __strong typeof(weakSelf) strongSelf = weakSelf;
-    if (!strongSelf)
-      return;
-
-    CGFloat targetWidth = strongSelf.isInline ? strongSelf.cachedHeight : strongSelf.bounds.size.width;
-    if (targetWidth <= 0)
-      return;
-
-    UIImage *scaled = [strongSelf scaleImage:image
-                                     toWidth:targetWidth
-                                      height:strongSelf.cachedHeight
-                                borderRadius:strongSelf.cachedBorderRadius];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-      strongSelf.loadedImage = scaled;
-
-      if (strongSelf.isInline) {
-        // Use scaled image for RTF export (RTF uses self.image dimensions)
-        strongSelf.image = scaled;
-        strongSelf.bounds = CGRectMake(0, 0, strongSelf.cachedHeight, strongSelf.cachedHeight);
-      } else {
-        // Use original for "Save to Camera Roll" (no baked-in rounded corners)
-        strongSelf.image = image;
-      }
-
-      [strongSelf updateUI];
-    });
-  });
-}
-
-- (void)updateUI
-{
-  UITextView *textView = [self getTextView];
-  if (!textView)
-    return;
-
-  NSRange range = [self findAttachmentRangeInText:textView.attributedText];
-  if (range.location == NSNotFound)
-    return;
-
-  [textView.layoutManager invalidateDisplayForCharacterRange:range];
-  if (!self.isInline) {
-    [textView.layoutManager invalidateLayoutForCharacterRange:range actualCharacterRange:NULL];
-  }
-}
-
-- (UITextView *)getTextView
-{
-  if (self.textView)
-    return self.textView;
-  if (!self.textContainer)
-    return nil;
-  self.textView = objc_getAssociatedObject(self.textContainer, kTextViewKey);
-  return self.textView;
-}
-
-- (void)setupPlaceholder
-{
-  CGFloat size = self.cachedHeight;
-  self.bounds = CGRectMake(0, 0, size, size);
-  UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize:CGSizeMake(size, size)];
-  self.image = [renderer imageWithActions:^(UIGraphicsImageRendererContext *ctx){}];
-}
-
-- (void)loadImage
-{
-  if (self.imageURL.length == 0)
-    return;
-  NSURL *url = [NSURL URLWithString:self.imageURL];
-  if (!url)
-    return;
-
-  __weak typeof(self) weakSelf = self;
-  self.loadingTask =
-      [[NSURLSession sharedSession] dataTaskWithURL:url
-                                  completionHandler:^(NSData *data, NSURLResponse *res, NSError *err) {
-                                    if (data) {
-                                      UIImage *img = [UIImage imageWithData:data];
-                                      dispatch_async(dispatch_get_main_queue(), ^{ [weakSelf handleLoadedImage:img]; });
-                                    }
-                                  }];
-  [self.loadingTask resume];
-}
-
-- (UIImage *)scaleImage:(UIImage *)image toWidth:(CGFloat)w height:(CGFloat)h borderRadius:(CGFloat)r
-{
-  UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize:CGSizeMake(w, h)];
-  return [renderer imageWithActions:^(UIGraphicsImageRendererContext *ctx) {
-    if (r > 0) {
-      [[UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, w, h) cornerRadius:r] addClip];
-    }
-    [image drawInRect:CGRectMake(0, 0, w, h)];
-  }];
-}
-
-- (NSRange)findAttachmentRangeInText:(NSAttributedString *)text
-{
-  __block NSRange found = NSMakeRange(NSNotFound, 0);
-  [text enumerateAttribute:NSAttachmentAttributeName
-                   inRange:NSMakeRange(0, text.length)
-                   options:0
-                usingBlock:^(id val, NSRange range, BOOL *stop) {
-                  if (val == self) {
-                    found = range;
-                    *stop = YES;
-                  }
-                }];
-  return found;
-}
-
-- (void)dealloc
-{
-  [_loadingTask cancel];
-}
-
-@end