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

package/ios/views/ENRMMathContainerView.m

@@ -5,6 +5,7 @@
 #include <TargetConditionals.h>
 
 #if ENRICHED_MARKDOWN_MATH
+#import "ENRMMathFallback.h"
 #import "PasteboardUtils.h"
 #if __has_include("ReactNativeEnrichedMarkdown-Swift.h")
 #import "ReactNativeEnrichedMarkdown-Swift.h"
@@ -20,14 +21,21 @@
 
 @interface ENRMRaTeXCanvasView : RCTUIView
 @property (nonatomic, strong, nullable) ENRMRaTeXRenderResult *renderResult;
+// Visible-source fallback when RaTeX cannot parse the block, drawn wrapped;
+// see ENRMMathFallback.h.
+@property (nonatomic, strong, nullable) NSAttributedString *fallbackSource;
 @end
 
 @implementation ENRMRaTeXCanvasView
 
 - (void)drawRect:(CGRect)rect
 {
-  if (!_renderResult)
+  if (!_renderResult) {
+    if (_fallbackSource) {
+      [_fallbackSource drawWithRect:self.bounds options:NSStringDrawingUsesLineFragmentOrigin context:nil];
+    }
     return;
+  }
   CGContextRef ctx = UIGraphicsGetCurrentContext();
   if (!ctx)
     return;
@@ -98,6 +106,7 @@
                                                    color:config.mathColor
                                                     bold:ENRMMathFontWeightIsBold(config.mathFontWeight)];
   _mathView.renderResult = result;
+  _mathView.fallbackSource = result ? nil : ENRMMathFallbackString(latex, @"$$", config.mathFontSize, config.mathColor);
 
   CGFloat padding = config.mathPadding;
   _mathView.frame = CGRectMake(padding, padding, ceil(result.width), ceil(result.totalHeight));
@@ -117,30 +126,26 @@
 - (UIContextMenuConfiguration *)contextMenuInteraction:(UIContextMenuInteraction *)interaction
                         configurationForMenuAtLocation:(CGPoint)location
 {
-  return [UIContextMenuConfiguration
-      configurationWithIdentifier:nil
-                  previewProvider:nil
-                   actionProvider:^UIMenu *(NSArray<UIMenuElement *> *suggestedActions) {
-                     UIAction *copyPlainText =
-                         [UIAction actionWithTitle:self.copyLabel
-                                             image:[RCTUIImage systemImageNamed:@"doc.on.doc"]
-                                        identifier:nil
-                                           handler:^(__kindof UIAction *action) { [self copyLatexToPasteboard]; }];
-
-                     UIAction *copyMarkdown =
-                         [UIAction actionWithTitle:self.copyAsMarkdownLabel
-                                             image:[RCTUIImage systemImageNamed:@"doc.text"]
-                                        identifier:nil
-                                           handler:^(__kindof UIAction *action) { [self copyMarkdownToPasteboard]; }];
-
-                     return [UIMenu menuWithTitle:@"" children:@[ copyPlainText, copyMarkdown ]];
-                   }];
+  // Returning nil is the UIKit-sanctioned way to suppress a context menu.
+  if (self.contextMenuHidden) {
+    return nil;
+  }
+  __weak __typeof(self) weakSelf = self;
+  return ENRMBlockContextMenuConfiguration(
+      self.menuOptions, self.copyLabel, self.copyAsMarkdownLabel, ^{ [weakSelf copyLatexToPasteboard]; },
+      ^{ [weakSelf copyMarkdownToPasteboard]; });
 }
 #endif
 
 #if TARGET_OS_OSX
 - (NSMenu *)menuForEvent:(NSEvent *)event
 {
+  // This override never falls through to [super menuForEvent:], so nil fully
+  // suppresses the menu rather than restoring the AppKit default.
+  if (self.contextMenuHidden) {
+    return nil;
+  }
+
   NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
   [menu addItem:ENRMCreateMenuItem(self.copyLabel, ^{ [self copyLatexToPasteboard]; })];
   [menu addItem:ENRMCreateMenuItem(self.copyAsMarkdownLabel, ^{ [self copyMarkdownToPasteboard]; })];
@@ -166,9 +171,40 @@
 - (CGFloat)measureHeight:(CGFloat)maxWidth
 {
   CGFloat padding = self.config.mathPadding;
+  if (!_mathView.renderResult && _mathView.fallbackSource) {
+    CGFloat available = MAX(maxWidth - padding * 2, 1);
+    CGRect bounds = [_mathView.fallbackSource boundingRectWithSize:CGSizeMake(available, CGFLOAT_MAX)
+                                                           options:NSStringDrawingUsesLineFragmentOrigin
+                                                           context:nil];
+    return ceil(bounds.size.height) + padding * 2;
+  }
   return [self mathViewIntrinsicSize].height + padding * 2;
 }
 
++ (CGFloat)measureHeightForLatex:(NSString *)latex config:(StyleConfig *)config maxWidth:(CGFloat)maxWidth
+{
+  CGFloat padding = config.mathPadding;
+
+  ENRMRaTeXRenderResult *result = [ENRMRaTeXBridge parse:latex
+                                             displayMode:YES
+                                                fontSize:config.mathFontSize
+                                                   color:config.mathColor
+                                                    bold:ENRMMathFontWeightIsBold(config.mathFontWeight)];
+  if (result) {
+    return ceil(result.totalHeight) + padding * 2;
+  }
+
+  NSAttributedString *fallbackSource = ENRMMathFallbackString(latex, @"$$", config.mathFontSize, config.mathColor);
+  if (!fallbackSource) {
+    return 0;
+  }
+  CGFloat available = MAX(maxWidth - padding * 2, 1);
+  CGRect bounds = [fallbackSource boundingRectWithSize:CGSizeMake(available, CGFLOAT_MAX)
+                                               options:NSStringDrawingUsesLineFragmentOrigin
+                                               context:nil];
+  return ceil(bounds.size.height) + padding * 2;
+}
+
 - (CGFloat)alignedOriginXForWidth:(CGFloat)formulaWidth inBounds:(CGFloat)boundsWidth padding:(CGFloat)padding
 {
   CGFloat available = boundsWidth - padding * 2;
@@ -188,6 +224,25 @@
   [super layoutSubviews];
 
   CGFloat padding = self.config.mathPadding;
+
+  if (!_mathView.renderResult && _mathView.fallbackSource) {
+    // Fallback source fills the available width and wraps; no horizontal scroll.
+#if !TARGET_OS_OSX
+    _scrollView.frame = self.bounds;
+    _scrollView.contentSize = self.bounds.size;
+    _scrollView.contentOffset = CGPointZero;
+    _scrollView.scrollEnabled = NO;
+#endif
+    _mathView.frame = CGRectMake(padding, padding, MAX(self.bounds.size.width - padding * 2, 1),
+                                 MAX(self.bounds.size.height - padding * 2, 1));
+#if !TARGET_OS_OSX
+    [_mathView setNeedsDisplay];
+#else
+    [_mathView setNeedsDisplay:YES];
+#endif
+    return;
+  }
+
   CGSize intrinsicSize = [self mathViewIntrinsicSize];
   CGFloat contentWidth = intrinsicSize.width + padding * 2;
   CGFloat contentHeight = self.bounds.size.height;

package/ios/views/TableContainerView.h

@@ -1,4 +1,5 @@
 #pragma once
+#import "ENRMBlockMenu.h"
 #import "ENRMUIKit.h"
 #import "ParagraphStyleUtils.h"
 #import "StyleConfig.h"
@@ -18,6 +19,20 @@ typedef void (^TableLinkPressBlock)(NSString *url);
 
 - (CGFloat)measureHeight:(CGFloat)maxWidth;
 
+/// View-free table height for shadow-node measurement (issue #550): renders
+/// the cells' attributed strings and runs the same column/row layout the view
+/// runs in `applyTableNode:`/`computeLayout` — shared statics, so measured and
+/// rendered heights cannot drift — without creating any view. Safe on any
+/// thread; the iOS counterpart of Android's
+/// `TableContainerView.measureTableNodeHeight`. Table height is intrinsic
+/// (content-sized columns, horizontal scroll), so no maxWidth parameter.
++ (CGFloat)measureHeightForTableNode:(MarkdownASTNode *)tableNode
+                              config:(StyleConfig *)config
+                    allowFontScaling:(BOOL)allowFontScaling
+               maxFontSizeMultiplier:(CGFloat)maxFontSizeMultiplier
+                writingDirectionMode:(ENRMWritingDirectionMode)writingDirectionMode
+             resolvedLayoutDirection:(NSWritingDirection)resolvedLayoutDirection;
+
 @property (nonatomic, strong) StyleConfig *config;
 
 @property (nonatomic, assign) BOOL allowFontScaling;
@@ -38,6 +53,13 @@ typedef void (^TableLinkPressBlock)(NSString *url);
 @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; selection and link handling are unaffected.
+@property (nonatomic, assign) BOOL contextMenuHidden;
+
+/// Copy / Copy as Markdown visibility and Copy format from `selectionMenuConfig`.
+@property (nonatomic, assign) ENRMBlockMenuOptions menuOptions;
+
 @property (nonatomic, readonly) NSUInteger rowCount;
 
 - (void)animateNewRowsFromPreviousCount:(NSUInteger)previousRowCount duration:(NSTimeInterval)duration;