react-native-enriched-markdown 0.1.1 → 0.2.0

package/ios/utils/AccessibilityInfo.h

@@ -0,0 +1,35 @@
+#import <Foundation/Foundation.h>
+
+@class RenderContext;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Container for accessibility-related data extracted from RenderContext.
+ * Used by MarkdownAccessibilityElementBuilder to build VoiceOver elements.
+ */
+@interface AccessibilityInfo : NSObject
+
+// Headings
+@property (nonatomic, copy, readonly) NSArray<NSValue *> *headingRanges;
+@property (nonatomic, copy, readonly) NSArray<NSNumber *> *headingLevels;
+
+// Links
+@property (nonatomic, copy, readonly) NSArray<NSValue *> *linkRanges;
+@property (nonatomic, copy, readonly) NSArray<NSString *> *linkURLs;
+
+// Images
+@property (nonatomic, copy, readonly) NSArray<NSValue *> *imageRanges;
+@property (nonatomic, copy, readonly) NSArray<NSString *> *imageAltTexts;
+
+// List items
+@property (nonatomic, copy, readonly) NSArray<NSValue *> *listItemRanges;
+@property (nonatomic, copy, readonly) NSArray<NSNumber *> *listItemPositions;
+@property (nonatomic, copy, readonly) NSArray<NSNumber *> *listItemDepths;
+@property (nonatomic, copy, readonly) NSArray<NSNumber *> *listItemOrdered; // YES = ordered, NO = bullet
+
++ (instancetype)infoFromContext:(RenderContext *)context;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/utils/AccessibilityInfo.m

@@ -0,0 +1,24 @@
+#import "AccessibilityInfo.h"
+#import "RenderContext.h"
+
+@implementation AccessibilityInfo
+
++ (instancetype)infoFromContext:(RenderContext *)context
+{
+  AccessibilityInfo *info = [[AccessibilityInfo alloc] init];
+  if (info) {
+    info->_headingRanges = [context.headingRanges copy];
+    info->_headingLevels = [context.headingLevels copy];
+    info->_linkRanges = [context.linkRanges copy];
+    info->_linkURLs = [context.linkURLs copy];
+    info->_imageRanges = [context.imageRanges copy];
+    info->_imageAltTexts = [context.imageAltTexts copy];
+    info->_listItemRanges = [context.listItemRanges copy];
+    info->_listItemPositions = [context.listItemPositions copy];
+    info->_listItemDepths = [context.listItemDepths copy];
+    info->_listItemOrdered = [context.listItemOrdered copy];
+  }
+  return info;
+}
+
+@end

package/ios/utils/CodeBlockBackground.m

@@ -50,22 +50,17 @@
   blockRect.origin.y += origin.y;
   blockRect.size.width = textContainer.size.width;
 
-  // For the last code block, extend to the full view height
-  // (iOS doesn't properly measure trailing newlines with custom line heights)
+  // We extend the background specifically to cover the bottom padding spacer,
+  // excluding any additional marginBottom applied via measurement.
   BOOL isLastCodeBlock = (NSMaxRange(range) == layoutManager.textStorage.length);
   if (isLastCodeBlock) {
-    CGFloat viewHeight = textContainer.size.height;
-    if (viewHeight > 0 && viewHeight < CGFLOAT_MAX) {
-      blockRect.size.height = viewHeight - blockRect.origin.y + origin.y;
-    } else {
-      // Fallback: add padding if container height not set
-      blockRect.size.height += [_config codeBlockPadding];
-    }
+    blockRect.size.height += [_config codeBlockPadding];
   }
 
   CGFloat borderWidth = [_config codeBlockBorderWidth];
   CGFloat borderRadius = [_config codeBlockBorderRadius];
   CGFloat inset = borderWidth / 2.0;
+
   CGRect insetRect = CGRectInset(blockRect, inset, inset);
   UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:insetRect cornerRadius:MAX(0, borderRadius - inset)];
 

package/ios/utils/FontUtils.h

@@ -13,6 +13,11 @@ extern "C" {
 /** Returns a cached UIFont from BlockStyle properties via RenderContext. */
 extern UIFont *cachedFontFromBlockStyle(BlockStyle *blockStyle, RenderContext *context);
 
+/** Returns the font scale multiplier, capped by maxFontSizeMultiplier.
+ *  Uses React Native's RCTFontSizeMultiplier() internally.
+ *  @param maxFontSizeMultiplier Values >= 1.0 cap the result, < 1.0 means no cap. */
+extern CGFloat RCTFontSizeMultiplierWithMax(CGFloat maxFontSizeMultiplier);
+
 #ifdef __cplusplus
 }
 #endif

package/ios/utils/FontUtils.m

@@ -1,5 +1,6 @@
 #import "FontUtils.h"
 #import "RenderContext.h"
+#import <React/RCTUtils.h>
 
 UIFont *cachedFontFromBlockStyle(BlockStyle *blockStyle, RenderContext *context)
 {
@@ -11,3 +12,16 @@ UIFont *cachedFontFromBlockStyle(BlockStyle *blockStyle, RenderContext *context)
   }
   return [context cachedFontForSize:blockStyle.fontSize family:blockStyle.fontFamily weight:blockStyle.fontWeight];
 }
+
+CGFloat RCTFontSizeMultiplierWithMax(CGFloat maxFontSizeMultiplier)
+{
+  CGFloat multiplier = RCTFontSizeMultiplier();
+
+  // Apply maxFontSizeMultiplier cap if >= 1.0
+  // Values < 1.0 (including 0 and NaN) mean no cap is applied
+  if (!isnan(maxFontSizeMultiplier) && maxFontSizeMultiplier >= 1.0) {
+    return fmin(maxFontSizeMultiplier, multiplier);
+  }
+
+  return multiplier;
+}

package/ios/utils/HTMLGenerator.m

@@ -1,7 +1,7 @@
 #import "HTMLGenerator.h"
 #import "BlockquoteBorder.h"
 #import "CodeBackground.h"
-#import "ImageAttachment.h"
+#import "EnrichedMarkdownImageAttachment.h"
 #import "LastElementUtils.h"
 #import "ListItemRenderer.h"
 #import "RenderContext.h"
@@ -100,6 +100,8 @@ typedef struct {
 @property (nonatomic) CGFloat thematicBreakHeight;
 @property (nonatomic) CGFloat thematicBreakMarginTop;
 @property (nonatomic) CGFloat thematicBreakMarginBottom;
+@property (nonatomic, copy) NSString *strikethroughColor;
+@property (nonatomic, copy) NSString *underlineColor;
 @end
 
 @implementation CachedStyles
@@ -276,6 +278,8 @@ static CachedStyles *cacheStyles(StyleConfig *styleConfig)
   cache.thematicBreakHeight = [styleConfig thematicBreakHeight];
   cache.thematicBreakMarginTop = [styleConfig thematicBreakMarginTop];
   cache.thematicBreakMarginBottom = [styleConfig thematicBreakMarginBottom];
+  cache.strikethroughColor = colorToCSS([styleConfig strikethroughColor]);
+  cache.underlineColor = colorToCSS([styleConfig underlineColor]);
 
   return cache;
 }
@@ -430,8 +434,8 @@ static void generateInlineHTML(NSMutableString *html, NSAttributedString *attrib
 
                         if ([text containsString:kObjectReplacementChar]) {
                           id attachment = attrs[NSAttachmentAttributeName];
-                          if ([attachment isKindOfClass:[ImageAttachment class]]) {
-                            ImageAttachment *img = (ImageAttachment *)attachment;
+                          if ([attachment isKindOfClass:[EnrichedMarkdownImageAttachment class]]) {
+                            EnrichedMarkdownImageAttachment *img = (EnrichedMarkdownImageAttachment *)attachment;
                             if (img.imageURL) {
                               if (img.isInline) {
                                 [html appendFormat:
@@ -501,10 +505,20 @@ static void generateInlineHTML(NSMutableString *html, NSAttributedString *attrib
                           }
                         }
 
-                        if ([strikethrough integerValue] > 0)
-                          [html appendString:@"<s>"];
-                        if ([underline integerValue] > 0 && !linkAttr)
-                          [html appendString:@"<u>"];
+                        if ([strikethrough integerValue] > 0) {
+                          if (styles.strikethroughColor && ![styles.strikethroughColor isEqualToString:@"inherit"]) {
+                            [html appendFormat:@"<s style=\"text-decoration-color: %@;\">", styles.strikethroughColor];
+                          } else {
+                            [html appendString:@"<s>"];
+                          }
+                        }
+                        if ([underline integerValue] > 0 && !linkAttr) {
+                          if (styles.underlineColor && ![styles.underlineColor isEqualToString:@"inherit"]) {
+                            [html appendFormat:@"<u style=\"text-decoration-color: %@;\">", styles.underlineColor];
+                          } else {
+                            [html appendString:@"<u>"];
+                          }
+                        }
 
                         [html appendString:escapeHTML(text)];
 

package/ios/utils/MarkdownAccessibilityElementBuilder.h

@@ -0,0 +1,45 @@
+#import <UIKit/UIKit.h>
+
+@class AccessibilityInfo;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Builds UIAccessibilityElement objects from markdown content for VoiceOver.
+ * Handles headings, links, images, lists, and custom rotor navigation.
+ */
+@interface MarkdownAccessibilityElementBuilder : NSObject
+
+/**
+ * Builds accessibility elements for the given text view content.
+ * - Headings get UIAccessibilityTraitHeader
+ * - Links get UIAccessibilityTraitLink
+ * - Images get UIAccessibilityTraitImage
+ * - List items get position hints (e.g., "bullet point", "list item 1")
+ * - Other content gets UIAccessibilityTraitStaticText
+ */
++ (NSMutableArray<UIAccessibilityElement *> *)buildElementsForTextView:(UITextView *)textView
+                                                                  info:(AccessibilityInfo *)info
+                                                             container:(id)container;
+
+/** Filters elements with UIAccessibilityTraitHeader trait. */
++ (NSArray<UIAccessibilityElement *> *)filterHeadingElements:(NSArray<UIAccessibilityElement *> *)elements;
+
+/** Filters elements with UIAccessibilityTraitLink trait. */
++ (NSArray<UIAccessibilityElement *> *)filterLinkElements:(NSArray<UIAccessibilityElement *> *)elements;
+
+/** Filters elements with UIAccessibilityTraitImage trait. */
++ (NSArray<UIAccessibilityElement *> *)filterImageElements:(NSArray<UIAccessibilityElement *> *)elements;
+
+/** Creates a custom rotor for heading navigation. */
++ (UIAccessibilityCustomRotor *)createHeadingRotorWithElements:(NSArray<UIAccessibilityElement *> *)elements;
+
+/** Creates a custom rotor for link navigation. */
++ (UIAccessibilityCustomRotor *)createLinkRotorWithElements:(NSArray<UIAccessibilityElement *> *)elements;
+
+/** Creates a custom rotor for image navigation. */
++ (UIAccessibilityCustomRotor *)createImageRotorWithElements:(NSArray<UIAccessibilityElement *> *)elements;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/utils/MarkdownAccessibilityElementBuilder.m

@@ -0,0 +1,323 @@
+#import "MarkdownAccessibilityElementBuilder.h"
+#import "AccessibilityInfo.h"
+
+typedef NS_ENUM(NSInteger, ElementType) { ElementTypeText, ElementTypeLink, ElementTypeImage };
+
+@implementation MarkdownAccessibilityElementBuilder
+
+#pragma mark - Public API
+
++ (NSMutableArray<UIAccessibilityElement *> *)buildElementsForTextView:(UITextView *)textView
+                                                                  info:(AccessibilityInfo *)info
+                                                             container:(id)container
+{
+  NSString *fullString = textView.attributedText.string;
+  if (fullString.length == 0)
+    return [NSMutableArray array];
+
+  [textView.layoutManager ensureLayoutForTextContainer:textView.textContainer];
+
+  NSMutableArray<UIAccessibilityElement *> *elements = [NSMutableArray array];
+  NSUInteger currentPos = 0;
+
+  while (currentPos < fullString.length) {
+    NSRange paragraphRange = [fullString paragraphRangeForRange:NSMakeRange(currentPos, 0)];
+    NSString *trimmed = [[fullString substringWithRange:paragraphRange]
+        stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+
+    if (trimmed.length > 0) {
+      NSArray *links = [self linksInRange:paragraphRange info:info];
+      NSArray *images = [self imagesInRange:paragraphRange info:info];
+      NSArray *specials = [links arrayByAddingObjectsFromArray:images];
+
+      NSInteger level = [self headingLevelForRange:paragraphRange info:info];
+      NSDictionary *list = [self listItemInfoForRange:paragraphRange info:info];
+
+      if (specials.count == 0) {
+        [self addTextElementsPerLineTo:elements
+                                 range:paragraphRange
+                              fullText:fullString
+                               heading:level
+                              listInfo:list
+                                  view:textView
+                             container:container];
+      } else {
+        [elements addObjectsFromArray:[self segmentedElementsForParagraph:paragraphRange
+                                                                 fullText:fullString
+                                                             headingLevel:level
+                                                                 listInfo:list
+                                                                 specials:specials
+                                                               inTextView:textView
+                                                                container:container]];
+      }
+    }
+    currentPos = NSMaxRange(paragraphRange);
+  }
+  return elements;
+}
+
+#pragma mark - Segmentation
+
++ (NSArray<UIAccessibilityElement *> *)segmentedElementsForParagraph:(NSRange)paragraphRange
+                                                            fullText:(NSString *)fullText
+                                                        headingLevel:(NSInteger)headingLevel
+                                                            listInfo:(NSDictionary *)listInfo
+                                                            specials:(NSArray *)specials
+                                                          inTextView:(UITextView *)textView
+                                                           container:(id)container
+{
+  NSMutableArray<UIAccessibilityElement *> *elements = [NSMutableArray array];
+  NSArray *sortedSpecials = [specials sortedArrayUsingComparator:^NSComparisonResult(NSDictionary *a, NSDictionary *b) {
+    return [@([a[@"range"] rangeValue].location) compare:@([b[@"range"] rangeValue].location)];
+  }];
+
+  NSUInteger segmentStart = paragraphRange.location;
+  for (NSDictionary *item in sortedSpecials) {
+    NSRange itemRange = [item[@"range"] rangeValue];
+
+    if (itemRange.location > segmentStart) {
+      NSRange beforeRange = NSMakeRange(segmentStart, itemRange.location - segmentStart);
+      [self addTextElementsPerLineTo:elements
+                               range:beforeRange
+                            fullText:fullText
+                             heading:headingLevel
+                            listInfo:listInfo
+                                view:textView
+                           container:container];
+    }
+
+    BOOL isImg = item[@"altText"] != nil;
+    NSString *label = isImg ? item[@"altText"] : [fullText substringWithRange:itemRange];
+    [elements addObject:[self createElementForRange:itemRange
+                                               type:isImg ? ElementTypeImage : ElementTypeLink
+                                               text:label
+                                           isLinked:isImg ? [item[@"isLinked"] boolValue] : YES
+                                            heading:0
+                                           listInfo:listInfo
+                                               view:textView
+                                          container:container]];
+    segmentStart = NSMaxRange(itemRange);
+  }
+
+  if (segmentStart < NSMaxRange(paragraphRange)) {
+    NSRange afterRange = NSMakeRange(segmentStart, NSMaxRange(paragraphRange) - segmentStart);
+    [self addTextElementsPerLineTo:elements
+                             range:afterRange
+                          fullText:fullText
+                           heading:headingLevel
+                          listInfo:listInfo
+                              view:textView
+                         container:container];
+  }
+  return elements;
+}
+
+#pragma mark - Factory & Precise Splitting
+
++ (UIAccessibilityElement *)createElementForRange:(NSRange)range
+                                             type:(ElementType)type
+                                             text:(NSString *)text
+                                         isLinked:(BOOL)linked
+                                          heading:(NSInteger)level
+                                         listInfo:(NSDictionary *)listInfo
+                                             view:(UITextView *)tv
+                                        container:(id)c
+{
+  UIAccessibilityElement *el = [[UIAccessibilityElement alloc] initWithAccessibilityContainer:c];
+  el.accessibilityLabel = (type == ElementTypeImage && text.length == 0) ? NSLocalizedString(@"Image", @"") : text;
+  el.accessibilityFrameInContainerSpace = [self frameForRange:range inTextView:tv container:c];
+
+  NSMutableArray *values = [NSMutableArray array];
+
+  if (type == ElementTypeImage) {
+    el.accessibilityTraits =
+        linked ? (UIAccessibilityTraitImage | UIAccessibilityTraitLink) : UIAccessibilityTraitImage;
+  } else if (type == ElementTypeLink) {
+    el.accessibilityTraits = UIAccessibilityTraitLink;
+  } else if (level > 0) {
+    el.accessibilityTraits = UIAccessibilityTraitHeader;
+    [values addObject:[NSString stringWithFormat:NSLocalizedString(@"heading level %ld", @""), (long)level]];
+  }
+
+  if (el.accessibilityTraits & UIAccessibilityTraitLink) {
+    el.accessibilityHint = NSLocalizedString(@"Tap to open link", @"");
+  }
+
+  // Append List Info to values if it exists
+  if (listInfo && type != ElementTypeImage) {
+    [values addObject:[self formatListAnnouncement:listInfo]];
+  }
+
+  // Combine all values (Heading Level + List Position) into one string
+  if (values.count > 0) {
+    el.accessibilityValue = [values componentsJoinedByString:@", "];
+  }
+
+  return el;
+}
+
++ (void)addTextElementsPerLineTo:(NSMutableArray *)elements
+                           range:(NSRange)range
+                        fullText:(NSString *)fullText
+                         heading:(NSInteger)level
+                        listInfo:(NSDictionary *)listInfo
+                            view:(UITextView *)tv
+                       container:(id)c
+{
+  NSLayoutManager *lm = tv.layoutManager;
+  NSRange glyphRange = [lm glyphRangeForCharacterRange:range actualCharacterRange:NULL];
+
+  [lm enumerateLineFragmentsForGlyphRange:glyphRange
+                               usingBlock:^(CGRect rect, CGRect usedRect, NSTextContainer *tc, NSRange lineGlyphRange,
+                                            BOOL *stop) {
+                                 NSRange intersection = NSIntersectionRange(glyphRange, lineGlyphRange);
+                                 if (intersection.length > 0) {
+                                   NSRange charRange = [lm characterRangeForGlyphRange:intersection
+                                                                      actualGlyphRange:NULL];
+                                   NSString *trimmed = [[fullText substringWithRange:charRange]
+                                       stringByTrimmingCharactersInSet:[NSCharacterSet
+                                                                           whitespaceAndNewlineCharacterSet]];
+                                   if (trimmed.length > 0) {
+                                     [elements addObject:[self createElementForRange:charRange
+                                                                                type:ElementTypeText
+                                                                                text:trimmed
+                                                                            isLinked:NO
+                                                                             heading:level
+                                                                            listInfo:listInfo
+                                                                                view:tv
+                                                                           container:c]];
+                                   }
+                                 }
+                               }];
+}
+
+#pragma mark - Helpers
+
++ (NSString *)formatListAnnouncement:(NSDictionary *)info
+{
+  NSString *prefix = [info[@"depth"] integerValue] > 1 ? @"nested " : @"";
+  return [info[@"isOrdered"] boolValue]
+             ? [NSString stringWithFormat:@"%@list item %ld", prefix, (long)[info[@"position"] integerValue]]
+             : [NSString stringWithFormat:@"%@bullet point", prefix];
+}
+
++ (CGRect)frameForRange:(NSRange)range inTextView:(UITextView *)textView container:(id)container
+{
+  NSRange glyphRange = [textView.layoutManager glyphRangeForCharacterRange:range actualCharacterRange:NULL];
+  CGRect rect = [textView.layoutManager boundingRectForGlyphRange:glyphRange inTextContainer:textView.textContainer];
+  rect = CGRectOffset(CGRectInset(rect, -2, -2), textView.textContainerInset.left, textView.textContainerInset.top);
+  return [(UIView *)container convertRect:CGRectIntegral(rect) fromView:textView];
+}
+
+#pragma mark - Data Helpers
+
++ (NSInteger)headingLevelForRange:(NSRange)range info:(AccessibilityInfo *)info
+{
+  for (NSUInteger i = 0; i < info.headingRanges.count; i++) {
+    if (NSIntersectionRange(range, [info.headingRanges[i] rangeValue]).length > 0)
+      return [info.headingLevels[i] integerValue];
+  }
+  return 0;
+}
+
++ (NSArray *)linksInRange:(NSRange)range info:(AccessibilityInfo *)info
+{
+  NSMutableArray *links = [NSMutableArray array];
+  for (NSUInteger i = 0; i < info.linkRanges.count; i++) {
+    if (NSIntersectionRange(range, [info.linkRanges[i] rangeValue]).length > 0) {
+      [links addObject:@{@"range" : info.linkRanges[i], @"url" : info.linkURLs[i] ?: @""}];
+    }
+  }
+  return links;
+}
+
++ (NSArray *)imagesInRange:(NSRange)range info:(AccessibilityInfo *)info
+{
+  NSMutableArray *images = [NSMutableArray array];
+  for (NSUInteger i = 0; i < info.imageRanges.count; i++) {
+    NSRange imgRange = [info.imageRanges[i] rangeValue];
+    if (NSIntersectionRange(range, imgRange).length > 0) {
+      BOOL linked = NO;
+      for (NSValue *val in info.linkRanges)
+        if (NSIntersectionRange(imgRange, val.rangeValue).length > 0) {
+          linked = YES;
+          break;
+        }
+      [images addObject:@{
+        @"range" : info.imageRanges[i],
+        @"altText" : info.imageAltTexts[i] ?: @"",
+        @"isLinked" : @(linked)
+      }];
+    }
+  }
+  return images;
+}
+
++ (NSDictionary *)listItemInfoForRange:(NSRange)range info:(AccessibilityInfo *)info
+{
+  if (!info)
+    return nil;
+  for (NSUInteger i = 0; i < info.listItemRanges.count; i++) {
+    if (NSIntersectionRange(range, [info.listItemRanges[i] rangeValue]).length > 0) {
+      return @{
+        @"position" : info.listItemPositions[i],
+        @"depth" : info.listItemDepths[i],
+        @"isOrdered" : info.listItemOrdered[i]
+      };
+    }
+  }
+  return nil;
+}
+
+#pragma mark - Rotors
+
++ (NSArray *)filterElements:(NSArray *)els withTrait:(UIAccessibilityTraits)trait
+{
+  return [els filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(UIAccessibilityElement *el, id b) {
+                return (el.accessibilityTraits & trait) != 0;
+              }]];
+}
+
++ (UIAccessibilityCustomRotor *)createRotorWithName:(NSString *)name elements:(NSArray *)els
+{
+  return [[UIAccessibilityCustomRotor alloc]
+         initWithName:name
+      itemSearchBlock:^UIAccessibilityCustomRotorItemResult *(UIAccessibilityCustomRotorSearchPredicate *p) {
+        if (els.count == 0)
+          return nil;
+        NSInteger idx = p.currentItem.targetElement ? [els indexOfObject:p.currentItem.targetElement] : NSNotFound;
+        NSInteger next = (p.searchDirection == UIAccessibilityCustomRotorDirectionNext)
+                             ? (idx == NSNotFound ? 0 : idx + 1)
+                             : (idx == NSNotFound ? els.count - 1 : idx - 1);
+        return (next >= 0 && next < els.count)
+                   ? [[UIAccessibilityCustomRotorItemResult alloc] initWithTargetElement:els[next] targetRange:nil]
+                   : nil;
+      }];
+}
+
++ (NSArray<UIAccessibilityElement *> *)filterHeadingElements:(NSArray *)els
+{
+  return [self filterElements:els withTrait:UIAccessibilityTraitHeader];
+}
++ (NSArray<UIAccessibilityElement *> *)filterLinkElements:(NSArray *)els
+{
+  return [self filterElements:els withTrait:UIAccessibilityTraitLink];
+}
++ (NSArray<UIAccessibilityElement *> *)filterImageElements:(NSArray *)els
+{
+  return [self filterElements:els withTrait:UIAccessibilityTraitImage];
+}
++ (UIAccessibilityCustomRotor *)createHeadingRotorWithElements:(NSArray *)els
+{
+  return [self createRotorWithName:NSLocalizedString(@"Headings", @"") elements:els];
+}
++ (UIAccessibilityCustomRotor *)createLinkRotorWithElements:(NSArray *)els
+{
+  return [self createRotorWithName:NSLocalizedString(@"Links", @"") elements:els];
+}
++ (UIAccessibilityCustomRotor *)createImageRotorWithElements:(NSArray *)els
+{
+  return [self createRotorWithName:NSLocalizedString(@"Images", @"") elements:els];
+}
+
+@end

package/ios/utils/MarkdownExtractor.m

@@ -1,6 +1,6 @@
 #import "MarkdownExtractor.h"
 #import "BlockquoteBorder.h"
-#import "ImageAttachment.h"
+#import "EnrichedMarkdownImageAttachment.h"
 #import "LastElementUtils.h"
 #import "RuntimeKeys.h"
 #import "ThematicBreakAttachment.h"
@@ -67,7 +67,8 @@ static void extractFontTraits(NSDictionary *attrs, BOOL *isBold, BOOL *isItalic,
   }
 }
 
-static NSString *applyInlineFormatting(NSString *text, BOOL isBold, BOOL isItalic, BOOL isMonospace, NSString *linkURL)
+static NSString *applyInlineFormatting(NSString *text, BOOL isBold, BOOL isItalic, BOOL isMonospace,
+                                       BOOL isStrikethrough, BOOL isUnderline, NSString *linkURL)
 {
   NSMutableString *result = [NSMutableString stringWithString:text];
 
@@ -75,6 +76,12 @@ static NSString *applyInlineFormatting(NSString *text, BOOL isBold, BOOL isItali
   if (isMonospace && !linkURL) {
     result = [NSMutableString stringWithFormat:@"`%@`", result];
   }
+  if (isStrikethrough) {
+    result = [NSMutableString stringWithFormat:@"~~%@~~", result];
+  }
+  if (isUnderline && !linkURL) {
+    result = [NSMutableString stringWithFormat:@"<u>%@</u>", result];
+  }
   if (isItalic) {
     result = [NSMutableString stringWithFormat:@"*%@*", result];
   }
@@ -128,8 +135,8 @@ NSString *_Nullable extractMarkdownFromAttributedString(NSAttributedString *attr
 
                         // Images and Thematic Breaks
                         NSTextAttachment *attachment = attrs[NSAttachmentAttributeName];
-                        if ([attachment isKindOfClass:[ImageAttachment class]]) {
-                          ImageAttachment *img = (ImageAttachment *)attachment;
+                        if ([attachment isKindOfClass:[EnrichedMarkdownImageAttachment class]]) {
+                          EnrichedMarkdownImageAttachment *img = (EnrichedMarkdownImageAttachment *)attachment;
                           if (!img.imageURL)
                             return;
 
@@ -255,8 +262,14 @@ NSString *_Nullable extractMarkdownFromAttributedString(NSAttributedString *attr
                         BOOL isBold, isItalic, isMonospace;
                         extractFontTraits(attrs, &isBold, &isItalic, &isMonospace);
 
+                        NSNumber *strikethroughStyle = attrs[NSStrikethroughStyleAttributeName];
+                        BOOL isStrikethrough = (strikethroughStyle != nil && [strikethroughStyle integerValue] != 0);
+                        NSNumber *underlineStyle = attrs[NSUnderlineStyleAttributeName];
+                        BOOL isUnderline = (underlineStyle != nil && [underlineStyle integerValue] != 0);
+
                         NSString *linkURL = attrs[NSLinkAttributeName];
-                        NSString *segment = applyInlineFormatting(text, isBold, isItalic, isMonospace, linkURL);
+                        NSString *segment = applyInlineFormatting(text, isBold, isItalic, isMonospace, isStrikethrough,
+                                                                  isUnderline, linkURL);
 
                         // Add block prefixes at line start
                         if (isAtLineStart(result)) {

package/ios/utils/ParagraphStyleUtils.h

@@ -3,11 +3,19 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+__BEGIN_DECLS
+
 extern NSAttributedString *kNewlineAttributedString;
 
 NSMutableParagraphStyle *getOrCreateParagraphStyle(NSMutableAttributedString *output, NSUInteger index);
-void applyParagraphSpacing(NSMutableAttributedString *output, NSUInteger start, CGFloat marginBottom);
-void applyBlockSpacing(NSMutableAttributedString *output, CGFloat marginBottom);
+void applyParagraphSpacingAfter(NSMutableAttributedString *output, NSUInteger start, CGFloat marginBottom);
+void applyParagraphSpacingBefore(NSMutableAttributedString *output, NSRange range, CGFloat marginTop);
+NSUInteger applyBlockSpacingBefore(NSMutableAttributedString *output, NSUInteger insertionPoint, CGFloat marginTop);
+void applyBlockSpacingAfter(NSMutableAttributedString *output, CGFloat marginBottom);
 void applyLineHeight(NSMutableAttributedString *output, NSRange range, CGFloat lineHeight);
+void applyTextAlignment(NSMutableAttributedString *output, NSRange range, NSTextAlignment textAlign);
+NSTextAlignment textAlignmentFromString(NSString *textAlign);
+
+__END_DECLS
 
 NS_ASSUME_NONNULL_END