react-native-enriched-markdown-scaffold 0.6.0-scaffold.8 → 0.7.4-scaffold.2

package/ios/input/EnrichedMarkdownTextInput.mm

@@ -20,9 +20,12 @@
 #import "ENRMStyleMergingConfig.h"
 #import "ENRMUIKit.h"
 #import "ENRMWordsUtils.h"
+#import "EnrichedMarkdownTextInput+Internal.h"
 #import "InputStylePropsUtils.h"
 #import "ParagraphStyleUtils.h"
+#import "PasteboardUtils.h"
 #import "SelectionColorUtils.h"
+#import <QuartzCore/CABase.h>
 #import <React/RCTI18nUtil.h>
 #if TARGET_OS_OSX
 #import <React/RCTBackedTextInputDelegate.h>
@@ -65,6 +68,7 @@ using namespace facebook::react;
   BOOL _isApplyingFormatting;
   BOOL _isTextChanging;
   BOOL _emitMarkdown;
+  CFTimeInterval _lastTextChangeTime;
 
   ENRMPlaceholderLabel *_placeholderLabel;
 
@@ -102,6 +106,20 @@ using namespace facebook::react;
   BOOL _suppressMathChipClearOnce;
   /// Character index of the currently selected math chip, or NSNotFound.
   NSUInteger _activeMathChipIndex;
+
+  ENRMInputSelectionMenuConfig _inputSelectionMenuConfig;
+  ENRMFormatMenuConfig _formatMenuConfig;
+
+  // Strong owners for the strings the two config structs above reference via
+  // `__unsafe_unretained` pointers.
+  NSString *_inputSelectionMenuFormatLabel;
+  NSString *_inputSelectionMenuCopyAsMarkdownLabel;
+  NSString *_formatMenuBoldLabel;
+  NSString *_formatMenuItalicLabel;
+  NSString *_formatMenuUnderlineLabel;
+  NSString *_formatMenuStrikethroughLabel;
+  NSString *_formatMenuSpoilerLabel;
+  NSString *_formatMenuLinkLabel;
 }
 
 #pragma mark - Fabric lifecycle
@@ -139,6 +157,9 @@ using namespace facebook::react;
     _writingDirectionMode = ENRMWritingDirectionModeFirstStrong;
     _resolvedLayoutDirection =
         [[RCTI18nUtil sharedInstance] isRTL] ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
+    _inputSelectionMenuConfig = (ENRMInputSelectionMenuConfig){.format = YES, .copyAsMarkdown = YES};
+    _formatMenuConfig = (ENRMFormatMenuConfig){
+        .bold = YES, .italic = YES, .underline = YES, .strikethrough = YES, .spoiler = YES, .link = YES};
 
     _suppressMathChipClearOnce = NO;
     _activeMathChipIndex = NSNotFound;
@@ -232,6 +253,20 @@ using namespace facebook::react;
 
 #if ENRICHED_MARKDOWN_MATH && !TARGET_OS_OSX
 
+// Glyph rect of the chip at `index`, in _textView coordinates (the same space
+// `locationInView:_textView` reports). Single source of truth for both the tap
+// hit-test and the rect reported to JS.
+- (CGRect)mathChipRectInTextViewAtIndex:(NSUInteger)index layoutManager:(NSLayoutManager *)lm
+{
+  if (lm == nil)
+    return CGRectNull;
+  NSRange glyphRange = [lm glyphRangeForCharacterRange:NSMakeRange(index, 1) actualCharacterRange:NULL];
+  CGRect rect = [lm boundingRectForGlyphRange:glyphRange inTextContainer:_textView.textContainer];
+  rect.origin.x += _textView.textContainerInset.left;
+  rect.origin.y += _textView.textContainerInset.top;
+  return rect;
+}
+
 - (void)handleTapForMathChip:(UITapGestureRecognizer *)gesture
 {
   if (gesture.state != UIGestureRecognizerStateRecognized)
@@ -244,23 +279,28 @@ using namespace facebook::react;
   if (idx < 0)
     return;
   NSTextStorage *storage = _textView.textStorage;
-  // The closest position can land just past the chip; probe both `idx` and `idx-1`.
+  NSLayoutManager *lm = storage.layoutManagers.firstObject;
+  // The closest position can land just past the chip, so probe both `idx` and `idx-1`.
+  // `closestPositionToPoint:` has no distance bound — it clamps a tap anywhere in the
+  // text view (blank space past the text, textContainerInset padding) onto the nearest
+  // character. Requiring the touch to fall inside the chip's own glyph rect is what
+  // keeps a tap beside a chip from reading as a tap on it.
   ENRMMathInlineAttachment *att = nil;
   NSUInteger chipIdx = NSNotFound;
-  if ((NSUInteger)idx < storage.length) {
-    id v = [storage attribute:NSAttachmentAttributeName atIndex:(NSUInteger)idx effectiveRange:NULL];
-    if ([v isKindOfClass:[ENRMMathInlineAttachment class]]) {
-      att = v;
-      chipIdx = (NSUInteger)idx;
-    }
-  }
-  if (!att && idx > 0) {
-    NSUInteger probe = (NSUInteger)idx - 1;
-    id v = [storage attribute:NSAttachmentAttributeName atIndex:probe effectiveRange:NULL];
-    if ([v isKindOfClass:[ENRMMathInlineAttachment class]]) {
-      att = v;
-      chipIdx = probe;
-    }
+  for (NSInteger probe = idx; probe >= idx - 1; probe--) {
+    if (probe < 0 || (NSUInteger)probe >= storage.length)
+      continue;
+    id v = [storage attribute:NSAttachmentAttributeName atIndex:(NSUInteger)probe effectiveRange:NULL];
+    if (![v isKindOfClass:[ENRMMathInlineAttachment class]])
+      continue;
+    // An empty rect means the layout could not give us the chip's extent; accept the
+    // candidate then, rather than making the chip untappable.
+    CGRect rect = [self mathChipRectInTextViewAtIndex:(NSUInteger)probe layoutManager:lm];
+    if (!CGRectIsEmpty(rect) && !CGRectContainsPoint(rect, loc))
+      continue;
+    att = v;
+    chipIdx = (NSUInteger)probe;
+    break;
   }
   if (!att)
     return;
@@ -269,7 +309,6 @@ using namespace facebook::react;
   [self clearMathChipSelectionsExcept:chipRange];
   att.isSelected = YES;
   [att invalidateRender];
-  NSLayoutManager *lm = storage.layoutManagers.firstObject;
   if (lm) {
     [lm invalidateLayoutForCharacterRange:chipRange actualCharacterRange:NULL];
     [lm ensureLayoutForCharacterRange:chipRange];
@@ -285,10 +324,8 @@ using namespace facebook::react;
   _suppressMathChipClearOnce = YES;
   _textView.selectedRange = NSMakeRange(caretIndex, 0);
 
-  NSRange glyphRange = [lm glyphRangeForCharacterRange:chipRange actualCharacterRange:NULL];
-  CGRect glyphRect = [lm boundingRectForGlyphRange:glyphRange inTextContainer:_textView.textContainer];
-  glyphRect.origin.x += _textView.textContainerInset.left;
-  glyphRect.origin.y += _textView.textContainerInset.top;
+  // Recomputed rather than reused from the hit-test: the layout was invalidated above.
+  CGRect glyphRect = [self mathChipRectInTextViewAtIndex:chipIdx layoutManager:lm];
   CGRect rectInSelf = [self.contentView convertRect:glyphRect fromView:_textView];
 
   [self emitOnMathPressWithLatex:att.latex start:chipIdx end:chipIdx + 1 displayMode:att.displayMode rect:rectInSelf];
@@ -463,6 +500,44 @@ using namespace facebook::react;
     _contextMenuItemIcons = ENRMContextMenuIconsFromItems(newViewProps.contextMenuItems);
   }
 
+  // Coalesce against `initWithUTF8String:` returning nil on malformed UTF-8 —
+  // UIMenu / UIAction / NSMenuItem titles are _Nonnull and would crash.
+  _inputSelectionMenuFormatLabel =
+      [[NSString alloc] initWithUTF8String:newViewProps.selectionMenuConfig.formatLabel.c_str()] ?: @"";
+  _inputSelectionMenuCopyAsMarkdownLabel =
+      [[NSString alloc] initWithUTF8String:newViewProps.selectionMenuConfig.copyAsMarkdownLabel.c_str()] ?: @"";
+  _inputSelectionMenuConfig = (ENRMInputSelectionMenuConfig){
+      .format = newViewProps.selectionMenuConfig.format,
+      .formatLabel = _inputSelectionMenuFormatLabel,
+      .copyAsMarkdown = newViewProps.selectionMenuConfig.copyAsMarkdown,
+      .copyAsMarkdownLabel = _inputSelectionMenuCopyAsMarkdownLabel,
+  };
+
+  _formatMenuBoldLabel = [[NSString alloc] initWithUTF8String:newViewProps.formatMenuConfig.boldLabel.c_str()] ?: @"";
+  _formatMenuItalicLabel =
+      [[NSString alloc] initWithUTF8String:newViewProps.formatMenuConfig.italicLabel.c_str()] ?: @"";
+  _formatMenuUnderlineLabel =
+      [[NSString alloc] initWithUTF8String:newViewProps.formatMenuConfig.underlineLabel.c_str()] ?: @"";
+  _formatMenuStrikethroughLabel =
+      [[NSString alloc] initWithUTF8String:newViewProps.formatMenuConfig.strikethroughLabel.c_str()] ?: @"";
+  _formatMenuSpoilerLabel =
+      [[NSString alloc] initWithUTF8String:newViewProps.formatMenuConfig.spoilerLabel.c_str()] ?: @"";
+  _formatMenuLinkLabel = [[NSString alloc] initWithUTF8String:newViewProps.formatMenuConfig.linkLabel.c_str()] ?: @"";
+  _formatMenuConfig = (ENRMFormatMenuConfig){
+      .bold = newViewProps.formatMenuConfig.bold,
+      .boldLabel = _formatMenuBoldLabel,
+      .italic = newViewProps.formatMenuConfig.italic,
+      .italicLabel = _formatMenuItalicLabel,
+      .underline = newViewProps.formatMenuConfig.underline,
+      .underlineLabel = _formatMenuUnderlineLabel,
+      .strikethrough = newViewProps.formatMenuConfig.strikethrough,
+      .strikethroughLabel = _formatMenuStrikethroughLabel,
+      .spoiler = newViewProps.formatMenuConfig.spoiler,
+      .spoilerLabel = _formatMenuSpoilerLabel,
+      .link = newViewProps.formatMenuConfig.link,
+      .linkLabel = _formatMenuLinkLabel,
+  };
+
   if (newViewProps.mentionIndicators != oldViewProps.mentionIndicators) {
     NSMutableArray<NSString *> *indicators = [NSMutableArray array];
     for (const auto &indicator : newViewProps.mentionIndicators) {
@@ -964,6 +1039,7 @@ using namespace facebook::react;
   }
 
   [self applyFormatting];
+  [self syncTypingAttributesWithPendingStyles];
   [self emitFormattingChanged];
 }
 
@@ -1221,6 +1297,21 @@ using namespace facebook::react;
   return [ENRMMarkdownSerializer serializeAttributedString:selectedAttr ranges:clippedRanges];
 }
 
+- (void)copyToClipboard
+{
+  NSString *plainText = ENRMGetPlainText(_textView);
+  if (plainText.length == 0) {
+    return;
+  }
+  NSString *markdown = [ENRMMarkdownSerializer serializePlainText:plainText ranges:[self allRangesIncludingTransient]];
+  NSMutableDictionary *items = [NSMutableDictionary dictionary];
+  items[kUTIPlainText] = plainText;
+  if (markdown.length > 0) {
+    items[kENRMMarkdownPasteboardType] = markdown;
+  }
+  copyItemsToPasteboard(items);
+}
+
 - (void)requestMarkdown:(NSInteger)requestId
 {
   auto emitter = [self getEventEmitter];
@@ -1293,6 +1384,57 @@ using namespace facebook::react;
   return inRange;
 }
 
+- (void)syncTypingAttributesWithPendingStyles
+{
+  UIFontDescriptorSymbolicTraits traits = 0;
+  if ([_pendingStyles containsObject:@(ENRMInputStyleTypeStrong)]) {
+    traits |= UIFontDescriptorTraitBold;
+  }
+  if ([_pendingStyles containsObject:@(ENRMInputStyleTypeEmphasis)]) {
+    traits |= UIFontDescriptorTraitItalic;
+  }
+
+  NSMutableDictionary *attrs = [_textView.typingAttributes mutableCopy];
+  attrs[NSFontAttributeName] = [_formatterStyle fontForTraits:traits];
+  _textView.typingAttributes = attrs;
+}
+
+- (void)resetPendingStylesForSelectionChange
+{
+  // Skip system-driven selection adjustments (e.g., predictive text) that fire
+  // immediately after a text edit.
+  static const CFTimeInterval kPostEditGracePeriod = 0.1;
+  BOOL isPostEditAdjustment =
+      (_lastTextChangeTime > 0 && (CACurrentMediaTime() - _lastTextChangeTime) < kPostEditGracePeriod);
+  if (isPostEditAdjustment) {
+    return;
+  }
+  [_pendingStyles removeAllObjects];
+  [_pendingStyleRemovals removeAllObjects];
+  [self rebuildPendingStylesFromContext];
+  [self syncTypingAttributesWithPendingStyles];
+}
+
+- (void)rebuildPendingStylesFromContext
+{
+  NSUInteger cursor = _textView.selectedRange.location;
+  if (_textView.selectedRange.length > 0 || cursor == 0) {
+    return;
+  }
+
+  static const ENRMInputStyleType inlineStyles[] = {
+      ENRMInputStyleTypeStrong,        ENRMInputStyleTypeEmphasis, ENRMInputStyleTypeUnderline,
+      ENRMInputStyleTypeStrikethrough, ENRMInputStyleTypeSpoiler,
+  };
+
+  for (NSUInteger i = 0; i < sizeof(inlineStyles) / sizeof(inlineStyles[0]); i++) {
+    ENRMInputStyleType type = inlineStyles[i];
+    if ([_formattingStore isStyleAdjacentBefore:type position:cursor]) {
+      [_pendingStyles addObject:@(type)];
+    }
+  }
+}
+
 #pragma mark - Event emitters
 
 - (void)emitFormattingChanged
@@ -1531,6 +1673,16 @@ using namespace facebook::react;
   return _contextMenuItemIcons ?: @[];
 }
 
+- (ENRMInputSelectionMenuConfig)inputSelectionMenuConfig
+{
+  return _inputSelectionMenuConfig;
+}
+
+- (ENRMFormatMenuConfig)formatMenuConfig
+{
+  return _formatMenuConfig;
+}
+
 - (void)emitContextMenuItemPress:(NSString *)itemText
 {
   auto eventEmitter = [self getEventEmitter];
@@ -1674,10 +1826,27 @@ using namespace facebook::react;
   if (insertedLength > 0) {
     NSRange insertedRange = NSMakeRange(editLocation, insertedLength);
 
-    for (NSNumber *styleNum in _pendingStyles) {
-      ENRMFormattingRange *newRange = [ENRMFormattingRange rangeWithType:(ENRMInputStyleType)styleNum.integerValue
-                                                                   range:insertedRange];
-      [_formattingStore addRange:newRange];
+    // Skip applying pending styles when the insertion is only line breaks —
+    // a phantom range over a bare newline corrupts isStyleActive() at the boundary.
+    NSString *plainText = ENRMGetPlainText(_textView);
+    NSUInteger insertedEnd = NSMaxRange(insertedRange);
+    BOOL insertedHasGlyphContent = NO;
+    if (insertedEnd <= plainText.length) {
+      NSCharacterSet *newlines = [NSCharacterSet newlineCharacterSet];
+      for (NSUInteger i = insertedRange.location; i < insertedEnd; i++) {
+        if (![newlines characterIsMember:[plainText characterAtIndex:i]]) {
+          insertedHasGlyphContent = YES;
+          break;
+        }
+      }
+    }
+
+    if (insertedHasGlyphContent) {
+      for (NSNumber *styleNum in _pendingStyles) {
+        ENRMFormattingRange *newRange = [ENRMFormattingRange rangeWithType:(ENRMInputStyleType)styleNum.integerValue
+                                                                     range:insertedRange];
+        [_formattingStore addRange:newRange];
+      }
     }
 
     // adjustForEditAtLocation may have expanded an existing range to cover
@@ -1781,6 +1950,7 @@ using namespace facebook::react;
   }
   [self handleTextChanged];
   _isTextChanging = NO;
+  _lastTextChangeTime = CACurrentMediaTime();
   _lastSelectedRange = textView.selectedRange;
 }
 
@@ -1798,6 +1968,15 @@ using namespace facebook::react;
 - (void)textViewDidChangeSelection:(UITextView *)textView
 {
   NSRange newSelection = textView.selectedRange;
+  // Links (e.g. mentions) are atomic: snap a partial selection to the whole link, and a caret inside
+  // a link to its end. Returning hands the adjusted selection to the recursive change (no double emit).
+  if (!_isApplyingFormatting && !_isTextChanging && !ENRMHasMarkedText(_textView)) {
+    NSRange adjusted = [_formattingStore selectionAdjustedForAtomicLinks:newSelection];
+    if (!NSEqualRanges(adjusted, newSelection)) {
+      _textView.selectedRange = adjusted;
+      return;
+    }
+  }
   NSRange previousSelection = _lastSelectedRange;
   _lastSelectedRange = newSelection;
 
@@ -1805,6 +1984,10 @@ using namespace facebook::react;
     return;
   }
 
+  if (ENRMHasMarkedText(_textView)) {
+    return;
+  }
+
 #if ENRICHED_MARKDOWN_MATH
   if (_suppressMathChipClearOnce) {
     // Caret update was triggered by handleTapForMathChip — keep that chip
@@ -1820,8 +2003,7 @@ using namespace facebook::react;
       newSelection.location != previousSelection.location || newSelection.length != previousSelection.length;
 
   if (selectionMoved) {
-    [_pendingStyles removeAllObjects];
-    [_pendingStyleRemovals removeAllObjects];
+    [self resetPendingStylesForSelectionChange];
   }
 
   [self manageSelectionBasedChanges];
@@ -1928,19 +2110,38 @@ using namespace facebook::react;
   }
   [self handleTextChanged];
   _isTextChanging = NO;
+  _lastTextChangeTime = CACurrentMediaTime();
   _lastSelectedRange = _textView.selectedRange;
 }
 
 - (void)textInputDidChangeSelection
 {
-  _lastSelectedRange = _textView.selectedRange;
+  NSRange newSelection = _textView.selectedRange;
+  // Atomic link snapping — same logic as textViewDidChangeSelection: (iOS).
+  if (!_isApplyingFormatting && !_isTextChanging && !ENRMHasMarkedText(_textView)) {
+    NSRange adjusted = [_formattingStore selectionAdjustedForAtomicLinks:newSelection];
+    if (!NSEqualRanges(adjusted, newSelection)) {
+      _textView.selectedRange = adjusted;
+      return;
+    }
+  }
+  NSRange previousSelection = _lastSelectedRange;
+  _lastSelectedRange = newSelection;
 
   if (_isApplyingFormatting || _isTextChanging) {
     return;
   }
 
-  [_pendingStyles removeAllObjects];
-  [_pendingStyleRemovals removeAllObjects];
+  if (ENRMHasMarkedText(_textView)) {
+    return;
+  }
+
+  BOOL selectionMoved =
+      newSelection.location != previousSelection.location || newSelection.length != previousSelection.length;
+
+  if (selectionMoved) {
+    [self resetPendingStylesForSelectionChange];
+  }
 
   [self emitOnChangeSelection];
   [self updateActiveMention];

package/ios/input/styles/ENRMBoldStyleHandler.mm

@@ -22,8 +22,9 @@
                             formattingRange:(ENRMFormattingRange *)formattingRange
                                       style:(ENRMInputFormatterStyle *)style
 {
-  RCTUIColor *color = style.boldColor ?: style.baseTextColor;
-  [storage addAttribute:NSForegroundColorAttributeName value:color range:range];
+  if (style.boldColor) {
+    [storage addAttribute:NSForegroundColorAttributeName value:style.boldColor range:range];
+  }
 }
 
 @end

package/ios/input/styles/ENRMItalicStyleHandler.mm

@@ -22,8 +22,9 @@
                             formattingRange:(ENRMFormattingRange *)formattingRange
                                       style:(ENRMInputFormatterStyle *)style
 {
-  RCTUIColor *color = style.italicColor ?: style.baseTextColor;
-  [storage addAttribute:NSForegroundColorAttributeName value:color range:range];
+  if (style.italicColor) {
+    [storage addAttribute:NSForegroundColorAttributeName value:style.italicColor range:range];
+  }
 }
 
 @end

package/ios/renderer/AttributedRenderer.m

@@ -3,6 +3,7 @@
 #import "LastElementUtils.h"
 #import "MarkdownASTNode.h"
 #import "NodeRenderer.h"
+#import "ParagraphStyleUtils.h"
 #import "RenderContext.h"
 #import "RendererFactory.h"
 #import "StyleConfig.h"
@@ -58,7 +59,32 @@
   return output;
 }
 
-/// Removes trailing margin spacing while preserving code block padding
+/**
+ * Trims trailing newlines after the last rendered block, with special handling for code blocks.
+ *
+ * For non-code-block tail elements: deletes all trailing newlines after the last non-newline
+ * character and zeroes the last element's paragraph spacing so it doesn't render a margin past
+ * the content.
+ *
+ * For code blocks (`isLastBlockACodeBlock` == YES): keeps the bottom padding spacer in place
+ * AND preserves a single trailing newline immediately after it (typically the
+ * codeBlockMarginBottom spacer that CodeBlockRenderer already appended; if none exists, one is
+ * synthesized here). That extra newline matters because of an iOS layout quirk:
+ *
+ *   - iOS treats the trailing `\n` of the storage as a paragraph terminator and reports the
+ *     line fragment for the paragraph after it via `extraLineFragmentRect`.
+ *   - `boundingRectForGlyphRange:` excludes that extra line, and the graphics-context clip
+ *     passed to `drawBackgroundForGlyphRange:` is tiled to the laid-out content area (rounded
+ *     up to 128pt boundaries) which also excludes it.
+ *   - If the bottom padding spacer were the trailing `\n`, its 16/19pt line fragment would
+ *     fall into that excluded zone — the background rect would have to be manually extended
+ *     past the clip and the bottom rounded corner would get sliced off at the tile boundary
+ *     (the original visual bug in #354).
+ *
+ * By keeping a 1pt-tall tail newline beyond the bottom padding spacer, iOS lays the spacer
+ * out as a normal interior line fragment included in usedRect/boundingRect and inside the
+ * drawing tiles, so the corner renders intact and no rect extension is needed.
+ */
 - (void)removeTrailingSpacing:(NSMutableAttributedString *)output
 {
   if (output.length == 0)
@@ -83,17 +109,36 @@
 
   // 2. Trim trailing characters
   NSUInteger logicalEnd = NSMaxRange(lastContent);
-  BOOL isCodeBlock = isLastElementCodeBlock(output);
+  BOOL isCodeBlock = isLastBlockACodeBlock(output);
+  NSRange codeRange = NSMakeRange(0, 0);
   if (isCodeBlock) {
-    NSRange codeRange;
-    [output attribute:CodeBlockAttributeName atIndex:lastContent.location effectiveRange:&codeRange];
-    logicalEnd = NSMaxRange(codeRange);
+    [output attribute:CodeBlockAttributeName
+                      atIndex:lastContent.location
+        longestEffectiveRange:&codeRange
+                      inRange:NSMakeRange(0, output.length)];
+    NSUInteger codeEnd = NSMaxRange(codeRange);
+    if (codeEnd >= output.length) {
+      [output appendAttributedString:kNewlineAttributedString];
+    }
+    logicalEnd = codeEnd + 1;
   }
 
   if (logicalEnd < output.length) {
     [output deleteCharactersInRange:NSMakeRange(logicalEnd, output.length - logicalEnd)];
   }
 
+  if (isCodeBlock && NSMaxRange(codeRange) < output.length) {
+    NSUInteger tailIdx = NSMaxRange(codeRange);
+    [output removeAttribute:CodeBlockAttributeName range:NSMakeRange(tailIdx, 1)];
+    NSParagraphStyle *style = [output attribute:NSParagraphStyleAttributeName atIndex:tailIdx effectiveRange:NULL];
+    NSMutableParagraphStyle *mutableStyle = style ? [style mutableCopy] : [[NSMutableParagraphStyle alloc] init];
+    mutableStyle.paragraphSpacing = 0;
+    mutableStyle.paragraphSpacingBefore = 0;
+    mutableStyle.minimumLineHeight = 1;
+    mutableStyle.maximumLineHeight = 1;
+    [output addAttribute:NSParagraphStyleAttributeName value:mutableStyle range:NSMakeRange(tailIdx, 1)];
+  }
+
   // 3. Zero out internal spacing for the last element (if not a code block)
   if (!isCodeBlock) {
     NSRange styleRange;
@@ -150,4 +195,4 @@
   }
 }
 
-@end
+@end

package/ios/renderer/ENRMMathInlineRenderer.m

@@ -32,7 +32,11 @@
   [attachment renderForMacOS];
 #endif
 
-  NSAttributedString *attachmentString = [NSAttributedString attributedStringWithAttachment:attachment];
+  NSMutableAttributedString *attachmentString =
+      [[NSAttributedString attributedStringWithAttachment:attachment] mutableCopy];
+  if (currentFont) {
+    [attachmentString addAttribute:NSFontAttributeName value:currentFont range:NSMakeRange(0, attachmentString.length)];
+  }
   [output appendAttributedString:attachmentString];
 }
 

package/ios/styles/ENRMFontSlot.h

@@ -1,5 +1,5 @@
 #pragma once
-#import <UIKit/UIKit.h>
+#import "ENRMUIKit.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/utils/ENRMAccessibilityLabels.h

@@ -0,0 +1,36 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ENRMAccessibilityLabels : NSObject
+
+@property (nonatomic, copy) NSString *bulletPoint;
+@property (nonatomic, copy) NSString *nestedBulletPoint;
+@property (nonatomic, copy) NSString *orderedItem;
+@property (nonatomic, copy) NSString *nestedOrderedItem;
+@property (nonatomic, copy) NSString *blockquote;
+@property (nonatomic, copy) NSString *nestedBlockquote;
+@property (nonatomic, copy) NSString *tableRow;
+@property (nonatomic, copy) NSString *mathEquation;
+@property (nonatomic, copy) NSString *rotorHeadings;
+@property (nonatomic, copy) NSString *rotorLinks;
+@property (nonatomic, copy) NSString *rotorImages;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#ifdef __cplusplus
+template <typename T> static bool ENRMAccessibilityLabelsChanged(const T &oldLabels, const T &newLabels)
+{
+  return oldLabels.list.bulletPoint != newLabels.list.bulletPoint ||
+         oldLabels.list.nestedBulletPoint != newLabels.list.nestedBulletPoint ||
+         oldLabels.list.orderedItem != newLabels.list.orderedItem ||
+         oldLabels.list.nestedOrderedItem != newLabels.list.nestedOrderedItem ||
+         oldLabels.blockquote.quote != newLabels.blockquote.quote ||
+         oldLabels.blockquote.nestedQuote != newLabels.blockquote.nestedQuote ||
+         oldLabels.table.row != newLabels.table.row || oldLabels.math.equation != newLabels.math.equation ||
+         oldLabels.rotor.headings != newLabels.rotor.headings || oldLabels.rotor.links != newLabels.rotor.links ||
+         oldLabels.rotor.images != newLabels.rotor.images;
+}
+#endif

package/ios/utils/ENRMAccessibilityLabels.m

@@ -0,0 +1,5 @@
+#import "ENRMAccessibilityLabels.h"
+
+@implementation ENRMAccessibilityLabels
+
+@end

package/ios/utils/EditMenuUtils+macOS.m

@@ -25,8 +25,9 @@ NSMenu *_Nullable buildEditMenuForSelection(NSAttributedString *attributedText,
 
   // Replace the system Copy item with our enhanced version (copies RTF/HTML/Markdown).
   // This mirrors the iOS behaviour where we replace the standard-edit Copy action.
+  NSString *copyTitle = selectionMenuConfig.copyLabel;
   NSMenuItem *enhancedCopy =
-      ENRMCreateMenuItem(@"Copy", ^{ copyAttributedStringToPasteboard(selectedText, markdown, styleConfig); });
+      ENRMCreateMenuItem(copyTitle, ^{ copyAttributedStringToPasteboard(selectedText, markdown, styleConfig); });
   NSInteger systemCopyIndex = [menu indexOfItemWithTarget:nil andAction:@selector(copy:)];
   if (systemCopyIndex != NSNotFound) {
     [menu removeItemAtIndex:systemCopyIndex];
@@ -39,13 +40,11 @@ NSMenu *_Nullable buildEditMenuForSelection(NSAttributedString *attributedText,
   }
 
   if (selectionMenuConfig.copyAsMarkdown && markdown.length > 0) {
-    [menu addItem:ENRMCreateMenuItem(@"Copy as Markdown", ^{ copyStringToPasteboard(markdown); })];
+    [menu addItem:ENRMCreateMenuItem(selectionMenuConfig.copyAsMarkdownLabel, ^{ copyStringToPasteboard(markdown); })];
   }
 
   if (selectionMenuConfig.copyImageURL && imageURLs.count > 0) {
-    NSString *title = (imageURLs.count == 1)
-                          ? @"Copy Image URL"
-                          : [NSString stringWithFormat:@"Copy %lu Image URLs", (unsigned long)imageURLs.count];
+    NSString *title = ENRMResolveImageURLsTitle(selectionMenuConfig, imageURLs.count);
     [menu addItem:ENRMCreateMenuItem(title, ^{
             NSString *urlsToCopy = [imageURLs componentsJoinedByString:@"\n"];
             copyStringToPasteboard(urlsToCopy);