@mathers101/react-native-render-rich-text 0.1.10 → 0.1.14

package/ios/renderer/EmphasisRenderer.m

@@ -1,100 +1,100 @@
-#import "EmphasisRenderer.h"
-#import "FontUtils.h"
-#import "TiptapASTNode.h"
-#import "RenderContext.h"
-#import "RendererFactory.h"
-#import "StyleConfig.h"
-#import <React/RCTFont.h>
-
-@implementation EmphasisRenderer
-
-#pragma mark - Rendering
-
-- (void)renderNodeContent:(TiptapASTNode *)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;
-
-  BlockStyle *blockStyle = [context getBlockStyle];
-  RCTUIColor *configEmphasisColor = [_config emphasisColor];
-  NSString *emphasisFontFamily = [_config emphasisFontFamily];
-  NSString *emphasisFontStyle = [_config emphasisFontStyle];
-  BOOL useNormalStyle = [emphasisFontStyle isEqualToString:@"normal"];
-
-  // Cache the Strong color calculation to efficiently detect nested Strong nodes
-  RCTUIColor *strongColorToPreserve = [_config strongColor] ? [RenderContext calculateStrongColor:[_config strongColor]
-                                                                                       blockColor:blockStyle.color]
-                                                            : nil;
-
-  [output enumerateAttributesInRange:range
-                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:^(NSDictionary<NSAttributedStringKey, id> *attrs, NSRange subrange, BOOL *stop) {
-                            UIFont *currentFont =
-                                attrs[NSFontAttributeName] ?: cachedFontFromBlockStyle(blockStyle, context);
-                            UIFont *resolvedFont = nil;
-
-                            if (emphasisFontFamily.length > 0) {
-                              resolvedFont = [RCTFont updateFont:currentFont
-                                                      withFamily:emphasisFontFamily
-                                                            size:nil
-                                                          weight:nil
-                                                           style:useNormalStyle ? nil : @"italic"
-                                                         variant:nil
-                                                 scaleMultiplier:1.0];
-                            } else if (currentFont &&
-                                       !(currentFont.fontDescriptor.symbolicTraits & UIFontDescriptorTraitItalic)) {
-                              resolvedFont = [self ensureFontIsItalic:currentFont];
-                            }
-
-                            if (resolvedFont && ![resolvedFont isEqual:currentFont]) {
-                              [output addAttribute:NSFontAttributeName value:resolvedFont range:subrange];
-                            }
-
-                            // 2. Color Optimization: Handle nesting and avoid redundant updates
-                            if (configEmphasisColor) {
-                              RCTUIColor *currentColor = attrs[NSForegroundColorAttributeName];
-                              BOOL isLink = attrs[NSLinkAttributeName] != nil;
-
-                              // Verify if the current color belongs to a Strong parent
-                              BOOL isStrongColor =
-                                  strongColorToPreserve && [currentColor isEqual:strongColorToPreserve];
-
-                              // Preserving colors for higher-priority elements (links, strong nodes, etc.)
-                              if (!isLink && !isStrongColor && ![RenderContext shouldPreserveColors:attrs]) {
-                                // Only modify the string if the color is actually different
-                                if (![currentColor isEqual:configEmphasisColor]) {
-                                  [output addAttribute:NSForegroundColorAttributeName
-                                                 value:configEmphasisColor
-                                                 range:subrange];
-                                }
-                              }
-                            }
-                          }];
-}
-
-#pragma mark - Helper Methods
-
-- (UIFont *)ensureFontIsItalic:(UIFont *)font
-{
-  if (!font)
-    return nil;
-
-  UIFontDescriptorSymbolicTraits traits = font.fontDescriptor.symbolicTraits;
-  if (traits & UIFontDescriptorTraitItalic)
-    return font;
-
-  // Combine italic with existing traits (e.g., preserving Bold if present)
-  UIFontDescriptorSymbolicTraits combinedTraits = traits | UIFontDescriptorTraitItalic;
-  UIFontDescriptor *italicDescriptor = [font.fontDescriptor fontDescriptorWithSymbolicTraits:combinedTraits];
-
-  // Size 0 in fontWithDescriptor:size: maintains the current point size
-  return [UIFont fontWithDescriptor:italicDescriptor size:0] ?: font;
-}
-
+#import "EmphasisRenderer.h"
+#import "FontUtils.h"
+#import "TiptapASTNode.h"
+#import "RenderContext.h"
+#import "RendererFactory.h"
+#import "StyleConfig.h"
+#import <React/RCTFont.h>
+
+@implementation EmphasisRenderer
+
+#pragma mark - Rendering
+
+- (void)renderNodeContent:(TiptapASTNode *)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;
+
+  BlockStyle *blockStyle = [context getBlockStyle];
+  RCTUIColor *configEmphasisColor = [_config emphasisColor];
+  NSString *emphasisFontFamily = [_config emphasisFontFamily];
+  NSString *emphasisFontStyle = [_config emphasisFontStyle];
+  BOOL useNormalStyle = [emphasisFontStyle isEqualToString:@"normal"];
+
+  // Cache the Strong color calculation to efficiently detect nested Strong nodes
+  RCTUIColor *strongColorToPreserve = [_config strongColor] ? [RenderContext calculateStrongColor:[_config strongColor]
+                                                                                       blockColor:blockStyle.color]
+                                                            : nil;
+
+  [output enumerateAttributesInRange:range
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(NSDictionary<NSAttributedStringKey, id> *attrs, NSRange subrange, BOOL *stop) {
+                            UIFont *currentFont =
+                                attrs[NSFontAttributeName] ?: cachedFontFromBlockStyle(blockStyle, context);
+                            UIFont *resolvedFont = nil;
+
+                            if (emphasisFontFamily.length > 0) {
+                              resolvedFont = [RCTFont updateFont:currentFont
+                                                      withFamily:emphasisFontFamily
+                                                            size:nil
+                                                          weight:nil
+                                                           style:useNormalStyle ? nil : @"italic"
+                                                         variant:nil
+                                                 scaleMultiplier:1.0];
+                            } else if (currentFont &&
+                                       !(currentFont.fontDescriptor.symbolicTraits & UIFontDescriptorTraitItalic)) {
+                              resolvedFont = [self ensureFontIsItalic:currentFont];
+                            }
+
+                            if (resolvedFont && ![resolvedFont isEqual:currentFont]) {
+                              [output addAttribute:NSFontAttributeName value:resolvedFont range:subrange];
+                            }
+
+                            // 2. Color Optimization: Handle nesting and avoid redundant updates
+                            if (configEmphasisColor) {
+                              RCTUIColor *currentColor = attrs[NSForegroundColorAttributeName];
+                              BOOL isLink = attrs[NSLinkAttributeName] != nil;
+
+                              // Verify if the current color belongs to a Strong parent
+                              BOOL isStrongColor =
+                                  strongColorToPreserve && [currentColor isEqual:strongColorToPreserve];
+
+                              // Preserving colors for higher-priority elements (links, strong nodes, etc.)
+                              if (!isLink && !isStrongColor && ![RenderContext shouldPreserveColors:attrs]) {
+                                // Only modify the string if the color is actually different
+                                if (![currentColor isEqual:configEmphasisColor]) {
+                                  [output addAttribute:NSForegroundColorAttributeName
+                                                 value:configEmphasisColor
+                                                 range:subrange];
+                                }
+                              }
+                            }
+                          }];
+}
+
+#pragma mark - Helper Methods
+
+- (UIFont *)ensureFontIsItalic:(UIFont *)font
+{
+  if (!font)
+    return nil;
+
+  UIFontDescriptorSymbolicTraits traits = font.fontDescriptor.symbolicTraits;
+  if (traits & UIFontDescriptorTraitItalic)
+    return font;
+
+  // Combine italic with existing traits (e.g., preserving Bold if present)
+  UIFontDescriptorSymbolicTraits combinedTraits = traits | UIFontDescriptorTraitItalic;
+  UIFontDescriptor *italicDescriptor = [font.fontDescriptor fontDescriptorWithSymbolicTraits:combinedTraits];
+
+  // Size 0 in fontWithDescriptor:size: maintains the current point size
+  return [UIFont fontWithDescriptor:italicDescriptor size:0] ?: font;
+}
+
 @end

package/ios/renderer/HeadingRenderer.h

@@ -1,6 +1,6 @@
-#import "BaseRenderer.h"
-#import "TiptapASTNode.h"
-#import "RenderContext.h"
-
-@interface HeadingRenderer : BaseRenderer
-@end
+#import "BaseRenderer.h"
+#import "TiptapASTNode.h"
+#import "RenderContext.h"
+
+@interface HeadingRenderer : BaseRenderer
+@end

package/ios/renderer/HeadingRenderer.m

@@ -1,103 +1,103 @@
-#import "HeadingRenderer.h"
-#import "ENRMLinkPillText.h"
-#import "FontUtils.h"
-#import "ParagraphStyleUtils.h"
-#import "RenderContext.h"
-#import "RendererFactory.h"
-#import "RuntimeKeys.h"
-#import "StyleConfig.h"
-
-// Lightweight struct to hold style data without object overhead
-typedef struct {
-  __unsafe_unretained UIFont *font;
-  __unsafe_unretained RCTUIColor *color;
-  CGFloat marginTop;
-  CGFloat marginBottom;
-  CGFloat lineHeight;
-  NSTextAlignment textAlign;
-} HeadingStyle;
-
-static NSString *const kHeadingTypes[] = {nil,          @"heading-1", @"heading-2", @"heading-3",
-                                          @"heading-4", @"heading-5", @"heading-6"};
-
-@implementation HeadingRenderer
-
-- (id)takeContextSnapshot:(RenderContext *)context
-{
-  return [context snapshotScope];
-}
-
-- (void)renderNodeContent:(TiptapASTNode *)node
-                     into:(NSMutableAttributedString *)output
-                  context:(RenderContext *)context
-{
-  if (output.length > 0 && ![output.string hasSuffix:@"\n"]) {
-    [output appendAttributedString:kNewlineAttributedString];
-  }
-
-  NSInteger level = [node.attributes[@"level"] integerValue];
-  if (level < 1 || level > 6)
-    level = 1;
-
-  HeadingStyle style = [self styleForLevel:level];
-  [context setBlockStyle:BlockTypeHeading font:style.font color:style.color headingLevel:level];
-
-  NSUInteger start = output.length;
-  NSUInteger contentStart = start;
-
-  // Spacing at the very start of the document requires a spacer character (index 0 check)
-  if (start == 0) {
-    NSUInteger offset = applyBlockSpacingBefore(output, 0, style.marginTop);
-    contentStart += offset;
-    start += offset;
-  }
-
-  [_rendererFactory renderChildrenOfNode:node into:output context:context];
-
-  NSRange range = NSMakeRange(start, output.length - start);
-  if (range.length == 0)
-    return;
-
-  // Register heading for accessibility
-  NSString *headingText = ENRMStringByExpandingLinkPills([output attributedSubstringFromRange:range]);
-  [context registerHeadingRange:range level:level text:headingText];
-
-  // Metadata attribute used for post-processing (e.g., Export to Tiptap/HTML)
-  [output addAttribute:TiptapTypeAttributeName value:kHeadingTypes[level] range:range];
-
-  applyLineHeight(output, range, style.lineHeight);
-  applyBaselineOffset(output, range);
-  applyTextAlignment(output, range, style.textAlign);
-
-  // Skip marginTop for the first block — already handled by applyBlockSpacingBefore above
-  if (contentStart != 1) {
-    NSUInteger inserted = applyParagraphSpacingBefore(output, range, style.marginTop);
-    start += inserted;
-  }
-  applyParagraphSpacingAfter(output, start, style.marginBottom);
-}
-
-#pragma mark - Style Mapping
-
-- (HeadingStyle)styleForLevel:(NSInteger)level
-{
-  StyleConfig *c = _config;
-  switch (level) {
-    case 1:
-      return (HeadingStyle){c.h1Font, c.h1Color, c.h1MarginTop, c.h1MarginBottom, c.h1LineHeight, c.h1TextAlign};
-    case 2:
-      return (HeadingStyle){c.h2Font, c.h2Color, c.h2MarginTop, c.h2MarginBottom, c.h2LineHeight, c.h2TextAlign};
-    case 3:
-      return (HeadingStyle){c.h3Font, c.h3Color, c.h3MarginTop, c.h3MarginBottom, c.h3LineHeight, c.h3TextAlign};
-    case 4:
-      return (HeadingStyle){c.h4Font, c.h4Color, c.h4MarginTop, c.h4MarginBottom, c.h4LineHeight, c.h4TextAlign};
-    case 5:
-      return (HeadingStyle){c.h5Font, c.h5Color, c.h5MarginTop, c.h5MarginBottom, c.h5LineHeight, c.h5TextAlign};
-    case 6:
-      return (HeadingStyle){c.h6Font, c.h6Color, c.h6MarginTop, c.h6MarginBottom, c.h6LineHeight, c.h6TextAlign};
-    default:
-      return [self styleForLevel:1];
-  }
-}
-
+#import "HeadingRenderer.h"
+#import "ENRMLinkPillText.h"
+#import "FontUtils.h"
+#import "ParagraphStyleUtils.h"
+#import "RenderContext.h"
+#import "RendererFactory.h"
+#import "RuntimeKeys.h"
+#import "StyleConfig.h"
+
+// Lightweight struct to hold style data without object overhead
+typedef struct {
+  __unsafe_unretained UIFont *font;
+  __unsafe_unretained RCTUIColor *color;
+  CGFloat marginTop;
+  CGFloat marginBottom;
+  CGFloat lineHeight;
+  NSTextAlignment textAlign;
+} HeadingStyle;
+
+static NSString *const kHeadingTypes[] = {nil,          @"heading-1", @"heading-2", @"heading-3",
+                                          @"heading-4", @"heading-5", @"heading-6"};
+
+@implementation HeadingRenderer
+
+- (id)takeContextSnapshot:(RenderContext *)context
+{
+  return [context snapshotScope];
+}
+
+- (void)renderNodeContent:(TiptapASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
+{
+  if (output.length > 0 && ![output.string hasSuffix:@"\n"]) {
+    [output appendAttributedString:kNewlineAttributedString];
+  }
+
+  NSInteger level = [node.attributes[@"level"] integerValue];
+  if (level < 1 || level > 6)
+    level = 1;
+
+  HeadingStyle style = [self styleForLevel:level];
+  [context setBlockStyle:BlockTypeHeading font:style.font color:style.color headingLevel:level];
+
+  NSUInteger start = output.length;
+  NSUInteger contentStart = start;
+
+  // Spacing at the very start of the document requires a spacer character (index 0 check)
+  if (start == 0) {
+    NSUInteger offset = applyBlockSpacingBefore(output, 0, style.marginTop);
+    contentStart += offset;
+    start += offset;
+  }
+
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
+
+  NSRange range = NSMakeRange(start, output.length - start);
+  if (range.length == 0)
+    return;
+
+  // Register heading for accessibility
+  NSString *headingText = ENRMStringByExpandingLinkPills([output attributedSubstringFromRange:range]);
+  [context registerHeadingRange:range level:level text:headingText];
+
+  // Metadata attribute used for post-processing (e.g., Export to Tiptap/HTML)
+  [output addAttribute:TiptapTypeAttributeName value:kHeadingTypes[level] range:range];
+
+  applyLineHeight(output, range, style.lineHeight);
+  applyBaselineOffset(output, range);
+  applyTextAlignment(output, range, style.textAlign);
+
+  // Skip marginTop for the first block — already handled by applyBlockSpacingBefore above
+  if (contentStart != 1) {
+    NSUInteger inserted = applyParagraphSpacingBefore(output, range, style.marginTop);
+    start += inserted;
+  }
+  applyParagraphSpacingAfter(output, start, style.marginBottom);
+}
+
+#pragma mark - Style Mapping
+
+- (HeadingStyle)styleForLevel:(NSInteger)level
+{
+  StyleConfig *c = _config;
+  switch (level) {
+    case 1:
+      return (HeadingStyle){c.h1Font, c.h1Color, c.h1MarginTop, c.h1MarginBottom, c.h1LineHeight, c.h1TextAlign};
+    case 2:
+      return (HeadingStyle){c.h2Font, c.h2Color, c.h2MarginTop, c.h2MarginBottom, c.h2LineHeight, c.h2TextAlign};
+    case 3:
+      return (HeadingStyle){c.h3Font, c.h3Color, c.h3MarginTop, c.h3MarginBottom, c.h3LineHeight, c.h3TextAlign};
+    case 4:
+      return (HeadingStyle){c.h4Font, c.h4Color, c.h4MarginTop, c.h4MarginBottom, c.h4LineHeight, c.h4TextAlign};
+    case 5:
+      return (HeadingStyle){c.h5Font, c.h5Color, c.h5MarginTop, c.h5MarginBottom, c.h5LineHeight, c.h5TextAlign};
+    case 6:
+      return (HeadingStyle){c.h6Font, c.h6Color, c.h6MarginTop, c.h6MarginBottom, c.h6LineHeight, c.h6TextAlign};
+    default:
+      return [self styleForLevel:1];
+  }
+}
+
 @end

package/ios/renderer/HighlightRenderer.h

@@ -1,7 +1,7 @@
-#pragma once
-#import "BaseRenderer.h"
-
-extern NSString *const HighlightAttributeName;
-
-@interface HighlightRenderer : BaseRenderer
-@end
+#pragma once
+#import "BaseRenderer.h"
+
+extern NSString *const HighlightAttributeName;
+
+@interface HighlightRenderer : BaseRenderer
+@end

package/ios/renderer/HighlightRenderer.m

@@ -1,33 +1,33 @@
-#import "HighlightRenderer.h"
-#import "TiptapASTNode.h"
-#import "RenderContext.h"
-#import "RendererFactory.h"
-#import "StyleConfig.h"
-
-NSString *const HighlightAttributeName = @"EnrichedTiptapHighlight";
-
-@implementation HighlightRenderer
-
-#pragma mark - Rendering
-
-- (void)renderNodeContent:(TiptapASTNode *)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;
-
-  BlockStyle *blockStyle = [context getBlockStyle];
-  RCTUIColor *foregroundColor = [RenderContext calculateHighlightColor:[_config highlightColor]
-                                                        paragraphColor:[_config paragraphColor]
-                                                            blockColor:blockStyle.color];
-  [output addAttribute:NSForegroundColorAttributeName value:foregroundColor range:range];
-  [output addAttribute:NSBackgroundColorAttributeName value:[_config highlightBackgroundColor] range:range];
-  [output addAttribute:HighlightAttributeName value:@YES range:range];
-}
-
-@end
+#import "HighlightRenderer.h"
+#import "TiptapASTNode.h"
+#import "RenderContext.h"
+#import "RendererFactory.h"
+#import "StyleConfig.h"
+
+NSString *const HighlightAttributeName = @"EnrichedTiptapHighlight";
+
+@implementation HighlightRenderer
+
+#pragma mark - Rendering
+
+- (void)renderNodeContent:(TiptapASTNode *)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;
+
+  BlockStyle *blockStyle = [context getBlockStyle];
+  RCTUIColor *foregroundColor = [RenderContext calculateHighlightColor:[_config highlightColor]
+                                                        paragraphColor:[_config paragraphColor]
+                                                            blockColor:blockStyle.color];
+  [output addAttribute:NSForegroundColorAttributeName value:foregroundColor range:range];
+  [output addAttribute:NSBackgroundColorAttributeName value:[_config highlightBackgroundColor] range:range];
+  [output addAttribute:HighlightAttributeName value:@YES range:range];
+}
+
+@end

package/ios/renderer/LinkRenderer.h

@@ -1,6 +1,6 @@
-#import "BaseRenderer.h"
-#import "TiptapASTNode.h"
-#import "RenderContext.h"
-
-@interface LinkRenderer : BaseRenderer
-@end
+#import "BaseRenderer.h"
+#import "TiptapASTNode.h"
+#import "RenderContext.h"
+
+@interface LinkRenderer : BaseRenderer
+@end