react-native-enriched-markdown 0.1.1 → 0.2.0

package/ios/renderer/ParagraphRenderer.m

@@ -20,12 +20,9 @@
   return self;
 }
 
-#pragma mark - Rendering
-
 - (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
 {
-  // 1. Context-Aware Styling
-  // We only set the block style if no parent element (like a list or blockquote) has already established one.
+  // Only set block style if a parent element (e.g. List, Blockquote) hasn't already established one
   BOOL isTopLevel = (context.currentBlockType == BlockTypeNone);
 
   if (isTopLevel) {
@@ -33,37 +30,51 @@
   }
 
   NSUInteger start = output.length;
+  BOOL shouldApplyMargin =
+      (context.currentBlockType == BlockTypeNone || context.currentBlockType == BlockTypeParagraph);
+
+  // Detect if the paragraph is a wrapper for a standalone image to use image-specific spacing
+  BOOL isBlockImage = (node.children.count == 1 && ((MarkdownASTNode *)node.children[0]).type == MarkdownNodeTypeImage);
+  CGFloat marginTop = isBlockImage ? _config.imageMarginTop : _config.paragraphMarginTop;
+
+  NSUInteger contentStart = start;
+
+  // Handle leading margin for the first element in the document (Index 0 check)
+  if (shouldApplyMargin && start == 0) {
+    NSUInteger offset = applyBlockSpacingBefore(output, 0, marginTop);
+    contentStart += offset;
+    start += offset;
+  }
+
   @try {
     [_rendererFactory renderChildrenOfNode:node into:output context:context];
   } @finally {
-    // Only clear the style if this paragraph was the one that set it.
     if (isTopLevel) {
       [context clearBlockStyle];
     }
   }
 
-  // 2. Geometry and Spacing Logic
   if (output.length <= start)
     return;
   NSRange range = NSMakeRange(start, output.length - start);
 
-  // Check if this paragraph is purely a wrapper for a block image.
-  // Images often require different spacing and should not have standard line height applied.
-  BOOL isBlockImage = (node.children.count == 1 && ((MarkdownASTNode *)node.children[0]).type == MarkdownNodeTypeImage);
-
-  // Apply line height only for text paragraphs to avoid unwanted gaps above/below images.
+  // Avoid standard line height on block images to prevent vertical alignment issues
   if (!isBlockImage) {
     applyLineHeight(output, range, _config.paragraphLineHeight);
   }
 
-  // 3. Margin Application
-  // Only top-level paragraphs apply bottom margins; nested paragraphs defer to their parents.
+  applyTextAlignment(output, range, _config.paragraphTextAlign);
+
+  // Apply marginTop for non-index-0 elements using paragraphSpacingBefore
+  if (shouldApplyMargin && contentStart != 1) {
+    applyParagraphSpacingBefore(output, range, marginTop);
+  }
+
   CGFloat marginBottom = 0;
-  if (isTopLevel) {
+  if (shouldApplyMargin) {
     marginBottom = isBlockImage ? _config.imageMarginBottom : _config.paragraphMarginBottom;
   }
-
-  applyParagraphSpacing(output, start, marginBottom);
+  applyParagraphSpacingAfter(output, start, marginBottom);
 }
 
 @end

package/ios/renderer/RenderContext.h

@@ -25,6 +25,15 @@ typedef NS_ENUM(NSInteger, ListType) { ListTypeUnordered, ListTypeOrdered };
 @interface RenderContext : NSObject
 @property (nonatomic, strong) NSMutableArray<NSValue *> *linkRanges;
 @property (nonatomic, strong) NSMutableArray<NSString *> *linkURLs;
+@property (nonatomic, strong) NSMutableArray<NSValue *> *headingRanges;
+@property (nonatomic, strong) NSMutableArray<NSNumber *> *headingLevels;
+@property (nonatomic, strong) NSMutableArray<NSValue *> *imageRanges;
+@property (nonatomic, strong) NSMutableArray<NSString *> *imageAltTexts;
+@property (nonatomic, strong) NSMutableArray<NSString *> *imageURLs;
+@property (nonatomic, strong) NSMutableArray<NSValue *> *listItemRanges;
+@property (nonatomic, strong) NSMutableArray<NSNumber *> *listItemPositions; // Position in parent list (1, 2, 3...)
+@property (nonatomic, strong) NSMutableArray<NSNumber *> *listItemDepths;  // Nesting depth (1 = top level, 2+ = nested)
+@property (nonatomic, strong) NSMutableArray<NSNumber *> *listItemOrdered; // YES = ordered, NO = unordered (bullet)
 @property (nonatomic, assign) BlockType currentBlockType;
 @property (nonatomic, strong) BlockStyle *currentBlockStyle;
 @property (nonatomic, assign) NSInteger currentHeadingLevel;
@@ -32,6 +41,8 @@ typedef NS_ENUM(NSInteger, ListType) { ListTypeUnordered, ListTypeOrdered };
 @property (nonatomic, assign) NSInteger listDepth;
 @property (nonatomic, assign) ListType listType;
 @property (nonatomic, assign) NSInteger listItemNumber;
+@property (nonatomic, assign) BOOL allowFontScaling;
+@property (nonatomic, assign) CGFloat maxFontSizeMultiplier;
 
 - (instancetype)init;
 - (void)reset;
@@ -40,6 +51,12 @@ typedef NS_ENUM(NSInteger, ListType) { ListTypeUnordered, ListTypeOrdered };
 - (NSMutableParagraphStyle *)spacerStyleWithHeight:(CGFloat)height spacing:(CGFloat)spacing;
 - (NSMutableParagraphStyle *)blockSpacerStyleWithMargin:(CGFloat)margin;
 - (void)registerLinkRange:(NSRange)range url:(NSString *)url;
+- (void)registerHeadingRange:(NSRange)range level:(NSInteger)level text:(NSString *)text;
+- (void)registerImageRange:(NSRange)range altText:(NSString *)altText url:(NSString *)url;
+- (void)registerListItemRange:(NSRange)range
+                     position:(NSInteger)position
+                        depth:(NSInteger)depth
+                    isOrdered:(BOOL)isOrdered;
 - (void)setBlockStyle:(BlockType)type
              fontSize:(CGFloat)fontSize
            fontFamily:(NSString *)fontFamily

package/ios/renderer/RenderContext.m

@@ -1,5 +1,6 @@
 #import "RenderContext.h"
 #import "CodeBackground.h"
+#import "FontUtils.h"
 #import <React/RCTFont.h>
 
 @implementation BlockStyle
@@ -16,8 +17,19 @@
   if (self = [super init]) {
     _linkRanges = [NSMutableArray array];
     _linkURLs = [NSMutableArray array];
+    _headingRanges = [NSMutableArray array];
+    _headingLevels = [NSMutableArray array];
+    _imageRanges = [NSMutableArray array];
+    _imageAltTexts = [NSMutableArray array];
+    _imageURLs = [NSMutableArray array];
+    _listItemRanges = [NSMutableArray array];
+    _listItemPositions = [NSMutableArray array];
+    _listItemDepths = [NSMutableArray array];
+    _listItemOrdered = [NSMutableArray array];
     _fontCache = [NSMutableDictionary dictionary];
     _currentBlockStyle = [[BlockStyle alloc] init];
+    _allowFontScaling = YES;
+    _maxFontSizeMultiplier = 0;
 
     NSMutableParagraphStyle *spacerTemplate = [[NSMutableParagraphStyle alloc] init];
     _baseSpacerTemplate = [spacerTemplate copy];
@@ -36,8 +48,11 @@
 
 - (UIFont *)cachedFontForSize:(CGFloat)fontSize family:(NSString *)fontFamily weight:(NSString *)fontWeight
 {
+  CGFloat effectiveMultiplier = _allowFontScaling ? RCTFontSizeMultiplierWithMax(_maxFontSizeMultiplier) : 1.0;
+
   NSString *weightKey = (fontWeight.length > 0) ? fontWeight : @"";
-  NSString *key = [NSString stringWithFormat:@"%.1f|%@|%@", fontSize, fontFamily ?: @"", weightKey];
+  NSString *key =
+      [NSString stringWithFormat:@"%.1f|%@|%@|%.2f", fontSize, fontFamily ?: @"", weightKey, effectiveMultiplier];
 
   UIFont *cached = _fontCache[key];
   if (cached) {
@@ -52,7 +67,7 @@
                               weight:effectiveWeight
                                style:nil
                              variant:nil
-                     scaleMultiplier:1];
+                     scaleMultiplier:effectiveMultiplier];
 
   if (font) {
     _fontCache[key] = font;
@@ -88,6 +103,46 @@
   [self.linkURLs addObject:url ?: @""];
 }
 
+- (void)registerHeadingRange:(NSRange)range level:(NSInteger)level text:(NSString *)text
+{
+  if (range.length == 0)
+    return;
+  [self.headingRanges addObject:[NSValue valueWithRange:range]];
+  [self.headingLevels addObject:@(level)];
+}
+
+- (void)registerImageRange:(NSRange)range altText:(NSString *)altText url:(NSString *)url
+{
+  if (range.length == 0)
+    return;
+  [self.imageRanges addObject:[NSValue valueWithRange:range]];
+  [self.imageAltTexts addObject:altText ?: @""];
+  [self.imageURLs addObject:url ?: @""];
+}
+
+#pragma mark - Registration Helpers
+
+- (void)registerListItemRange:(NSRange)range
+                     position:(NSInteger)position
+                        depth:(NSInteger)depth
+                    isOrdered:(BOOL)isOrdered
+{
+  if (![self isValidRange:range])
+    return;
+
+  [self.listItemRanges addObject:[NSValue valueWithRange:range]];
+  [self.listItemPositions addObject:@(position)];
+  [self.listItemDepths addObject:@(depth)];
+  [self.listItemOrdered addObject:@(isOrdered)];
+}
+
+#pragma mark - Private
+
+- (BOOL)isValidRange:(NSRange)range
+{
+  return range.length > 0 && range.location != NSNotFound;
+}
+
 #pragma mark - Block Style Management
 
 /**
@@ -175,6 +230,15 @@
 {
   [_linkRanges removeAllObjects];
   [_linkURLs removeAllObjects];
+  [_headingRanges removeAllObjects];
+  [_headingLevels removeAllObjects];
+  [_imageRanges removeAllObjects];
+  [_imageAltTexts removeAllObjects];
+  [_imageURLs removeAllObjects];
+  [_listItemRanges removeAllObjects];
+  [_listItemPositions removeAllObjects];
+  [_listItemDepths removeAllObjects];
+  [_listItemOrdered removeAllObjects];
   [self clearBlockStyle];
 
   _blockquoteDepth = 0;

package/ios/renderer/RendererFactory.m

@@ -10,10 +10,12 @@
 #import "ListRenderer.h"
 #import "ParagraphRenderer.h"
 #import "RenderContext.h"
+#import "StrikethroughRenderer.h"
 #import "StrongRenderer.h"
 #import "StyleConfig.h"
 #import "TextRenderer.h"
 #import "ThematicBreakRenderer.h"
+#import "UnderlineRenderer.h"
 
 @implementation RendererFactory {
   StyleConfig *_config;
@@ -64,6 +66,10 @@
       return [[StrongRenderer alloc] initWithRendererFactory:self config:_config];
     case MarkdownNodeTypeEmphasis:
       return [[EmphasisRenderer alloc] initWithRendererFactory:self config:_config];
+    case MarkdownNodeTypeStrikethrough:
+      return [[StrikethroughRenderer alloc] initWithRendererFactory:self config:_config];
+    case MarkdownNodeTypeUnderline:
+      return [[UnderlineRenderer alloc] initWithRendererFactory:self config:_config];
     case MarkdownNodeTypeParagraph:
       return [[ParagraphRenderer alloc] initWithRendererFactory:self config:_config];
     case MarkdownNodeTypeLink:

package/ios/renderer/StrikethroughRenderer.h

@@ -0,0 +1,6 @@
+#pragma once
+#import "NodeRenderer.h"
+
+@interface StrikethroughRenderer : NSObject <NodeRenderer>
+- (instancetype)initWithRendererFactory:(id)rendererFactory config:(id)config;
+@end

package/ios/renderer/StrikethroughRenderer.m

@@ -0,0 +1,40 @@
+#import "StrikethroughRenderer.h"
+#import "MarkdownASTNode.h"
+#import "RenderContext.h"
+#import "RendererFactory.h"
+#import "StyleConfig.h"
+
+@implementation StrikethroughRenderer {
+  RendererFactory *_rendererFactory;
+  StyleConfig *_config;
+}
+
+- (instancetype)initWithRendererFactory:(id)rendererFactory config:(id)config
+{
+  if (self = [super init]) {
+    _rendererFactory = rendererFactory;
+    _config = (StyleConfig *)config;
+  }
+  return self;
+}
+
+#pragma mark - Rendering
+
+- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+{
+  NSUInteger start = output.length;
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
+
+  NSRange range = NSMakeRange(start, output.length - start);
+  if (range.length == 0)
+    return;
+
+  // Apply strikethrough style
+  [output addAttribute:NSStrikethroughStyleAttributeName value:@(NSUnderlineStyleSingle) range:range];
+
+  // Apply strikethrough line color (not text color)
+  UIColor *strikethroughColor = [_config strikethroughColor];
+  [output addAttribute:NSStrikethroughColorAttributeName value:strikethroughColor range:range];
+}
+
+@end

package/ios/renderer/UnderlineRenderer.h

@@ -0,0 +1,6 @@
+#import "NodeRenderer.h"
+#import <Foundation/Foundation.h>
+
+@interface UnderlineRenderer : NSObject <NodeRenderer>
+- (instancetype)initWithRendererFactory:(id)rendererFactory config:(id)config;
+@end

package/ios/renderer/UnderlineRenderer.m

@@ -0,0 +1,39 @@
+#import "UnderlineRenderer.h"
+#import "MarkdownASTNode.h"
+#import "RenderContext.h"
+#import "RendererFactory.h"
+#import "StyleConfig.h"
+
+@implementation UnderlineRenderer {
+  RendererFactory *_rendererFactory;
+  StyleConfig *_config;
+}
+
+- (instancetype)initWithRendererFactory:(id)rendererFactory config:(id)config
+{
+  if (self = [super init]) {
+    _rendererFactory = rendererFactory;
+    _config = (StyleConfig *)config;
+  }
+  return self;
+}
+
+#pragma mark - Rendering
+
+- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+{
+  NSUInteger start = output.length;
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
+
+  NSRange range = NSMakeRange(start, output.length - start);
+  if (range.length == 0)
+    return;
+
+  [output addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:range];
+
+  UIColor *underlineColor = [_config underlineColor];
+
+  [output addAttribute:NSUnderlineColorAttributeName value:underlineColor range:range];
+}
+
+@end

package/ios/styles/StyleConfig.h

@@ -3,6 +3,10 @@
 
 @interface StyleConfig : NSObject <NSCopying>
 - (instancetype)init;
+- (CGFloat)fontScaleMultiplier;
+- (void)setFontScaleMultiplier:(CGFloat)newValue;
+- (CGFloat)maxFontSizeMultiplier;
+- (void)setMaxFontSizeMultiplier:(CGFloat)newValue;
 // Primary font properties
 - (UIColor *)primaryColor;
 - (void)setPrimaryColor:(UIColor *)newValue;
@@ -22,10 +26,14 @@
 - (void)setParagraphFontWeight:(NSString *)newValue;
 - (UIColor *)paragraphColor;
 - (void)setParagraphColor:(UIColor *)newValue;
+- (CGFloat)paragraphMarginTop;
+- (void)setParagraphMarginTop:(CGFloat)newValue;
 - (CGFloat)paragraphMarginBottom;
 - (void)setParagraphMarginBottom:(CGFloat)newValue;
 - (CGFloat)paragraphLineHeight;
 - (void)setParagraphLineHeight:(CGFloat)newValue;
+- (NSTextAlignment)paragraphTextAlign;
+- (void)setParagraphTextAlign:(NSTextAlignment)newValue;
 - (UIFont *)paragraphFont;
 // H1 properties
 - (CGFloat)h1FontSize;
@@ -36,10 +44,14 @@
 - (void)setH1FontWeight:(NSString *)newValue;
 - (UIColor *)h1Color;
 - (void)setH1Color:(UIColor *)newValue;
+- (CGFloat)h1MarginTop;
+- (void)setH1MarginTop:(CGFloat)newValue;
 - (CGFloat)h1MarginBottom;
 - (void)setH1MarginBottom:(CGFloat)newValue;
 - (CGFloat)h1LineHeight;
 - (void)setH1LineHeight:(CGFloat)newValue;
+- (NSTextAlignment)h1TextAlign;
+- (void)setH1TextAlign:(NSTextAlignment)newValue;
 - (UIFont *)h1Font;
 // H2 properties
 - (CGFloat)h2FontSize;
@@ -50,10 +62,14 @@
 - (void)setH2FontWeight:(NSString *)newValue;
 - (UIColor *)h2Color;
 - (void)setH2Color:(UIColor *)newValue;
+- (CGFloat)h2MarginTop;
+- (void)setH2MarginTop:(CGFloat)newValue;
 - (CGFloat)h2MarginBottom;
 - (void)setH2MarginBottom:(CGFloat)newValue;
 - (CGFloat)h2LineHeight;
 - (void)setH2LineHeight:(CGFloat)newValue;
+- (NSTextAlignment)h2TextAlign;
+- (void)setH2TextAlign:(NSTextAlignment)newValue;
 - (UIFont *)h2Font;
 // H3 properties
 - (CGFloat)h3FontSize;
@@ -64,10 +80,14 @@
 - (void)setH3FontWeight:(NSString *)newValue;
 - (UIColor *)h3Color;
 - (void)setH3Color:(UIColor *)newValue;
+- (CGFloat)h3MarginTop;
+- (void)setH3MarginTop:(CGFloat)newValue;
 - (CGFloat)h3MarginBottom;
 - (void)setH3MarginBottom:(CGFloat)newValue;
 - (CGFloat)h3LineHeight;
 - (void)setH3LineHeight:(CGFloat)newValue;
+- (NSTextAlignment)h3TextAlign;
+- (void)setH3TextAlign:(NSTextAlignment)newValue;
 - (UIFont *)h3Font;
 // H4 properties
 - (CGFloat)h4FontSize;
@@ -78,10 +98,14 @@
 - (void)setH4FontWeight:(NSString *)newValue;
 - (UIColor *)h4Color;
 - (void)setH4Color:(UIColor *)newValue;
+- (CGFloat)h4MarginTop;
+- (void)setH4MarginTop:(CGFloat)newValue;
 - (CGFloat)h4MarginBottom;
 - (void)setH4MarginBottom:(CGFloat)newValue;
 - (CGFloat)h4LineHeight;
 - (void)setH4LineHeight:(CGFloat)newValue;
+- (NSTextAlignment)h4TextAlign;
+- (void)setH4TextAlign:(NSTextAlignment)newValue;
 - (UIFont *)h4Font;
 // H5 properties
 - (CGFloat)h5FontSize;
@@ -92,10 +116,14 @@
 - (void)setH5FontWeight:(NSString *)newValue;
 - (UIColor *)h5Color;
 - (void)setH5Color:(UIColor *)newValue;
+- (CGFloat)h5MarginTop;
+- (void)setH5MarginTop:(CGFloat)newValue;
 - (CGFloat)h5MarginBottom;
 - (void)setH5MarginBottom:(CGFloat)newValue;
 - (CGFloat)h5LineHeight;
 - (void)setH5LineHeight:(CGFloat)newValue;
+- (NSTextAlignment)h5TextAlign;
+- (void)setH5TextAlign:(NSTextAlignment)newValue;
 - (UIFont *)h5Font;
 // H6 properties
 - (CGFloat)h6FontSize;
@@ -106,10 +134,14 @@
 - (void)setH6FontWeight:(NSString *)newValue;
 - (UIColor *)h6Color;
 - (void)setH6Color:(UIColor *)newValue;
+- (CGFloat)h6MarginTop;
+- (void)setH6MarginTop:(CGFloat)newValue;
 - (CGFloat)h6MarginBottom;
 - (void)setH6MarginBottom:(CGFloat)newValue;
 - (CGFloat)h6LineHeight;
 - (void)setH6LineHeight:(CGFloat)newValue;
+- (NSTextAlignment)h6TextAlign;
+- (void)setH6TextAlign:(NSTextAlignment)newValue;
 - (UIFont *)h6Font;
 // Link properties
 - (UIColor *)linkColor;
@@ -122,6 +154,12 @@
 // Emphasis properties
 - (UIColor *)emphasisColor;
 - (void)setEmphasisColor:(UIColor *)newValue;
+// Strikethrough properties
+- (UIColor *)strikethroughColor;
+- (void)setStrikethroughColor:(UIColor *)newValue;
+// Underline properties
+- (UIColor *)underlineColor;
+- (void)setUnderlineColor:(UIColor *)newValue;
 // Code properties
 - (UIColor *)codeColor;
 - (void)setCodeColor:(UIColor *)newValue;
@@ -134,6 +172,8 @@
 - (void)setImageHeight:(CGFloat)newValue;
 - (CGFloat)imageBorderRadius;
 - (void)setImageBorderRadius:(CGFloat)newValue;
+- (CGFloat)imageMarginTop;
+- (void)setImageMarginTop:(CGFloat)newValue;
 - (CGFloat)imageMarginBottom;
 - (void)setImageMarginBottom:(CGFloat)newValue;
 // Inline image properties
@@ -148,6 +188,8 @@
 - (void)setBlockquoteFontWeight:(NSString *)newValue;
 - (UIColor *)blockquoteColor;
 - (void)setBlockquoteColor:(UIColor *)newValue;
+- (CGFloat)blockquoteMarginTop;
+- (void)setBlockquoteMarginTop:(CGFloat)newValue;
 - (CGFloat)blockquoteMarginBottom;
 - (void)setBlockquoteMarginBottom:(CGFloat)newValue;
 - (CGFloat)blockquoteLineHeight;
@@ -170,6 +212,8 @@
 - (void)setListStyleFontWeight:(NSString *)newValue;
 - (UIColor *)listStyleColor;
 - (void)setListStyleColor:(UIColor *)newValue;
+- (CGFloat)listStyleMarginTop;
+- (void)setListStyleMarginTop:(CGFloat)newValue;
 - (CGFloat)listStyleMarginBottom;
 - (void)setListStyleMarginBottom:(CGFloat)newValue;
 - (CGFloat)listStyleLineHeight;
@@ -200,6 +244,8 @@
 - (void)setCodeBlockFontWeight:(NSString *)newValue;
 - (UIColor *)codeBlockColor;
 - (void)setCodeBlockColor:(UIColor *)newValue;
+- (CGFloat)codeBlockMarginTop;
+- (void)setCodeBlockMarginTop:(CGFloat)newValue;
 - (CGFloat)codeBlockMarginBottom;
 - (void)setCodeBlockMarginBottom:(CGFloat)newValue;
 - (CGFloat)codeBlockLineHeight;