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

package/ios/utils/SegmentRenderer.m

@@ -33,7 +33,13 @@ static NSArray *ENRMSplitASTIntoSegments(MarkdownASTNode *root)
 #endif
     }
 #endif
-    else {
+    else if (child.type == MarkdownNodeTypeCodeBlock) {
+      if (currentTextNodes.count > 0) {
+        [segments addObject:[ENRMTextSegment segmentWithNodes:[currentTextNodes copy]]];
+        [currentTextNodes removeAllObjects];
+      }
+      [segments addObject:[ENRMCodeBlockSegment segmentWithCodeBlockNode:child]];
+    } else {
       [currentTextNodes addObject:child];
     }
   }
@@ -53,9 +59,10 @@ NSArray<ENRMRenderedSegment *> *ENRMRenderSegmentsFromAST(MarkdownASTNode *ast,
   NSArray *segments = ENRMSplitASTIntoSegments(ast);
   NSMutableArray<ENRMRenderedSegment *> *renderedSegments = [NSMutableArray array];
 
-  static const uint64_t kTextKindSalt = 0x7465787400000000ULL;  // "text"
-  static const uint64_t kTableKindSalt = 0x7461626C00000000ULL; // "tabl"
-  static const uint64_t kMathKindSalt = 0x6D61746800000000ULL;  // "math"
+  static const uint64_t kTextKindSalt = 0x7465787400000000ULL;      // "text"
+  static const uint64_t kTableKindSalt = 0x7461626C00000000ULL;     // "tabl"
+  static const uint64_t kMathKindSalt = 0x6D61746800000000ULL;      // "math"
+  static const uint64_t kCodeBlockKindSalt = 0x63626C6B00000000ULL; // "cblk"
 
   for (id segment in segments) {
     if ([segment isKindOfClass:[ENRMTextSegment class]]) {
@@ -82,6 +89,12 @@ NSArray<ENRMRenderedSegment *> *ENRMRenderSegmentsFromAST(MarkdownASTNode *ast,
       [renderedSegments addObject:[ENRMRenderedSegment mathSegmentWithSegment:mathSegment signature:signature]];
     }
 #endif
+    else if ([segment isKindOfClass:[ENRMCodeBlockSegment class]]) {
+      ENRMCodeBlockSegment *codeBlockSegment = (ENRMCodeBlockSegment *)segment;
+      uint64_t signature = ENRMSignatureForNode(codeBlockSegment.codeBlockNode) ^ kCodeBlockKindSalt;
+      [renderedSegments addObject:[ENRMRenderedSegment codeBlockSegmentWithSegment:codeBlockSegment
+                                                                         signature:signature]];
+    }
   }
 
   return renderedSegments;

package/ios/utils/StreamingMarkdownFilter.h

@@ -9,11 +9,21 @@ typedef NS_ENUM(NSInteger, ENRMTableStreamingMode) {
   ENRMTableStreamingModeProgressive,
 };
 
+typedef NS_ENUM(NSInteger, ENRMCodeBlockStreamingMode) {
+  ENRMCodeBlockStreamingModeHidden = 0,
+  ENRMCodeBlockStreamingModeProgressive,
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-NSString *ENRMRenderableMarkdownForStreaming(NSString *markdown, ENRMTableStreamingMode tableMode);
+// Filtered markdown for the current streaming tick. When non-NULL,
+// outEndsInsideOpenCodeFence reports whether the result ends inside a still-open
+// fenced code block (the trailing block whose chrome the renderer defers).
+NSString *ENRMRenderableMarkdownForStreaming(NSString *markdown, ENRMTableStreamingMode tableMode,
+                                             ENRMCodeBlockStreamingMode codeBlockMode,
+                                             BOOL *_Nullable outEndsInsideOpenCodeFence);
 
 #ifdef __cplusplus
 }

package/ios/utils/StreamingMarkdownFilter.m

@@ -155,11 +155,107 @@ static NSString *ENRMRemovePendingStreamingTableBlock(NSString *markdown, NSArra
   return result;
 }
 
-NSString *ENRMRenderableMarkdownForStreaming(NSString *markdown, ENRMTableStreamingMode tableMode)
+static NSString *ENRMRemovePendingTablesAndMath(NSString *markdown, ENRMTableStreamingMode tableMode,
+                                                NSArray<NSString *> *lines)
 {
-  NSArray<NSString *> *lines = [markdown componentsSeparatedByString:@"\n"];
+  if (!lines) {
+    lines = [markdown componentsSeparatedByString:@"\n"];
+  }
   NSString *afterMath = ENRMRemovePendingStreamingMathBlock(markdown, lines);
   NSArray<NSString *> *linesForTable =
       (afterMath.length == markdown.length) ? lines : [afterMath componentsSeparatedByString:@"\n"];
   return ENRMRemovePendingStreamingTableBlock(afterMath, linesForTable, tableMode);
 }
+
+// Parses a fence marker into char/length/info; NO if the line isn't one.
+static BOOL ENRMParseFenceMarker(NSString *line, unichar *outChar, NSUInteger *outLength, NSString **outInfo)
+{
+  NSUInteger i = 0;
+  while (i < line.length && [line characterAtIndex:i] == ' ' && i < 3) {
+    i++;
+  }
+  if (i >= line.length) {
+    return NO;
+  }
+  unichar ch = [line characterAtIndex:i];
+  if (ch != '`' && ch != '~') {
+    return NO;
+  }
+  NSUInteger runLength = 0;
+  while (i < line.length && [line characterAtIndex:i] == ch) {
+    i++;
+    runLength++;
+  }
+  if (runLength < 3) {
+    return NO;
+  }
+  NSString *info = [line substringFromIndex:i];
+  if (ch == '`' && [info rangeOfString:@"`"].location != NSNotFound) {
+    return NO;
+  }
+  if (outChar) {
+    *outChar = ch;
+  }
+  if (outLength) {
+    *outLength = runLength;
+  }
+  if (outInfo) {
+    *outInfo = info;
+  }
+  return YES;
+}
+
+static NSInteger ENRMFindOpenCodeFenceLineIndex(NSArray<NSString *> *lines)
+{
+  NSInteger openIndex = -1;
+  unichar openChar = 0;
+  NSUInteger openLength = 0;
+  for (NSUInteger i = 0; i < lines.count; i++) {
+    unichar ch = 0;
+    NSUInteger length = 0;
+    NSString *info = nil;
+    BOOL isMarker = ENRMParseFenceMarker(lines[i], &ch, &length, &info);
+    if (openIndex == -1) {
+      if (isMarker) {
+        openIndex = (NSInteger)i;
+        openChar = ch;
+        openLength = length;
+      }
+    } else if (isMarker && ch == openChar && length >= openLength &&
+               [info stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]].length == 0) {
+      openIndex = -1;
+    }
+  }
+  return openIndex;
+}
+
+NSString *ENRMRenderableMarkdownForStreaming(NSString *markdown, ENRMTableStreamingMode tableMode,
+                                             ENRMCodeBlockStreamingMode codeBlockMode, BOOL *outEndsInsideOpenCodeFence)
+{
+  NSArray<NSString *> *lines = [markdown componentsSeparatedByString:@"\n"];
+  NSInteger openFenceIndex = ENRMFindOpenCodeFenceLineIndex(lines);
+
+  if (openFenceIndex == -1) {
+    if (outEndsInsideOpenCodeFence) {
+      *outEndsInsideOpenCodeFence = NO;
+    }
+    return ENRMRemovePendingTablesAndMath(markdown, tableMode, lines);
+  }
+
+  NSUInteger *offsets = ENRMBuildLineOffsets(lines, lines.count);
+  NSUInteger fenceOffset = offsets[(NSUInteger)openFenceIndex];
+  free(offsets);
+
+  NSString *head = [markdown substringToIndex:fenceOffset];
+  if (codeBlockMode == ENRMCodeBlockStreamingModeHidden) {
+    if (outEndsInsideOpenCodeFence) {
+      *outEndsInsideOpenCodeFence = NO;
+    }
+    return ENRMRemovePendingTablesAndMath(head, tableMode, nil);
+  }
+  if (outEndsInsideOpenCodeFence) {
+    *outEndsInsideOpenCodeFence = YES;
+  }
+  NSString *tail = [markdown substringFromIndex:fenceOffset];
+  return [ENRMRemovePendingTablesAndMath(head, tableMode, nil) stringByAppendingString:tail];
+}

package/ios/utils/StylePropsUtils.h

@@ -10,6 +10,7 @@
  * mapping once and instantiate it for each type.
  */
 
+#import "CodeBlockHighlighter.hpp"
 #import "ParagraphStyleUtils.h"
 #import "StyleConfig.h"
 #import <React/RCTConversions.h>
@@ -480,6 +481,16 @@ BOOL applyMarkdownStyleToConfig(StyleConfig *config, const MarkdownStyle &newSty
     changed = YES;
   }
 
+  if (newStyle.blockquote.borderRadius != oldStyle.blockquote.borderRadius) {
+    [config setBlockquoteBorderRadius:newStyle.blockquote.borderRadius];
+    changed = YES;
+  }
+
+  if (newStyle.blockquote.padding != oldStyle.blockquote.padding) {
+    [config setBlockquotePadding:newStyle.blockquote.padding];
+    changed = YES;
+  }
+
   // ── Link ───────────────────────────────────────────────────────────────────
 
   if (newStyle.link.fontFamily != oldStyle.link.fontFamily) {
@@ -689,6 +700,21 @@ BOOL applyMarkdownStyleToConfig(StyleConfig *config, const MarkdownStyle &newSty
     changed = YES;
   }
 
+  if (newStyle.image.maxHeight != oldStyle.image.maxHeight) {
+    [config setImageMaxHeight:newStyle.image.maxHeight];
+    changed = YES;
+  }
+
+  if (newStyle.image.aspectRatio != oldStyle.image.aspectRatio) {
+    [config setImageAspectRatio:newStyle.image.aspectRatio];
+    changed = YES;
+  }
+
+  if (newStyle.image.resizeMode != oldStyle.image.resizeMode) {
+    [config setImageResizeMode:@(newStyle.image.resizeMode.c_str())];
+    changed = YES;
+  }
+
   if (newStyle.image.borderRadius != oldStyle.image.borderRadius) {
     [config setImageBorderRadius:newStyle.image.borderRadius];
     changed = YES;
@@ -789,6 +815,11 @@ BOOL applyMarkdownStyleToConfig(StyleConfig *config, const MarkdownStyle &newSty
     changed = YES;
   }
 
+  if (newStyle.list.itemSpacing != oldStyle.list.itemSpacing) {
+    [config setListStyleItemSpacing:newStyle.list.itemSpacing];
+    changed = YES;
+  }
+
   // ── Code Block ─────────────────────────────────────────────────────────────
 
   if (newStyle.codeBlock.fontSize != oldStyle.codeBlock.fontSize) {
@@ -856,6 +887,28 @@ BOOL applyMarkdownStyleToConfig(StyleConfig *config, const MarkdownStyle &newSty
     changed = YES;
   }
 
+#define ENRM_SET_SYNTAX_COLOR(field, token)                                                                            \
+  if (newStyle.codeBlock.syntaxColors.field != oldStyle.codeBlock.syntaxColors.field) {                                \
+    [config setCodeBlockSyntaxColor:RCTUIColorFromSharedColor(newStyle.codeBlock.syntaxColors.field)                   \
+                           forToken:(NSInteger)Markdown::HighlightTokenType::token];                                   \
+    changed = YES;                                                                                                     \
+  }
+  ENRM_SET_SYNTAX_COLOR(keyword, Keyword)
+  ENRM_SET_SYNTAX_COLOR(operatorColor, Operator)
+  ENRM_SET_SYNTAX_COLOR(punctuation, Punctuation)
+  ENRM_SET_SYNTAX_COLOR(string, String)
+  ENRM_SET_SYNTAX_COLOR(number, Number)
+  ENRM_SET_SYNTAX_COLOR(constant, Constant)
+  ENRM_SET_SYNTAX_COLOR(comment, Comment)
+  ENRM_SET_SYNTAX_COLOR(function, Function)
+  ENRM_SET_SYNTAX_COLOR(type, Type)
+  ENRM_SET_SYNTAX_COLOR(variable, Variable)
+  ENRM_SET_SYNTAX_COLOR(property, Property)
+  ENRM_SET_SYNTAX_COLOR(tag, Tag)
+  ENRM_SET_SYNTAX_COLOR(attribute, Attribute)
+  ENRM_SET_SYNTAX_COLOR(embedded, Embedded)
+#undef ENRM_SET_SYNTAX_COLOR
+
   // ── Thematic Break ─────────────────────────────────────────────────────────
 
   if (newStyle.thematicBreak.color != oldStyle.thematicBreak.color) {
@@ -991,6 +1044,16 @@ BOOL applyMarkdownStyleToConfig(StyleConfig *config, const MarkdownStyle &newSty
     changed = YES;
   }
 
+  if (newStyle.table.horizontalOverflow != oldStyle.table.horizontalOverflow) {
+    [config setTableHorizontalOverflow:newStyle.table.horizontalOverflow];
+    changed = YES;
+  }
+
+  if (newStyle.table.align != oldStyle.table.align) {
+    [config setTableAlign:@(newStyle.table.align.c_str())];
+    changed = YES;
+  }
+
   // ── Task List ───────────────────────────────────────────────────────────────
 
   if (newStyle.taskList.checkedColor != oldStyle.taskList.checkedColor) {

package/ios/utils/TaskListTapUtils.m

@@ -1,5 +1,6 @@
 #import "TaskListTapUtils.h"
 #import "ENRMUIKit.h"
+#import "LastElementUtils.h"
 #import "ListItemRenderer.h"
 #import "ParagraphStyleUtils.h"
 #import "StyleConfig.h"
@@ -171,6 +172,13 @@ BOOL updateTaskListItemCheckedState(ENRMPlatformTextView *textView, NSInteger ta
                 if (depth && [depth integerValue] > nestingLevel)
                   return;
 
+                // Skip code block ranges — preserve CodeBlockRenderer styles.
+                NSNumber *isCodeBlock = [mutableText attribute:CodeBlockAttributeName
+                                                       atIndex:segmentRange.location
+                                                effectiveRange:nil];
+                if ([isCodeBlock boolValue])
+                  return;
+
                 [mutableText addAttribute:TaskCheckedAttribute value:@(newChecked) range:segmentRange];
 
                 if (newChecked) {
@@ -195,6 +203,22 @@ BOOL updateTaskListItemCheckedState(ENRMPlatformTextView *textView, NSInteger ta
                 }
               }];
 
+  // The checkbox glyph is drawn from the marker descriptor, not from
+  // TaskCheckedAttribute — keep it in sync. Enumerated over the full text:
+  // for code-block-first items the anchor sits outside the metadata ranges.
+  [mutableText enumerateAttribute:ListItemMarkerStartAttribute
+                          inRange:NSMakeRange(0, mutableText.length)
+                          options:0
+                       usingBlock:^(NSArray *markers, NSRange range, BOOL *stop) {
+                         if (![markers isKindOfClass:[NSArray class]])
+                           return;
+                         for (ENRMListMarkerDescriptor *marker in markers) {
+                           if (marker.isTask && marker.taskIndex == targetIndex) {
+                             marker.isChecked = newChecked;
+                           }
+                         }
+                       }];
+
   ENRMSetAttributedText(textView, mutableText);
   NSLayoutManager *layoutManager = textView.layoutManager;
   if (layoutManager) {

package/ios/views/ENRMCodeBlockContainerView.h

@@ -0,0 +1,53 @@
+#pragma once
+#import "ENRMBlockMenu.h"
+#import "ENRMUIKit.h"
+#import "StyleConfig.h"
+
+@class MarkdownASTNode;
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^ENRMCodeBlockCopyBlock)(NSString *code, NSString *language);
+
+@interface ENRMCodeBlockContainerView : RCTUIView
+
+- (instancetype)initWithConfig:(StyleConfig *)config;
+
+- (void)applyCodeBlockNode:(MarkdownASTNode *)node;
+
+- (CGFloat)measureHeight:(CGFloat)maxWidth;
+
+// View-free height for the shadow-node measurement pass: the same height an
+// instance's measureHeight: reports for the node, without building a view.
++ (CGFloat)measureHeightForCodeBlockNode:(MarkdownASTNode *)node config:(StyleConfig *)config;
+
+@property (nonatomic, strong) StyleConfig *config;
+
+// True until the closing fence arrives: highlighting is deferred and copying is
+// disabled, while the header stays visible.
+@property (nonatomic, assign) BOOL pending;
+
+// Renamed getters avoid the Cocoa `copy` method family (which signals +1
+// retained returns). Property names are unchanged so call sites stay the same.
+@property (nonatomic, copy, nullable, getter=menuCopyLabel) NSString *copyLabel;
+@property (nonatomic, copy, nullable, getter=menuCopyAsMarkdownLabel) NSString *copyAsMarkdownLabel;
+
+/// Suppresses the long-press copy menu on this block. Mirrors the
+/// `contextMenuHidden` prop; the header copy button is a visible control, not a
+/// context menu, and stays (hide it with `menuOptions.copyButtonHidden`).
+@property (nonatomic, assign) BOOL contextMenuHidden;
+
+/// Copy / Copy as Markdown visibility, Copy format and the header copy button
+/// from `selectionMenuConfig`. `copyHidden` also drops the VoiceOver copy action;
+/// the header button and VoiceOver action always copy the raw code.
+@property (nonatomic, assign) ENRMBlockMenuOptions menuOptions;
+
+// Fired when the code is copied (header button, context-menu Copy, or the
+// VoiceOver copy action); set by the host to bridge up to the JS onCopyPress
+// event. Not fired for "Copy as Markdown", nor for the context-menu Copy when
+// `menuOptions.copyWritesMarkdown` is set.
+@property (nonatomic, copy, nullable) ENRMCodeBlockCopyBlock onCopyPress;
+
+@end
+
+NS_ASSUME_NONNULL_END