react-native-enriched-markdown-scaffold 0.7.4-scaffold.9 → 1.0.2-scaffold.10

package/ios/utils/EditMenuUtils.m

@@ -1,4 +1,5 @@
 #import "EditMenuUtils.h"
+#import "ENRMLinkChip.h"
 #import "PasteboardUtils.h"
 #import "StyleConfig.h"
 #include <TargetConditionals.h>
@@ -10,14 +11,34 @@ static NSString *const kActionIdentifierCopy = @"com.swmansion.enriched.markdown
 static NSString *const kActionIdentifierCopyMarkdown = @"com.swmansion.enriched.markdown.copyMarkdown";
 static NSString *const kActionIdentifierCopyImageURL = @"com.swmansion.enriched.markdown.copyImageURL";
 
-static UIAction *createCopyAction(NSAttributedString *selectedText, NSString *markdown, StyleConfig *styleConfig,
-                                  NSString *copyLabel)
+static UIAction *_Nullable createCopyAction(NSAttributedString *selectedText, NSString *markdown, BOOL fullSelection,
+                                            StyleConfig *styleConfig, ENRMSelectionMenuConfig selectionMenuConfig,
+                                            ENRMCopyRequestHandler _Nullable onCopyRequest)
 {
-  return [UIAction actionWithTitle:copyLabel
+  if (!selectionMenuConfig.copyEnabled)
+    return nil;
+
+  if (selectionMenuConfig.interceptCopy && onCopyRequest) {
+    NSString *text = selectedText.string;
+    NSString *copied = markdown.length > 0 ? markdown : text;
+    return [UIAction actionWithTitle:selectionMenuConfig.copyLabel
+                               image:[RCTUIImage systemImageNamed:@"doc.on.doc"]
+                          identifier:kActionIdentifierCopy
+                             handler:^(__kindof UIAction *action) { onCopyRequest(copied, text, fullSelection); }];
+  }
+
+  BOOL writesMarkdown = selectionMenuConfig.copyFormatMarkdown;
+  return [UIAction actionWithTitle:selectionMenuConfig.copyLabel
                              image:[RCTUIImage systemImageNamed:@"doc.on.doc"]
                         identifier:kActionIdentifierCopy
                            handler:^(__kindof UIAction *action) {
-                             copyAttributedStringToPasteboard(selectedText, markdown, styleConfig);
+                             if (!writesMarkdown) {
+                               copyAttributedStringToPasteboard(selectedText, markdown, styleConfig);
+                             } else {
+                               // Plain text only: with HTML/RTF alongside, rich-paste targets
+                               // would take those and drop the Markdown.
+                               copyStringToPasteboard(markdown.length > 0 ? markdown : selectedText.string);
+                             }
                            }];
 }
 
@@ -47,13 +68,37 @@ static UIAction *_Nullable createCopyImageURLAction(NSArray<NSString *> *imageUR
                            handler:^(__kindof UIAction *action) { copyStringToPasteboard(urlsToCopy); }];
 }
 
-static UIMenu *createEnhancedStandardEditMenu(UIMenu *originalMenu, UIAction *copyAction)
+/// Rebuilds the standard-edit menu with the system Copy swapped for the enhanced
+/// copy action, or dropped when `copyAction` is nil (Copy disabled). All other
+/// system items are kept — dropping them would remove Select All, which on
+/// iOS 16+ is the only way to start a selection from the long-press menu of a
+/// non-editable text view.
+static UIMenu *createEnhancedStandardEditMenu(UIMenu *originalMenu, UIAction *_Nullable copyAction)
 {
+  NSMutableArray<UIMenuElement *> *children = [NSMutableArray arrayWithCapacity:originalMenu.children.count];
+  BOOL replacedCopy = NO;
+
+  for (UIMenuElement *element in originalMenu.children) {
+    if (!replacedCopy && [element isKindOfClass:[UICommand class]] &&
+        ((UICommand *)element).action == @selector(copy:)) {
+      if (copyAction) {
+        [children addObject:copyAction];
+      }
+      replacedCopy = YES;
+      continue;
+    }
+    [children addObject:element];
+  }
+
+  if (!replacedCopy && copyAction) {
+    [children insertObject:copyAction atIndex:0];
+  }
+
   return [UIMenu menuWithTitle:originalMenu.title
                          image:originalMenu.image
                     identifier:originalMenu.identifier
                        options:originalMenu.options
-                      children:@[ copyAction ]];
+                      children:children];
 }
 
 static void addOptionalAction(NSMutableArray<UIMenuElement *> *array, UIAction *_Nullable action)
@@ -74,13 +119,19 @@ static void insertOptionalAction(NSMutableArray<UIMenuElement *> *array, UIActio
 UIMenu *buildEditMenuForSelection(NSAttributedString *attributedText, NSRange range, NSString *_Nullable cachedMarkdown,
                                   StyleConfig *styleConfig, NSArray<UIMenuElement *> *suggestedActions,
                                   NSArray<UIAction *> *_Nullable customActions,
-                                  ENRMSelectionMenuConfig selectionMenuConfig) API_AVAILABLE(ios(16.0))
+                                  ENRMSelectionMenuConfig selectionMenuConfig,
+                                  ENRMCopyRequestHandler _Nullable onCopyRequest) API_AVAILABLE(ios(16.0))
 {
-  NSAttributedString *selectedText = [attributedText attributedSubstringFromRange:range];
+  // Link spacers only reserve layout space; keep them out of every copied flavor.
+  NSAttributedString *selectedText =
+      ENRMAttributedStringByRemovingLinkSpacers([attributedText attributedSubstringFromRange:range]);
   NSString *markdown = markdownForRange(attributedText, range, cachedMarkdown);
   NSArray<NSString *> *imageURLs = imageURLsInRange(attributedText, range);
+  // Same threshold markdownForRange uses to return the cached markdown.
+  BOOL fullSelection = range.location == 0 && range.length >= attributedText.length - 1;
 
-  UIAction *copyAction = createCopyAction(selectedText, markdown, styleConfig, selectionMenuConfig.copyLabel);
+  UIAction *copyAction =
+      createCopyAction(selectedText, markdown, fullSelection, styleConfig, selectionMenuConfig, onCopyRequest);
   UIAction *copyMarkdownAction = selectionMenuConfig.copyAsMarkdown
                                      ? createCopyMarkdownAction(markdown, selectionMenuConfig.copyAsMarkdownLabel)
                                      : nil;
@@ -88,6 +139,16 @@ UIMenu *buildEditMenuForSelection(NSAttributedString *attributedText, NSRange ra
       selectionMenuConfig.copyImageURL ? createCopyImageURLAction(imageURLs, selectionMenuConfig) : nil;
 
   NSMutableArray<UIMenuElement *> *result = [NSMutableArray array];
+
+  if (selectionMenuConfig.systemItemsNone) {
+    // Skip suggestedActions entirely. An empty result still yields an (empty)
+    // menu: returning nil would make UIKit present its default menu.
+    addOptionalAction(result, copyAction);
+    addOptionalAction(result, copyMarkdownAction);
+    addOptionalAction(result, copyImageURLAction);
+    return [UIMenu menuWithChildren:[(customActions ?: @[]) arrayByAddingObjectsFromArray:result]];
+  }
+
   BOOL foundStandardEditMenu = NO;
 
   for (UIMenuElement *element in suggestedActions) {
@@ -107,8 +168,8 @@ UIMenu *buildEditMenuForSelection(NSAttributedString *attributedText, NSRange ra
   }
 
   if (!foundStandardEditMenu) {
-    [result insertObject:copyAction atIndex:0];
-    insertOptionalAction(result, copyMarkdownAction, 1);
+    insertOptionalAction(result, copyMarkdownAction, 0);
+    insertOptionalAction(result, copyAction, 0);
     addOptionalAction(result, copyImageURLAction);
   }
 
@@ -119,4 +180,120 @@ UIMenu *buildEditMenuForSelection(NSAttributedString *attributedText, NSRange ra
   return [UIMenu menuWithChildren:result];
 }
 
+#import <objc/runtime.h>
+
+static const void *kSelectionEditMenuPresenterKey = &kSelectionEditMenuPresenterKey;
+
+API_AVAILABLE(ios(16.0))
+@interface ENRMSelectionEditMenuPresenter : NSObject <UIEditMenuInteractionDelegate>
+@property (nonatomic, weak) UITextView *textView;
+@property (nonatomic, strong) UIEditMenuInteraction *interaction;
+@property (nonatomic, assign) NSRange range;
+@end
+
+@implementation ENRMSelectionEditMenuPresenter
+
+- (UIMenu *)editMenuInteraction:(UIEditMenuInteraction *)interaction
+           menuForConfiguration:(UIEditMenuConfiguration *)configuration
+               suggestedActions:(NSArray<UIMenuElement *> *)suggestedActions
+{
+  UITextView *textView = self.textView;
+  id<UITextViewDelegate> delegate = textView.delegate;
+  if (!textView || ![delegate respondsToSelector:@selector(textView:editMenuForTextInRange:suggestedActions:)]) {
+    return nil;
+  }
+  return [delegate textView:textView editMenuForTextInRange:textView.selectedRange suggestedActions:suggestedActions];
+}
+
+- (CGRect)editMenuInteraction:(UIEditMenuInteraction *)interaction
+    targetRectForConfiguration:(UIEditMenuConfiguration *)configuration
+{
+  UITextView *textView = self.textView;
+  UITextRange *textRange = textView.selectedTextRange;
+  if (!textView || !textRange) {
+    return CGRectNull;
+  }
+  return [textView firstRectForRange:textRange];
+}
+
+@end
+
+static BOOL selectionEditMenuTextViewHasActiveGesture(UITextView *textView)
+{
+  for (UIGestureRecognizer *recognizer in textView.gestureRecognizers) {
+    if (recognizer.state == UIGestureRecognizerStateBegan || recognizer.state == UIGestureRecognizerStateChanged) {
+      return YES;
+    }
+  }
+  return NO;
+}
+
+static void presentSelectionEditMenu(UITextView *textView)
+{
+  UITextRange *textRange = textView.selectedTextRange;
+  if (!textRange || textRange.isEmpty) {
+    return;
+  }
+  CGRect rect = [textView firstRectForRange:textRange];
+  if (CGRectIsNull(rect) || CGRectIsEmpty(rect)) {
+    return;
+  }
+  if (@available(iOS 16.0, *)) {
+    ENRMSelectionEditMenuPresenter *presenter = objc_getAssociatedObject(textView, kSelectionEditMenuPresenterKey);
+    if (!presenter) {
+      presenter = [[ENRMSelectionEditMenuPresenter alloc] init];
+      presenter.textView = textView;
+      presenter.interaction = [[UIEditMenuInteraction alloc] initWithDelegate:presenter];
+      [textView addInteraction:presenter.interaction];
+      objc_setAssociatedObject(textView, kSelectionEditMenuPresenterKey, presenter, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    }
+    presenter.range = textView.selectedRange;
+    UIEditMenuConfiguration *configuration =
+        [UIEditMenuConfiguration configurationWithIdentifier:nil
+                                                 sourcePoint:CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect))];
+    [presenter.interaction presentEditMenuWithConfiguration:configuration];
+    return;
+  }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+  [[UIMenuController sharedMenuController] showMenuFromView:textView rect:rect];
+#pragma clang diagnostic pop
+}
+
+static void presentSelectionEditMenuWhenTouchEnds(UITextView *textView, NSRange range, NSUInteger attemptsLeft)
+{
+  if (!NSEqualRanges(textView.selectedRange, range)) {
+    return;
+  }
+  if (attemptsLeft > 0 && selectionEditMenuTextViewHasActiveGesture(textView)) {
+    __weak UITextView *weakTextView = textView;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(50 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
+      UITextView *strongTextView = weakTextView;
+      if (strongTextView) {
+        presentSelectionEditMenuWhenTouchEnds(strongTextView, range, attemptsLeft - 1);
+      }
+    });
+    return;
+  }
+  presentSelectionEditMenu(textView);
+}
+
+void ENRMSelectRangeAndPresentEditMenu(UITextView *textView, NSRange range)
+{
+  [textView becomeFirstResponder];
+  textView.selectedRange = range;
+  presentSelectionEditMenuWhenTouchEnds(textView, range, 200);
+}
+
+void ENRMDismissSelectionEditMenuIfMoved(UITextView *textView)
+{
+  if (@available(iOS 16.0, *)) {
+    ENRMSelectionEditMenuPresenter *presenter = objc_getAssociatedObject(textView, kSelectionEditMenuPresenterKey);
+    if (presenter && !NSEqualRanges(textView.selectedRange, presenter.range)) {
+      presenter.range = NSMakeRange(NSNotFound, 0);
+      [presenter.interaction dismissMenu];
+    }
+  }
+}
+
 #endif

package/ios/utils/HTMLGenerator.m

@@ -3,6 +3,7 @@
 #import "CodeBackground.h"
 #import "ENRMFeatureFlags.h"
 #import "ENRMImageAttachment.h"
+#import "ENRMLinkChip.h"
 #import "HighlightRenderer.h"
 #if ENRICHED_MARKDOWN_MATH
 #import "ENRMMathInlineAttachment.h"
@@ -460,7 +461,7 @@ static void generateInlineHTML(NSMutableString *html, NSAttributedString *attrib
                       usingBlock:^(NSDictionary<NSAttributedStringKey, id> *attrs, NSRange attrRange, BOOL *stop) {
                         NSString *text = [string substringWithRange:attrRange];
 
-                        if ([text isEqualToString:@"\n"])
+                        if ([text isEqualToString:@"\n"] || attrs[ENRMLinkSpacerAttributeName])
                           return;
 
                         if ([text containsString:kObjectReplacementChar]) {

package/ios/utils/ImageRequestHeaderUtils.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <vector>
+
+template <typename T>
+static bool ENRMImageRequestHeadersChanged(const std::vector<T> &oldHeaders, const std::vector<T> &newHeaders)
+{
+  if (newHeaders.size() != oldHeaders.size()) {
+    return true;
+  }
+  for (size_t i = 0; i < newHeaders.size(); i++) {
+    if (newHeaders[i].name != oldHeaders[i].name || newHeaders[i].value != oldHeaders[i].value) {
+      return true;
+    }
+  }
+  return false;
+}
+
+template <typename T>
+static NSDictionary<NSString *, NSString *> *_Nullable ENRMImageRequestHeadersFromProps(const std::vector<T> &headers)
+{
+  if (headers.empty()) {
+    return nil;
+  }
+  NSMutableDictionary<NSString *, NSString *> *result = [NSMutableDictionary dictionaryWithCapacity:headers.size()];
+  for (const auto &header : headers) {
+    result[@(header.name.c_str())] = @(header.value.c_str());
+  }
+  return [result copy];
+}
+
+#endif

package/ios/utils/LastElementUtils.h

@@ -4,6 +4,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 static NSString *const CodeBlockAttributeName = @"CodeBlock";
+static NSString *const CodeBlockIndentAttributeName = @"CodeBlockIndent";
 
 /**
  * Returns YES when the last semantic block in the storage is a code block, ignoring any

package/ios/utils/ListMarkerDrawer.m

@@ -5,11 +5,7 @@
 #import "RenderContext.h"
 #import "StyleConfig.h"
 
-extern NSString *const ListDepthAttribute;
-extern NSString *const ListTypeAttribute;
-extern NSString *const ListItemNumberAttribute;
-extern NSString *const TaskItemAttribute;
-extern NSString *const TaskCheckedAttribute;
+extern NSString *const ListItemMarkerStartAttribute;
 
 @implementation ListMarkerDrawer {
   StyleConfig *_config;
@@ -44,13 +40,13 @@ extern NSString *const TaskCheckedAttribute;
                                  if (charRange.location == NSNotFound)
                                    return;
 
-                                 // 1. Fetch all attributes at once for efficiency
                                  NSDictionary *attrs = [storage attributesAtIndex:charRange.location
                                                                    effectiveRange:NULL];
-                                 if (!attrs[ListDepthAttribute])
+                                 NSArray *markers = attrs[ListItemMarkerStartAttribute];
+                                 if (![markers isKindOfClass:[NSArray class]] || markers.count == 0)
                                    return;
 
-                                 // 2. Identify the start of the paragraph
+                                 // Identify the start of the paragraph
                                  NSRange paraRange = [storage.string paragraphRangeForRange:charRange];
                                  if (charRange.location != paraRange.location ||
                                      [drawnParagraphs containsObject:@(paraRange.location)])
@@ -61,30 +57,28 @@ extern NSString *const TaskCheckedAttribute;
 
                                  CGPoint glyphLoc = [layoutManager locationForGlyphAtIndex:glyphRange.location];
                                  CGFloat baselineY = origin.y + rect.origin.y + glyphLoc.y;
-                                 CGFloat markerX;
-                                 if (isRTL) {
-                                   markerX = origin.x + usedRect.origin.x + usedRect.size.width + gap;
-                                 } else {
-                                   markerX = origin.x + usedRect.origin.x - gap;
-                                 }
-
-                                 // 4. Draw marker based on type
-                                 if ([attrs[TaskItemAttribute] boolValue]) {
-                                   UIFont *font = attrs[NSFontAttributeName] ?: [self defaultFont];
-                                   BOOL checked = [attrs[TaskCheckedAttribute] boolValue];
-                                   const CGFloat size = [_config taskListCheckboxSize];
-                                   CGFloat checkboxX = isRTL ? markerX + size / 2.0 : markerX - size / 2.0;
-                                   [self drawCheckboxAtX:checkboxX
-                                                 centerY:baselineY - (font.capHeight / 2.0)
-                                                 checked:checked];
-                                 } else if ([attrs[ListTypeAttribute] integerValue] == ListTypeUnordered) {
-                                   UIFont *font = attrs[NSFontAttributeName] ?: [self defaultFont];
-                                   NSInteger depth = [attrs[ListDepthAttribute] integerValue];
-                                   [self drawBulletAtX:markerX
-                                               centerY:baselineY - (font.xHeight + font.capHeight) / 4.0
-                                                 depth:depth];
-                                 } else {
-                                   [self drawOrderedMarkerAtX:markerX attrs:attrs baselineY:baselineY isRTL:isRTL];
+                                 UIFont *font = attrs[NSFontAttributeName] ?: [self defaultFont];
+
+                                 for (ENRMListMarkerDescriptor *marker in markers) {
+                                   CGFloat markerX = isRTL ? origin.x + container.size.width - marker.indent + gap
+                                                           : origin.x + marker.indent - gap;
+
+                                   if (marker.isTask) {
+                                     const CGFloat size = [_config taskListCheckboxSize];
+                                     CGFloat checkboxX = isRTL ? markerX + size / 2.0 : markerX - size / 2.0;
+                                     [self drawCheckboxAtX:checkboxX
+                                                   centerY:baselineY - (font.capHeight / 2.0)
+                                                   checked:marker.isChecked];
+                                   } else if (marker.listType == ListTypeUnordered) {
+                                     [self drawBulletAtX:markerX
+                                                 centerY:baselineY - (font.xHeight + font.capHeight) / 4.0
+                                                   depth:marker.depth];
+                                   } else {
+                                     [self drawOrderedMarkerAtX:markerX
+                                                         number:marker.number
+                                                      baselineY:baselineY
+                                                          isRTL:isRTL];
+                                   }
                                  }
                                }];
 }
@@ -167,17 +161,10 @@ extern NSString *const TaskCheckedAttribute;
                    y:y];
 }
 
-- (void)drawOrderedMarkerAtX:(CGFloat)boundaryX
-                       attrs:(NSDictionary *)attrs
-                   baselineY:(CGFloat)baselineY
-                       isRTL:(BOOL)isRTL
+- (void)drawOrderedMarkerAtX:(CGFloat)boundaryX number:(NSInteger)number baselineY:(CGFloat)baselineY isRTL:(BOOL)isRTL
 {
-  NSNumber *num = attrs[ListItemNumberAttribute];
-  if (!num)
-    return;
-
-  NSString *text = isRTL ? [NSString stringWithFormat:@".%ld", (long)num.integerValue]
-                         : [NSString stringWithFormat:@"%ld.", (long)num.integerValue];
+  NSString *text =
+      isRTL ? [NSString stringWithFormat:@".%ld", (long)number] : [NSString stringWithFormat:@"%ld.", (long)number];
   UIFont *font = [_config listMarkerFont] ?: [self defaultFont];
 
   NSDictionary *mAttrs = @{NSFontAttributeName : font, NSForegroundColorAttributeName : [_config listStyleMarkerColor]};

package/ios/utils/MarkdownASTSerializer.m

@@ -22,6 +22,10 @@ static void serializeNode(MarkdownASTNode *node, NSMutableString *buffer)
       break;
 
     case MarkdownNodeTypeLineBreak:
+      [buffer appendString:@"\\\n"];
+      break;
+
+    case MarkdownNodeTypeSoftBreak:
       [buffer appendString:@"\n"];
       break;
 

package/ios/utils/MarkdownAccessibilityElementBuilder.m

@@ -2,6 +2,7 @@
 #import "AccessibilityInfo.h"
 #import "BlockquoteBorder.h"
 #import "ENRMAccessibilityLabels.h"
+#import "ENRMLinkChip.h"
 #include <TargetConditionals.h>
 
 typedef NS_ENUM(NSInteger, ElementType) { ElementTypeText, ElementTypeLink, ElementTypeImage };
@@ -113,7 +114,8 @@ static const CGFloat kFocusRectPadding = 2.0;
     }
 
     BOOL isImg = item[@"altText"] != nil;
-    NSString *label = isImg ? item[@"altText"] : [fullText substringWithRange:itemRange];
+    // Link chips pad their text with spacer characters; keep them out of the spoken label.
+    NSString *label = isImg ? item[@"altText"] : ENRMPlainTextByRemovingLinkSpacers(textView.attributedText, itemRange);
     [elements addObject:[self createElementForRange:itemRange
                                                type:isImg ? ElementTypeImage : ElementTypeLink
                                                text:label

package/ios/utils/MarkdownExtractor.m

@@ -2,6 +2,7 @@
 #import "BlockquoteBorder.h"
 #import "ENRMFeatureFlags.h"
 #import "ENRMImageAttachment.h"
+#import "ENRMLinkChip.h"
 #import "ENRMUIKit.h"
 #import "HighlightRenderer.h"
 #include <TargetConditionals.h>
@@ -152,7 +153,7 @@ NSString *_Nullable extractMarkdownFromAttributedString(NSAttributedString *attr
                          options:0
                       usingBlock:^(NSDictionary<NSAttributedStringKey, id> *attrs, NSRange attrRange, BOOL *stop) {
                         NSString *text = [[attributedText attributedSubstringFromRange:attrRange] string];
-                        if (text.length == 0)
+                        if (text.length == 0 || attrs[ENRMLinkSpacerAttributeName])
                           return;
 
                         // Images and Thematic Breaks

package/ios/utils/ParagraphStyleUtils.h

@@ -45,6 +45,11 @@ NSUInteger applyBlockSpacingBefore(NSMutableAttributedString *output, NSUInteger
 void applyBlockSpacingAfter(NSMutableAttributedString *output, CGFloat marginBottom);
 void applyLineHeight(NSMutableAttributedString *output, NSRange range, CGFloat lineHeight);
 void applyBaselineOffset(NSMutableAttributedString *output, NSRange range);
+
+/// True when the range contains a block (non-inline) image attachment. Lines holding
+/// such attachments must not be clamped by maximumLineHeight or the image box
+/// overflows the line and paints over surrounding content.
+BOOL ENRMRangeContainsBlockImage(NSAttributedString *output, NSRange range);
 void applyTextAlignment(NSMutableAttributedString *output, NSRange range, NSTextAlignment textAlign);
 NSTextAlignment textAlignmentFromString(NSString *textAlign);
 

package/ios/utils/ParagraphStyleUtils.m

@@ -1,5 +1,6 @@
 #import "ParagraphStyleUtils.h"
 #import "ENRMFeatureFlags.h"
+#import "ENRMImageAttachment.h"
 #import "LastElementUtils.h"
 #import <React/RCTI18nUtil.h>
 
@@ -246,6 +247,21 @@ void applyBlockSpacingAfter(NSMutableAttributedString *output, CGFloat marginBot
   [output addAttribute:NSParagraphStyleAttributeName value:spacerStyle range:NSMakeRange(spacerLocation, 1)];
 }
 
+BOOL ENRMRangeContainsBlockImage(NSAttributedString *output, NSRange range)
+{
+  __block BOOL found = NO;
+  [output enumerateAttribute:NSAttachmentAttributeName
+                     inRange:range
+                     options:0
+                  usingBlock:^(id value, __unused NSRange attrRange, BOOL *stop) {
+                    if ([value isKindOfClass:[ENRMImageAttachment class]] && !((ENRMImageAttachment *)value).isInline) {
+                      found = YES;
+                      *stop = YES;
+                    }
+                  }];
+  return found;
+}
+
 void applyLineHeight(NSMutableAttributedString *output, NSRange range, CGFloat lineHeight)
 {
   if (lineHeight <= 0) {
@@ -266,10 +282,12 @@ void applyLineHeight(NSMutableAttributedString *output, NSRange range, CGFloat l
                   }];
 #endif
 
+  BOOL hasBlockImage = ENRMRangeContainsBlockImage(output, range);
+
   NSMutableParagraphStyle *style = getOrCreateParagraphStyle(output, range.location);
 
   style.minimumLineHeight = lineHeight;
-  style.maximumLineHeight = hasMath ? 0 : lineHeight;
+  style.maximumLineHeight = (hasMath || hasBlockImage) ? 0 : lineHeight;
 
   [output addAttribute:NSParagraphStyleAttributeName value:style range:range];
 }
@@ -284,7 +302,8 @@ void applyBaselineOffset(NSMutableAttributedString *output, NSRange range)
     return;
   }
 
-  __block CGFloat maximumLineHeight = 0;
+  // Math paragraphs leave maximumLineHeight at 0, so fall back to minimumLineHeight.
+  __block CGFloat targetLineHeight = 0;
   [output enumerateAttribute:NSParagraphStyleAttributeName
                      inRange:range
                      options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
@@ -292,29 +311,59 @@ void applyBaselineOffset(NSMutableAttributedString *output, NSRange range)
                     if (!paragraphStyle) {
                       return;
                     }
-                    maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
+                    CGFloat clamp = MAX(paragraphStyle.maximumLineHeight, paragraphStyle.minimumLineHeight);
+                    targetLineHeight = MAX(clamp, targetLineHeight);
                   }];
 
-  if (maximumLineHeight <= 0) {
+  if (targetLineHeight <= 0) {
     return;
   }
 
-  __block CGFloat maximumFontLineHeight = 0;
-  [output enumerateAttribute:NSFontAttributeName
-                     inRange:range
-                     options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                  usingBlock:^(UIFont *font, __unused NSRange subrange, __unused BOOL *stop) {
-                    if (!font) {
-                      return;
-                    }
-                    maximumFontLineHeight = MAX(UIFontLineHeight(font), maximumFontLineHeight);
-                  }];
+  // Center on real text; on a math-only line center the math box instead of its font.
+  __block CGFloat textLineHeight = 0;
+#if ENRICHED_MARKDOWN_MATH
+  __block BOOL hasMath = NO;
+#endif
+  [output enumerateAttributesInRange:range
+                             options:0
+                          usingBlock:^(NSDictionary<NSAttributedStringKey, id> *attrs, __unused NSRange subrange,
+                                       __unused BOOL *stop) {
+#if ENRICHED_MARKDOWN_MATH
+                            if ([attrs[NSAttachmentAttributeName] isKindOfClass:[ENRMMathInlineAttachment class]]) {
+                              hasMath = YES;
+                              return;
+                            }
+#endif
+                            UIFont *font = attrs[NSFontAttributeName];
+                            if (font) {
+                              textLineHeight = MAX(UIFontLineHeight(font), textLineHeight);
+                            }
+                          }];
+
+  CGFloat contentLineHeight = textLineHeight;
+
+#if ENRICHED_MARKDOWN_MATH
+  // Math only grows the content height, so measure it (parsing LaTeX) only when text
+  // alone wouldn't already fill the line.
+  if (hasMath && targetLineHeight > textLineHeight) {
+    __block CGFloat mathBoxHeight = 0;
+    [output enumerateAttribute:NSAttachmentAttributeName
+                       inRange:range
+                       options:0
+                    usingBlock:^(id value, __unused NSRange subrange, __unused BOOL *stop) {
+                      if ([value isKindOfClass:[ENRMMathInlineAttachment class]]) {
+                        mathBoxHeight = MAX(((ENRMMathInlineAttachment *)value).boxHeight, mathBoxHeight);
+                      }
+                    }];
+    contentLineHeight = MAX(textLineHeight, mathBoxHeight);
+  }
+#endif
 
-  if (maximumFontLineHeight <= 0 || maximumLineHeight < maximumFontLineHeight) {
+  if (contentLineHeight <= 0 || targetLineHeight <= contentLineHeight) {
     return;
   }
 
-  CGFloat baseLineOffset = (maximumLineHeight - maximumFontLineHeight) / 2.0;
+  CGFloat baseLineOffset = (targetLineHeight - contentLineHeight) / 2.0;
 
   [output enumerateAttribute:NSBaselineOffsetAttributeName
                      inRange:range
@@ -323,7 +372,18 @@ void applyBaselineOffset(NSMutableAttributedString *output, NSRange range)
                     if (existingOffset != nil) {
                       return;
                     }
-                    [output addAttribute:NSBaselineOffsetAttributeName value:@(baseLineOffset) range:subrange];
+                    [output enumerateAttribute:NSAttachmentAttributeName
+                                       inRange:subrange
+                                       options:0
+                                    usingBlock:^(id attachment, NSRange attachmentRange, BOOL *innerStop) {
+                                      if ([attachment isKindOfClass:[ENRMImageAttachment class]] &&
+                                          !((ENRMImageAttachment *)attachment).isInline) {
+                                        return;
+                                      }
+                                      [output addAttribute:NSBaselineOffsetAttributeName
+                                                     value:@(baseLineOffset)
+                                                     range:attachmentRange];
+                                    }];
                   }];
 }
 

package/ios/utils/RTFExportUtils.m

@@ -1,6 +1,7 @@
 #import "RTFExportUtils.h"
 #import "BlockquoteBorder.h"
 #import "CodeBackground.h"
+#import "ENRMLinkChip.h"
 #import "LastElementUtils.h"
 #import "ListItemRenderer.h"
 #import "RenderContext.h"
@@ -288,6 +289,7 @@ NSAttributedString *prepareAttributedStringForRTFExport(NSAttributedString *attr
   RCTUIColor *blockquoteBgColor = [styleConfig blockquoteBackgroundColor];
 
   processThematicBreaks(prepared);
+  ENRMApplyLinkChipBackgroundsAsTextBackground(prepared);
   processCodes(prepared, codeBgColor);
   processCodeBlocks(prepared, codeBlockBgColor);
   processBlockquotes(prepared, blockquoteBgColor);