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

package/ios/input/InputStylePropsUtils.h

@@ -18,6 +18,35 @@ static inline UITextAutocapitalizationType ENRMAutocapitalizationTypeFromString(
 }
 #endif
 
+/// Headings h1..h6 share an identical struct shape (fontSize / fontWeight /
+/// color) but are distinct codegen types, hence the template.
+template <typename HeadingProps>
+static BOOL applyHeadingLevelProps(ENRMInputFormatterStyle *style, NSInteger level, const HeadingProps &newHeading,
+                                   const HeadingProps &oldHeading)
+{
+  BOOL changed = NO;
+
+  if (newHeading.fontSize != oldHeading.fontSize) {
+    [style setHeadingFontSize:newHeading.fontSize forLevel:level];
+    changed = YES;
+  }
+
+  if (newHeading.fontWeight != oldHeading.fontWeight) {
+    NSString *weight =
+        newHeading.fontWeight.empty() ? nil : [NSString stringWithUTF8String:newHeading.fontWeight.c_str()];
+    [style setHeadingFontWeight:weight forLevel:level];
+    changed = YES;
+  }
+
+  if (newHeading.color != oldHeading.color) {
+    RCTUIColor *color = isColorMeaningful(newHeading.color) ? RCTUIColorFromSharedColor(newHeading.color) : nil;
+    [style setHeadingColor:color forLevel:level];
+    changed = YES;
+  }
+
+  return changed;
+}
+
 template <typename InputProps>
 BOOL applyInputStyleProps(ENRMInputFormatterStyle *style, const InputProps &newProps, const InputProps &oldProps)
 {
@@ -140,7 +169,76 @@ BOOL applyInputStyleProps(ENRMInputFormatterStyle *style, const InputProps &newP
     changed = YES;
   }
 
-  // Math (inline `$...$`)
+  if (newProps.markdownStyle.list.itemSpacing != oldProps.markdownStyle.list.itemSpacing) {
+    style.listItemSpacing = newProps.markdownStyle.list.itemSpacing;
+    changed = YES;
+  }
+
+  changed |= applyHeadingLevelProps(style, 1, newProps.markdownStyle.h1, oldProps.markdownStyle.h1);
+  changed |= applyHeadingLevelProps(style, 2, newProps.markdownStyle.h2, oldProps.markdownStyle.h2);
+  changed |= applyHeadingLevelProps(style, 3, newProps.markdownStyle.h3, oldProps.markdownStyle.h3);
+  changed |= applyHeadingLevelProps(style, 4, newProps.markdownStyle.h4, oldProps.markdownStyle.h4);
+  changed |= applyHeadingLevelProps(style, 5, newProps.markdownStyle.h5, oldProps.markdownStyle.h5);
+  changed |= applyHeadingLevelProps(style, 6, newProps.markdownStyle.h6, oldProps.markdownStyle.h6);
+
+  // Inline math chip (`$...$`) — markdownStyle.inlineMath
+  if (newProps.markdownStyle.inlineMath.color != oldProps.markdownStyle.inlineMath.color) {
+    style.inlineMathColor = isColorMeaningful(newProps.markdownStyle.inlineMath.color)
+                                ? RCTUIColorFromSharedColor(newProps.markdownStyle.inlineMath.color)
+                                : nil;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.fontSize != oldProps.markdownStyle.inlineMath.fontSize) {
+    style.inlineMathFontSize =
+        newProps.markdownStyle.inlineMath.fontSize > 0 ? newProps.markdownStyle.inlineMath.fontSize : 16.0;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.backgroundColor != oldProps.markdownStyle.inlineMath.backgroundColor) {
+    RCTUIColor *bg = RCTUIColorFromSharedColor(newProps.markdownStyle.inlineMath.backgroundColor);
+    style.inlineMathBackgroundColor = (bg && CGColorGetAlpha(bg.CGColor) > 0) ? bg : nil;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.borderColor != oldProps.markdownStyle.inlineMath.borderColor) {
+    RCTUIColor *bc = RCTUIColorFromSharedColor(newProps.markdownStyle.inlineMath.borderColor);
+    style.inlineMathBorderColor = (bc && CGColorGetAlpha(bc.CGColor) > 0) ? bc : nil;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.borderWidth != oldProps.markdownStyle.inlineMath.borderWidth) {
+    style.inlineMathBorderWidth = newProps.markdownStyle.inlineMath.borderWidth;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.borderRadius != oldProps.markdownStyle.inlineMath.borderRadius) {
+    style.inlineMathBorderRadius = newProps.markdownStyle.inlineMath.borderRadius;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.paddingHorizontal != oldProps.markdownStyle.inlineMath.paddingHorizontal) {
+    style.inlineMathPaddingHorizontal = newProps.markdownStyle.inlineMath.paddingHorizontal;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.paddingVertical != oldProps.markdownStyle.inlineMath.paddingVertical) {
+    style.inlineMathPaddingVertical = newProps.markdownStyle.inlineMath.paddingVertical;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.selectedBackgroundColor !=
+      oldProps.markdownStyle.inlineMath.selectedBackgroundColor) {
+    RCTUIColor *sbg = RCTUIColorFromSharedColor(newProps.markdownStyle.inlineMath.selectedBackgroundColor);
+    style.inlineMathSelectedBackgroundColor = (sbg && CGColorGetAlpha(sbg.CGColor) > 0) ? sbg : nil;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.selectedBorderColor != oldProps.markdownStyle.inlineMath.selectedBorderColor) {
+    RCTUIColor *sbc = RCTUIColorFromSharedColor(newProps.markdownStyle.inlineMath.selectedBorderColor);
+    style.inlineMathSelectedBorderColor = (sbc && CGColorGetAlpha(sbc.CGColor) > 0) ? sbc : nil;
+    changed = YES;
+  }
+  if (newProps.markdownStyle.inlineMath.fontWeight != oldProps.markdownStyle.inlineMath.fontWeight) {
+    if (!newProps.markdownStyle.inlineMath.fontWeight.empty()) {
+      style.inlineMathFontWeight =
+          [[NSString alloc] initWithUTF8String:newProps.markdownStyle.inlineMath.fontWeight.c_str()];
+      changed = YES;
+    }
+  }
+
+  // Block math chip (`$$...$$`) — markdownStyle.math
   if (newProps.markdownStyle.math.color != oldProps.markdownStyle.math.color) {
     style.mathColor = isColorMeaningful(newProps.markdownStyle.math.color)
                           ? RCTUIColorFromSharedColor(newProps.markdownStyle.math.color)
@@ -148,7 +246,7 @@ BOOL applyInputStyleProps(ENRMInputFormatterStyle *style, const InputProps &newP
     changed = YES;
   }
   if (newProps.markdownStyle.math.fontSize != oldProps.markdownStyle.math.fontSize) {
-    style.mathFontSize = newProps.markdownStyle.math.fontSize > 0 ? newProps.markdownStyle.math.fontSize : 16.0;
+    style.mathFontSize = newProps.markdownStyle.math.fontSize > 0 ? newProps.markdownStyle.math.fontSize : 20.0;
     changed = YES;
   }
   if (newProps.markdownStyle.math.backgroundColor != oldProps.markdownStyle.math.backgroundColor) {
@@ -193,79 +291,22 @@ BOOL applyInputStyleProps(ENRMInputFormatterStyle *style, const InputProps &newP
       changed = YES;
     }
   }
-
-  // Math block (`$$...$$`)
-  if (newProps.markdownStyle.mathBlock.color != oldProps.markdownStyle.mathBlock.color) {
-    style.mathBlockColor = isColorMeaningful(newProps.markdownStyle.mathBlock.color)
-                               ? RCTUIColorFromSharedColor(newProps.markdownStyle.mathBlock.color)
-                               : nil;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.fontSize != oldProps.markdownStyle.mathBlock.fontSize) {
-    style.mathBlockFontSize =
-        newProps.markdownStyle.mathBlock.fontSize > 0 ? newProps.markdownStyle.mathBlock.fontSize : 20.0;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.backgroundColor != oldProps.markdownStyle.mathBlock.backgroundColor) {
-    RCTUIColor *bg = RCTUIColorFromSharedColor(newProps.markdownStyle.mathBlock.backgroundColor);
-    style.mathBlockBackgroundColor = (bg && CGColorGetAlpha(bg.CGColor) > 0) ? bg : nil;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.borderColor != oldProps.markdownStyle.mathBlock.borderColor) {
-    RCTUIColor *bc = RCTUIColorFromSharedColor(newProps.markdownStyle.mathBlock.borderColor);
-    style.mathBlockBorderColor = (bc && CGColorGetAlpha(bc.CGColor) > 0) ? bc : nil;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.borderWidth != oldProps.markdownStyle.mathBlock.borderWidth) {
-    style.mathBlockBorderWidth = newProps.markdownStyle.mathBlock.borderWidth;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.borderRadius != oldProps.markdownStyle.mathBlock.borderRadius) {
-    style.mathBlockBorderRadius = newProps.markdownStyle.mathBlock.borderRadius;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.paddingHorizontal != oldProps.markdownStyle.mathBlock.paddingHorizontal) {
-    style.mathBlockPaddingHorizontal = newProps.markdownStyle.mathBlock.paddingHorizontal;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.paddingVertical != oldProps.markdownStyle.mathBlock.paddingVertical) {
-    style.mathBlockPaddingVertical = newProps.markdownStyle.mathBlock.paddingVertical;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.selectedBackgroundColor !=
-      oldProps.markdownStyle.mathBlock.selectedBackgroundColor) {
-    RCTUIColor *sbg = RCTUIColorFromSharedColor(newProps.markdownStyle.mathBlock.selectedBackgroundColor);
-    style.mathBlockSelectedBackgroundColor = (sbg && CGColorGetAlpha(sbg.CGColor) > 0) ? sbg : nil;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.selectedBorderColor != oldProps.markdownStyle.mathBlock.selectedBorderColor) {
-    RCTUIColor *sbc = RCTUIColorFromSharedColor(newProps.markdownStyle.mathBlock.selectedBorderColor);
-    style.mathBlockSelectedBorderColor = (sbc && CGColorGetAlpha(sbc.CGColor) > 0) ? sbc : nil;
-    changed = YES;
-  }
-  if (newProps.markdownStyle.mathBlock.fontWeight != oldProps.markdownStyle.mathBlock.fontWeight) {
-    if (!newProps.markdownStyle.mathBlock.fontWeight.empty()) {
-      style.mathBlockFontWeight =
-          [[NSString alloc] initWithUTF8String:newProps.markdownStyle.mathBlock.fontWeight.c_str()];
-      changed = YES;
-    }
-  }
-  if (newProps.markdownStyle.mathBlock.marginTop != oldProps.markdownStyle.mathBlock.marginTop) {
-    style.mathBlockMarginTop = newProps.markdownStyle.mathBlock.marginTop;
+  if (newProps.markdownStyle.math.marginTop != oldProps.markdownStyle.math.marginTop) {
+    style.mathMarginTop = newProps.markdownStyle.math.marginTop;
     changed = YES;
   }
-  if (newProps.markdownStyle.mathBlock.marginBottom != oldProps.markdownStyle.mathBlock.marginBottom) {
-    style.mathBlockMarginBottom = newProps.markdownStyle.mathBlock.marginBottom;
+  if (newProps.markdownStyle.math.marginBottom != oldProps.markdownStyle.math.marginBottom) {
+    style.mathMarginBottom = newProps.markdownStyle.math.marginBottom;
     changed = YES;
   }
-  if (newProps.markdownStyle.mathBlock.alignment != oldProps.markdownStyle.mathBlock.alignment) {
-    NSString *align = [NSString stringWithUTF8String:newProps.markdownStyle.mathBlock.alignment.c_str()];
+  if (newProps.markdownStyle.math.textAlign != oldProps.markdownStyle.math.textAlign) {
+    NSString *align = [NSString stringWithUTF8String:newProps.markdownStyle.math.textAlign.c_str()];
     if ([align isEqualToString:@"left"]) {
-      style.mathBlockAlignment = NSTextAlignmentLeft;
+      style.mathTextAlign = NSTextAlignmentLeft;
     } else if ([align isEqualToString:@"right"]) {
-      style.mathBlockAlignment = NSTextAlignmentRight;
+      style.mathTextAlign = NSTextAlignmentRight;
     } else {
-      style.mathBlockAlignment = NSTextAlignmentCenter;
+      style.mathTextAlign = NSTextAlignmentCenter;
     }
     changed = YES;
   }

package/ios/input/internals/EnrichedMarkdownTextInputShadowNode.mm

@@ -1,4 +1,5 @@
 #import "EnrichedMarkdownTextInputShadowNode.h"
+#import "ENRMEditSession.h"
 #import "EnrichedMarkdownTextInput.h"
 #import <react/utils/ManagedObjectWrapper.h>
 #import <yoga/Yoga.h>
@@ -37,7 +38,7 @@ id EnrichedMarkdownTextInputShadowNode::setupMockInputView_(CGFloat width) const
   EnrichedMarkdownTextInput *mockView =
       [[EnrichedMarkdownTextInput alloc] initWithFrame:CGRectMake(20000, 20000, width, 1000)];
 
-  mockView.blockEmitting = YES;
+  [mockView.editSession enterPhase:ENRMEditPhaseImporting];
 
   const auto props = this->getProps();
   [mockView updateProps:props oldProps:nullptr];

package/ios/input/styles/ENRMBlockHandler.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#import "ENRMBlockRange.h"
+#import "ENRMInputFormatter.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// A block handler owns how its ENRMInputBlockType styles its paragraph and how
+/// it serializes to a markdown line prefix. Mirrors ENRMStyleHandler for the
+/// inline pipeline. Parser recognition is NOT handler-driven: it lives in
+/// ENRMInputParser's kSupportedBlocks central map, exactly as kSupportedSpans
+/// does for inline styles — a new block type adds one entry there plus one
+/// handler here. These signatures are designed to cover headings AND list items.
+@protocol ENRMBlockHandler <NSObject>
+
+@property (nonatomic, readonly) ENRMInputBlockType blockType;
+
+/// Contribute paragraph-level attributes for a block of this type. Called once
+/// per block range during formatting. A heading raises the font size; a list
+/// item sets head/tail indents and a marker. May be a no-op.
+///
+/// @param paragraphStyle Mutable paragraph style to adjust (indents, spacing).
+/// @param attributes     Mutable character attributes to add (e.g. font) over
+///                       the block range; NSParagraphStyleAttributeName is
+///                       applied by the formatter from `paragraphStyle`.
+/// @param blockRange     The block being styled (carries type, range, level).
+/// @param style          Resolved formatter style (base font, colors).
+- (void)applyAttributesToParagraphStyle:(NSMutableParagraphStyle *)paragraphStyle
+                             attributes:(NSMutableDictionary<NSAttributedStringKey, id> *)attributes
+                             blockRange:(ENRMBlockRange *)blockRange
+                                  style:(ENRMInputFormatterStyle *)style;
+
+/// Markdown prefix prepended to each line of the block during serialization,
+/// e.g. @"# " for an H1 or @"- " for a bullet. Returns @"" when the block needs
+/// no prefix. Owning the marker here replaces a central serializer switch.
+- (NSString *)markdownLinePrefixForBlockRange:(ENRMBlockRange *)blockRange;
+
+@optional
+
+/// Whether Return continues the block onto the next line (a list item) rather
+/// than ending it (a heading). Defaults to NO when unimplemented.
+@property (nonatomic, readonly) BOOL continuesOnNewline;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/input/styles/ENRMHeadingBlockHandler.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#import "ENRMBlockHandler.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Block handler for ATX headings (H1-H6). A single instance serves all six
+/// levels: it dispatches on ENRMBlockRange.level for both styling (font size via
+/// the formatter style's per-level config) and serialization (`#`*level prefix).
+/// The formatter registers the same instance under all six heading block-type
+/// keys.
+@interface ENRMHeadingBlockHandler : NSObject <ENRMBlockHandler>
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/input/styles/ENRMHeadingBlockHandler.mm

@@ -0,0 +1,38 @@
+#import "ENRMHeadingBlockHandler.h"
+
+@implementation ENRMHeadingBlockHandler
+
+- (ENRMInputBlockType)blockType
+{
+  return ENRMInputBlockTypeHeading1;
+}
+
+- (void)applyAttributesToParagraphStyle:(NSMutableParagraphStyle *)paragraphStyle
+                             attributes:(NSMutableDictionary<NSAttributedStringKey, id> *)attributes
+                             blockRange:(ENRMBlockRange *)blockRange
+                                  style:(ENRMInputFormatterStyle *)style
+{
+  NSInteger level = blockRange.level;
+  if (level < 1 || level > 6) {
+    return;
+  }
+
+  attributes[NSFontAttributeName] = [style headingFontForLevel:level];
+
+  RCTUIColor *headingColor = [style headingColorForLevel:level];
+  if (headingColor) {
+    attributes[NSForegroundColorAttributeName] = headingColor;
+  }
+}
+
+- (NSString *)markdownLinePrefixForBlockRange:(ENRMBlockRange *)blockRange
+{
+  NSInteger level = blockRange.level;
+  if (level < 1 || level > 6) {
+    return @"";
+  }
+  NSString *hashes = [@"" stringByPaddingToLength:level withString:@"#" startingAtIndex:0];
+  return [hashes stringByAppendingString:@" "];
+}
+
+@end

package/ios/input/styles/ENRMOrderedListBlockHandler.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#import "ENRMBlockHandler.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Block handler for ordered list items. Reserves the same head-indent column as
+/// the bullet handler (the layout manager draws the number into it) and
+/// serializes to an `N. ` line prefix indented three spaces per nesting level.
+/// Depth rides in ENRMBlockRange.level, the number in ENRMBlockRange.ordinal.
+@interface ENRMOrderedListBlockHandler : NSObject <ENRMBlockHandler>
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/input/styles/ENRMOrderedListBlockHandler.mm

@@ -0,0 +1,48 @@
+#import "ENRMOrderedListBlockHandler.h"
+#import "ENRMInputBlockType.h"
+
+@implementation ENRMOrderedListBlockHandler
+
+- (ENRMInputBlockType)blockType
+{
+  return ENRMInputBlockTypeOrderedListItem;
+}
+
+- (BOOL)continuesOnNewline
+{
+  return YES;
+}
+
+- (void)applyAttributesToParagraphStyle:(NSMutableParagraphStyle *)paragraphStyle
+                             attributes:(NSMutableDictionary<NSAttributedStringKey, id> *)attributes
+                             blockRange:(ENRMBlockRange *)blockRange
+                                  style:(ENRMInputFormatterStyle *)style
+{
+  NSInteger depth = blockRange.level;
+  if (depth < 0) {
+    depth = 0;
+  } else if (depth > kENRMMaxListDepth) {
+    depth = kENRMMaxListDepth;
+  }
+
+  // Same indent column as the bullet handler so mixed lists align; wrapped
+  // lines hang under the text, not under the number.
+  CGFloat indent = (depth + 1) * kENRMListIndentPerDepth;
+  paragraphStyle.firstLineHeadIndent = indent;
+  paragraphStyle.headIndent = indent;
+  paragraphStyle.paragraphSpacingBefore = style.listItemSpacing;
+}
+
+- (NSString *)markdownLinePrefixForBlockRange:(ENRMBlockRange *)blockRange
+{
+  NSInteger depth = blockRange.level;
+  if (depth < 0) {
+    depth = 0;
+  } else if (depth > kENRMMaxListDepth) {
+    depth = kENRMMaxListDepth;
+  }
+  NSString *indent = [@"" stringByPaddingToLength:depth * 3 withString:@" " startingAtIndex:0];
+  return [indent stringByAppendingFormat:@"%ld. ", (long)blockRange.ordinal];
+}
+
+@end

package/ios/input/styles/ENRMUnorderedListBlockHandler.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#import "ENRMBlockHandler.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Block handler for unordered (bullet) list items. Reserves the head-indent
+/// column for the marker via the paragraph style (the layout manager draws the
+/// glyph into it) and serializes to a `- ` line prefix indented three spaces per
+/// nesting level. Nesting depth is carried in ENRMBlockRange.level. Continues on
+/// Return (a new item at the same depth) unlike single-line heading blocks.
+@interface ENRMUnorderedListBlockHandler : NSObject <ENRMBlockHandler>
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/input/styles/ENRMUnorderedListBlockHandler.mm

@@ -0,0 +1,51 @@
+#import "ENRMUnorderedListBlockHandler.h"
+#import "ENRMInputBlockType.h"
+
+@implementation ENRMUnorderedListBlockHandler
+
+- (ENRMInputBlockType)blockType
+{
+  return ENRMInputBlockTypeUnorderedListItem;
+}
+
+- (BOOL)continuesOnNewline
+{
+  return YES;
+}
+
+- (void)applyAttributesToParagraphStyle:(NSMutableParagraphStyle *)paragraphStyle
+                             attributes:(NSMutableDictionary<NSAttributedStringKey, id> *)attributes
+                             blockRange:(ENRMBlockRange *)blockRange
+                                  style:(ENRMInputFormatterStyle *)style
+{
+  NSInteger depth = blockRange.level;
+  if (depth < 0) {
+    depth = 0;
+  } else if (depth > kENRMMaxListDepth) {
+    depth = kENRMMaxListDepth;
+  }
+
+  // Reserve a marker column per nesting level. Both the first (marker) line and
+  // wrapped continuation lines align to the same text inset so wrapped text
+  // hangs under the text, not under the bullet.
+  CGFloat indent = (depth + 1) * kENRMListIndentPerDepth;
+  paragraphStyle.firstLineHeadIndent = indent;
+  paragraphStyle.headIndent = indent;
+  paragraphStyle.paragraphSpacingBefore = style.listItemSpacing;
+}
+
+- (NSString *)markdownLinePrefixForBlockRange:(ENRMBlockRange *)blockRange
+{
+  NSInteger depth = blockRange.level;
+  if (depth < 0) {
+    depth = 0;
+  } else if (depth > kENRMMaxListDepth) {
+    depth = kENRMMaxListDepth;
+  }
+  // Three spaces of indent per nesting level (wide enough that ordered markers
+  // nest under bullets and vice versa), then the bullet marker.
+  NSString *indent = [@"" stringByPaddingToLength:depth * 3 withString:@" " startingAtIndex:0];
+  return [indent stringByAppendingString:@"- "];
+}
+
+@end