react-native-jet-markdown 0.2.1 → 0.2.3-beta.0

package/cpp/react/override/react/renderer/components/JetMarkdownViewSpec/ComponentDescriptors.h

@@ -7,7 +7,6 @@
 
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
-#include "../../../../../JetMarkdownEditorShadowNode.h"
 #include "../../../../../JetMarkdownShadowNode.h"
 
 namespace facebook::react {
@@ -15,7 +14,4 @@ namespace facebook::react {
 using JetMarkdownViewComponentDescriptor =
     ConcreteComponentDescriptor<JetMarkdownShadowNode>;
 
-using JetMarkdownEditorComponentDescriptor =
-    ConcreteComponentDescriptor<JetMarkdownEditorShadowNode>;
-
 } // namespace facebook::react

package/ios/JetMarkdownView.mm

@@ -41,8 +41,9 @@ static BOOL JMDIsScrollInProgress(UIView *view);
   NSString *_stylesJson;
   BOOL _allowFontScaling;
   JMDBlockStackView *_stack;
-  NSString *_boundKey;
-  CGFloat _boundWidth;
+  // Layout objects are cached per (content, width, image sizes, font
+  // scale), so identity says whether the bound view tree is still current.
+  JMDWidthLayout *_boundLayout;
   // url -> @[w, h] points: from the images prop (wins) and loaded bitmaps.
   NSMutableDictionary<NSString *, NSArray<NSNumber *> *> *_propImageSizes;
   NSMutableDictionary<NSString *, NSArray<NSNumber *> *> *_loadedImageSizes;
@@ -346,7 +347,7 @@ static void JMDSetNeedsDisplayDeep(UIView *view) {
     // Dynamic (platform) colors resolve at draw time for text, but border
     // and background colors snapshot into CGColors when blocks bind; rebind
     // so they re-resolve under the new appearance.
-    _boundKey = nil;
+    _boundLayout = nil;
     [self setNeedsLayout];
     JMDSetNeedsDisplayDeep(self);
   }
@@ -449,7 +450,7 @@ static void JMDSetNeedsDisplayDeep(UIView *view) {
   [super prepareForRecycle];
   _markdown = @"";
   _stylesJson = @"";
-  _boundKey = nil;
+  _boundLayout = nil;
   _state = nullptr;
   [_propImageSizes removeAllObjects];
   [_loadedImageSizes removeAllObjects];
@@ -463,9 +464,9 @@ static void JMDSetNeedsDisplayDeep(UIView *view) {
 
   const CGFloat contentWidth =
       self.bounds.size.width - styles.paddingLeft - styles.paddingRight;
-  if (contentWidth <= 0 || _markdown.length == 0) {
+  if (contentWidth <= 0) {
     [_stack setBlocks:@[] gap:0];
-    _boundKey = nil;
+    _boundLayout = nil;
     return;
   }
 
@@ -477,16 +478,8 @@ static void JMDSetNeedsDisplayDeep(UIView *view) {
   NSDictionary *imageSizes = [self mergedImageSizes];
   JMDWidthLayout *layout = [content layoutForWidth:contentWidth imageSizes:imageSizes];
 
-  // Full contents, not hashes: CFString samples long strings and
-  // NSDictionary.hash is the entry count — both collide.
-  NSString *key = [NSString stringWithFormat:@"%@\x1f%@\x1f%@\x1f%.3f",
-                                             _markdown,
-                                             _stylesJson,
-                                             [JMDRenderedContent keyForImageSizes:imageSizes],
-                                             fontScale];
-  if (![key isEqualToString:_boundKey] || _boundWidth != contentWidth) {
-    _boundKey = key;
-    _boundWidth = contentWidth;
+  if (layout != _boundLayout) {
+    _boundLayout = layout;
     [_stack setBlocks:layout.measured gap:content.gap];
   }
 

package/ios/measure/JMDMarkdownMeasurer.mm

@@ -12,7 +12,7 @@
                  fontScale:(CGFloat)fontScale {
   JMDStyleConfig *styles = [JMDStyleConfig configWithJson:stylesJson];
   const CGFloat contentWidth = maxWidth - styles.paddingLeft - styles.paddingRight;
-  if (contentWidth <= 0 || markdown.length == 0) {
+  if (contentWidth <= 0) {
     return 0;
   }
 

package/ios/render/JMDBlock.h

@@ -92,6 +92,13 @@ FOUNDATION_EXPORT NSAttributedStringKey const JMDRunBackgroundAttributeName;
 /// Tables: resolved column widths and per-row heights.
 @property (nonatomic, strong) NSArray<NSNumber *> *columnWidths;
 @property (nonatomic, strong) NSArray<NSNumber *> *rowHeights;
+/// TextKit stacks built at measure time (storage owns the layout manager
+/// and container); the views draw with these, so measure and draw never
+/// disagree and text is laid out once. Text/Code: textStorage. Lists:
+/// one per row. Tables: row-major cells.
+@property (nonatomic, strong, nullable) NSTextStorage *textStorage;
+@property (nonatomic, strong) NSArray<NSTextStorage *> *markerStorages;
+@property (nonatomic, strong) NSArray<NSArray<NSTextStorage *> *> *cellStorages;
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/render/JMDBlock.m

@@ -21,6 +21,8 @@
     _rowContents = @[];
     _columnWidths = @[];
     _rowHeights = @[];
+    _markerStorages = @[];
+    _cellStorages = @[];
   }
   return self;
 }

package/ios/render/JMDBlockRenderer.mm

@@ -186,7 +186,7 @@ NSArray<NSDictionary *> *featureSettings(NSArray<NSString *> *variants) {
   return features;
 }
 
-UIFont *buildFont(const ResolvedAttrs &attrs) {
+UIFont *buildFontUncached(const ResolvedAttrs &attrs) {
   UIFont *base;
   if (attrs.family.length > 0) {
     UIFontDescriptor *descriptor = [UIFontDescriptor fontDescriptorWithFontAttributes:@{
@@ -228,6 +228,32 @@ UIFont *buildFont(const ResolvedAttrs &attrs) {
   return font ?: base;
 }
 
+// Descriptor matching (family + weight trait, especially for custom
+// families) costs real time and runs once per text run otherwise. UIFont is
+// immutable, NSCache is thread-safe: the layout thread and main thread share
+// one cache.
+UIFont *buildFont(const ResolvedAttrs &attrs) {
+  static NSCache<NSString *, UIFont *> *cache;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    cache = [NSCache new];
+    cache.countLimit = 256;
+  });
+  NSString *key = [NSString stringWithFormat:@"%@\x1f%.2f\x1f%ld\x1f%d\x1f%@",
+                                             attrs.family ?: @"",
+                                             attrs.fontSize,
+                                             (long)attrs.weight,
+                                             attrs.italic ? 1 : 0,
+                                             [attrs.variants componentsJoinedByString:@","] ?: @""];
+  UIFont *cached = [cache objectForKey:key];
+  if (cached != nil) {
+    return cached;
+  }
+  UIFont *font = buildFontUncached(attrs);
+  [cache setObject:font forKey:key];
+  return font;
+}
+
 NSUnderlineStyle decorationMask(NSString *style) {
   if ([style isEqualToString:@"double"]) {
     return NSUnderlineStyleDouble;

package/ios/render/JMDRenderedContent.mm

@@ -84,12 +84,13 @@
   return layout;
 }
 
-- (CGSize)textSize:(NSAttributedString *)text width:(CGFloat)width {
-  // Measured with TextKit, not NSStringDrawing: boundingRect stops at the
-  // last line's drawn descent, dropping the bottom of the final line box
-  // under a custom lineHeight. The full box keeps overlays (spoiler covers,
-  // run background chips) from being clipped at the view's bottom edge and
-  // matches how RN's <Text> and the Android renderer measure.
+// Lays text out with TextKit, not NSStringDrawing: boundingRect stops at
+// the last line's drawn descent, dropping the bottom of the final line box
+// under a custom lineHeight. The full box keeps overlays (spoiler covers,
+// run background chips) from being clipped at the view's bottom edge and
+// matches how RN's <Text> and the Android renderer measure. The returned
+// storage owns the layout manager; views draw with the same stack.
+- (NSTextStorage *)layoutText:(NSAttributedString *)text width:(CGFloat)width {
   NSTextStorage *storage = [[NSTextStorage alloc] initWithAttributedString:text];
   NSLayoutManager *layoutManager = [NSLayoutManager new];
   NSTextContainer *container = [[NSTextContainer alloc]
@@ -98,10 +99,20 @@
   [layoutManager addTextContainer:container];
   [storage addLayoutManager:layoutManager];
   [layoutManager ensureLayoutForTextContainer:container];
-  const CGRect used = [layoutManager usedRectForTextContainer:container];
+  return storage;
+}
+
+static CGSize JMDUsedSize(NSTextStorage *storage) {
+  NSLayoutManager *layoutManager = storage.layoutManagers.firstObject;
+  const CGRect used =
+      [layoutManager usedRectForTextContainer:layoutManager.textContainers.firstObject];
   return CGSizeMake(ceil(used.size.width), ceil(used.size.height));
 }
 
+- (CGSize)textSize:(NSAttributedString *)text width:(CGFloat)width {
+  return JMDUsedSize([self layoutText:text width:width]);
+}
+
 - (JMDMeasuredBlock *)measureBlock:(JMDBlock *)block
                              width:(CGFloat)width
                         imageSizes:(nullable NSDictionary<NSString *, NSArray<NSNumber *> *> *)imageSizes {
@@ -111,13 +122,17 @@
 
   switch (block.kind) {
     case JMDBlockKindText: {
-      const CGSize size = [self textSize:block.attributedText width:width];
+      NSTextStorage *storage = [self layoutText:block.attributedText width:width];
+      const CGSize size = JMDUsedSize(storage);
+      measured.textStorage = storage;
       measured.height = size.height;
       measured.textHeight = size.height;
       break;
     }
     case JMDBlockKindCode: {
-      const CGSize size = [self textSize:block.attributedText width:CGFLOAT_MAX];
+      NSTextStorage *storage = [self layoutText:block.attributedText width:CGFLOAT_MAX];
+      const CGSize size = JMDUsedSize(storage);
+      measured.textStorage = storage;
       measured.contentWidth = size.width;
       measured.textHeight = size.height;
       measured.height =
@@ -142,11 +157,14 @@
       const CGFloat contentWidth = MAX(width - contentX, 1);
       measured.contentWidth = contentWidth;
       NSMutableArray<NSNumber *> *markerHeights = [NSMutableArray new];
+      NSMutableArray<NSTextStorage *> *markerStorages = [NSMutableArray new];
       NSMutableArray<NSArray<JMDMeasuredBlock *> *> *rowContents = [NSMutableArray new];
       CGFloat height = 0;
       for (NSUInteger i = 0; i < block.rows.count; i++) {
         JMDListRow *row = block.rows[i];
-        const CGSize markerSize = [self textSize:row.marker width:block.markerWidth];
+        NSTextStorage *markerStorage = [self layoutText:row.marker width:block.markerWidth];
+        [markerStorages addObject:markerStorage];
+        const CGSize markerSize = JMDUsedSize(markerStorage);
         NSMutableArray<JMDMeasuredBlock *> *content = [NSMutableArray new];
         for (JMDBlock *child in row.content) {
           [content addObject:[self measureBlock:child width:contentWidth imageSizes:imageSizes]];
@@ -159,6 +177,7 @@
         }
       }
       measured.markerHeights = markerHeights;
+      measured.markerStorages = markerStorages;
       measured.rowContents = rowContents;
       measured.height = height;
       break;
@@ -209,6 +228,7 @@
       }
 
       NSMutableArray<NSNumber *> *rowHeights = [NSMutableArray new];
+      NSMutableArray<NSArray<NSTextStorage *> *> *cellStorages = [NSMutableArray new];
       CGFloat contentHeight = 0;
       for (JMDTableRow *row in block.tableRows) {
         JMDLayoutStyle *rowStyle = row.isHeader ? block.headerRowStyle : block.bodyRowStyle;
@@ -217,10 +237,14 @@
         const CGFloat cellPadV = pad.top + pad.bottom;
         const CGFloat rowExtra = rowStyle.borderTopWidth + rowStyle.borderBottomWidth;
         CGFloat rowHeight = 0;
+        NSMutableArray<NSTextStorage *> *rowStorages = [NSMutableArray new];
         for (NSUInteger column = 0; column < row.cells.count; column++) {
           const CGFloat cellWidth = MAX(columnWidths[column] - cellPadH, 1);
-          rowHeight = MAX(rowHeight, [self textSize:row.cells[column] width:cellWidth].height);
+          NSTextStorage *storage = [self layoutText:row.cells[column] width:cellWidth];
+          [rowStorages addObject:storage];
+          rowHeight = MAX(rowHeight, JMDUsedSize(storage).height);
         }
+        [cellStorages addObject:rowStorages];
         rowHeight += cellPadV + rowExtra;
         [rowHeights addObject:@(rowHeight)];
         contentHeight += rowHeight;
@@ -235,6 +259,7 @@
 
       measured.columnWidths = widths;
       measured.rowHeights = rowHeights;
+      measured.cellStorages = cellStorages;
       measured.contentWidth = contentWidth;
       measured.height = contentHeight + block.layoutStyle.verticalInset;
       break;

package/ios/views/JMDBlockStackView.m

@@ -10,58 +10,81 @@
   CGFloat _gap;
 }
 
+// Rebinds in place: a subview of the right kind at the same index is
+// reused, anything else is replaced. List recycling rebinds whole trees, so
+// the common case (same block kinds, different content) allocates nothing.
 - (void)setBlocks:(NSArray<JMDMeasuredBlock *> *)blocks gap:(CGFloat)gap {
   _measured = blocks;
   _gap = gap;
 
-  for (UIView *subview in [self.subviews copy]) {
-    [subview removeFromSuperview];
+  NSArray<UIView *> *existing = self.subviews;
+  for (NSUInteger i = 0; i < blocks.count; i++) {
+    UIView *old = i < existing.count ? existing[i] : nil;
+    UIView *view = [self bindView:old to:blocks[i]];
+    if (view != old) {
+      [old removeFromSuperview];
+      [self insertSubview:view atIndex:i];
+    }
   }
-  for (JMDMeasuredBlock *measured in blocks) {
-    [self addSubview:[self createViewFor:measured]];
+  for (NSUInteger i = blocks.count; i < existing.count; i++) {
+    [existing[i] removeFromSuperview];
   }
   [self setNeedsLayout];
 }
 
-- (UIView *)createViewFor:(JMDMeasuredBlock *)measured {
+- (UIView *)bindView:(nullable UIView *)old to:(JMDMeasuredBlock *)measured {
   switch (measured.block.kind) {
     case JMDBlockKindText: {
-      JMDBlockTextView *view = [[JMDBlockTextView alloc] initWithFrame:CGRectZero];
+      JMDBlockTextView *view = [old isKindOfClass:JMDBlockTextView.class]
+          ? (JMDBlockTextView *)old
+          : [[JMDBlockTextView alloc] initWithFrame:CGRectZero];
       view.host = self.host;
       view.spoilerColor = measured.block.spoilerColor;
       view.spoilerRadius = measured.block.spoilerRadius;
       view.spoilerContinuous = measured.block.spoilerContinuous;
-      view.attributedText = measured.block.attributedText;
+      [view bindTextStorage:measured.textStorage];
       return view;
     }
     case JMDBlockKindCode: {
-      JMDCodeBlockView *view = [[JMDCodeBlockView alloc] initWithFrame:CGRectZero];
+      JMDCodeBlockView *view = [old isKindOfClass:JMDCodeBlockView.class]
+          ? (JMDCodeBlockView *)old
+          : [[JMDCodeBlockView alloc] initWithFrame:CGRectZero];
       [view bind:measured];
       return view;
     }
     case JMDBlockKindQuote: {
-      JMDQuoteView *view = [[JMDQuoteView alloc] initWithFrame:CGRectZero];
+      JMDQuoteView *view = [old isKindOfClass:JMDQuoteView.class]
+          ? (JMDQuoteView *)old
+          : [[JMDQuoteView alloc] initWithFrame:CGRectZero];
       [view bind:measured gap:_gap host:self.host];
       return view;
     }
     case JMDBlockKindList: {
-      JMDListBlockView *view = [[JMDListBlockView alloc] initWithFrame:CGRectZero];
+      JMDListBlockView *view = [old isKindOfClass:JMDListBlockView.class]
+          ? (JMDListBlockView *)old
+          : [[JMDListBlockView alloc] initWithFrame:CGRectZero];
       [view bind:measured gap:_gap host:self.host];
       return view;
     }
     case JMDBlockKindDivider: {
-      UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+      UIView *view = (old != nil && old.class == UIView.class)
+          ? old
+          : [[UIView alloc] initWithFrame:CGRectZero];
       view.backgroundColor = measured.block.dividerColor;
       return view;
     }
     case JMDBlockKindImage: {
-      JMDImageView *view = [[JMDImageView alloc] initWithFrame:CGRectZero];
+      JMDImageView *view = [old isKindOfClass:JMDImageView.class]
+          ? (JMDImageView *)old
+          : [[JMDImageView alloc] initWithFrame:CGRectZero];
       view.host = self.host;
       [view bind:measured.block];
       return view;
     }
     case JMDBlockKindTable: {
-      JMDTableView *view = [[JMDTableView alloc] initWithFrame:CGRectZero];
+      JMDTableView *view = [old isKindOfClass:JMDTableView.class]
+          ? (JMDTableView *)old
+          : [[JMDTableView alloc] initWithFrame:CGRectZero];
       [view bind:measured host:self.host];
       return view;
     }
@@ -69,7 +92,6 @@
   return [[UIView alloc] initWithFrame:CGRectZero];
 }
 
-
 // Never the hit view itself: markdown touches belong to the host component
 // view; only nested scrollers (code blocks, tables) claim touches.
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {

package/ios/views/JMDBlockTextView.h

@@ -9,12 +9,17 @@ NS_ASSUME_NONNULL_BEGIN
 /// hit-tests links, mentions, and spoilers by character range.
 @interface JMDBlockTextView : UIView
 
-@property (nonatomic, copy, nullable) NSAttributedString *attributedText;
+/// The bound storage's contents (nil before bind).
+@property (nonatomic, readonly, nullable) NSAttributedString *attributedText;
 @property (nonatomic, weak, nullable) id<JMDMarkdownHost> host;
 @property (nonatomic, strong, nullable) UIColor *spoilerColor;
 @property (nonatomic, assign) CGFloat spoilerRadius;
 @property (nonatomic, assign) BOOL spoilerContinuous;
 
+/// Binds a measure-time TextKit stack (see JMDMeasuredBlock); the view
+/// draws with it and never lays text out itself.
+- (void)bindTextStorage:(NSTextStorage *)storage;
+
 /// Attributed-string attributes at a point in this view's coordinates;
 /// nil when the point is not on a glyph. Used by the host for hit testing.
 - (nullable NSDictionary *)attributesAtPoint:(CGPoint)point;