react-native-enriched-markdown-scaffold 1.0.2-scaffold.2 → 1.0.2-scaffold.4

package/ios/EnrichedMarkdownText.mm

@@ -6,6 +6,7 @@
 #import "ENRMAtomicSize.h"
 #import "ENRMContextMenuTextView+macOS.h"
 #import "ENRMImageAttachment.h"
+#import "ENRMLinkLayout.h"
 #import "ENRMMarkdownParser.h"
 #import "ENRMSpoilerOverlayManager.h"
 #import "ENRMSpoilerTapUtils.h"
@@ -56,11 +57,13 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 - (void)setupLayoutManager;
 - (void)emitLinkPress:(NSString *)url;
 - (void)emitLinkLongPress:(NSString *)url;
+- (void)emitLinkLayoutIfNeeded;
 - (void)emitTaskListItemPress:(NSInteger)index checked:(BOOL)checked text:(NSString *)text;
 - (void)emitContextMenuItemPress:(NSString *)itemText
                     selectedText:(NSString *)selectedText
                   selectionStart:(NSUInteger)selectionStart
                     selectionEnd:(NSUInteger)selectionEnd;
+- (void)emitCopyRequest:(NSString *)source markdown:(NSString *)markdown text:(NSString *)text whole:(BOOL)whole;
 @end
 
 @implementation EnrichedMarkdownText {
@@ -109,6 +112,9 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 
   ENRMSpoilerOverlayManager *_spoilerManager;
 
+  BOOL _emitLinkLayout;
+  NSArray<NSDictionary *> *_lastLinkLayout;
+
   NSLineBreakStrategy _lineBreakStrategy;
 
   ENRMWritingDirectionMode _writingDirectionMode;
@@ -182,6 +188,9 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
 
   _lastCommittedSize.store(CGSizeMake(layoutMetrics.frame.size.width, layoutMetrics.frame.size.height));
+#if TARGET_OS_OSX
+  [self emitLinkLayoutIfNeeded];
+#endif
 
   NSWritingDirection resolved = _resolvedLayoutDirection;
   if (layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) {
@@ -217,6 +226,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
     if (needsHeightUpdate(measured, self.bounds)) {
       [self requestHeightUpdate];
     }
+    [self emitLinkLayoutIfNeeded];
   }
 }
 
@@ -301,8 +311,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
                                   selectionEnd:selectionEnd];
         });
     return buildEditMenuForSelection(textView.textStorage, textView.selectedRange, strongSelf->_cachedMarkdown,
-                                     strongSelf->_config, @[ baseMenu ], customItems,
-                                     strongSelf -> _selectionMenuConfig);
+                                     strongSelf->_config, @[ baseMenu ], customItems, strongSelf->_selectionMenuConfig);
   };
 #endif
 
@@ -464,6 +473,8 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
     if (forceHeightUpdate || needsHeightUpdate(measured, self.bounds)) {
       [self requestHeightUpdate];
     }
+
+    [self emitLinkLayoutIfNeeded];
   }
 
   if (_textView.hidden) {
@@ -484,6 +495,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 {
   [super layoutSubviews];
   [_spoilerManager updateIfNeeded];
+  [self emitLinkLayoutIfNeeded];
 }
 #endif
 
@@ -521,6 +533,12 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
     }
   }
 
+  if (newViewProps.emitLinkLayout != _emitLinkLayout) {
+    _emitLinkLayout = newViewProps.emitLinkLayout;
+    _lastLinkLayout = nil;
+    [self emitLinkLayoutIfNeeded];
+  }
+
   if (_textView.selectable != newViewProps.selectable) {
     _textView.selectable = newViewProps.selectable;
   }
@@ -697,6 +715,8 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   _accessibilityNeedsRebuild = NO;
   [_spoilerManager removeAllOverlays];
   _spoilerManager = nil;
+  _emitLinkLayout = NO;
+  _lastLinkLayout = nil;
   if (_textView != nil) {
     ENRMSetAttributedText(_textView, [[NSAttributedString alloc] initWithString:@""]);
     _textView.hidden = YES;
@@ -742,6 +762,25 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownTextCls(void)
     emitter->onLinkLongPress({.url = std::string(url.UTF8String)});
 }
 
+/// Reports link rects to JS (for `renderLinkDecoration`). Called after every
+/// render and layout change; deduplicated so an unchanged layout — the common
+/// case during streaming — sends nothing.
+- (void)emitLinkLayoutIfNeeded
+{
+  if (!_emitLinkLayout || _renderedMarkdown == nil || self.bounds.size.width <= 0)
+    return;
+
+  auto emitter = std::static_pointer_cast<EnrichedMarkdownTextEventEmitter const>(_eventEmitter);
+  if (!emitter)
+    return;
+
+  NSArray<NSDictionary *> *fragments = ENRMCollectLinkLayoutFragments(_textView, CGPointZero, 0, NULL);
+  if (_lastLinkLayout != nil && [fragments isEqualToArray:_lastLinkLayout])
+    return;
+  _lastLinkLayout = fragments;
+  emitter->onLinkLayout(ENRMLinkLayoutEventFromFragments<EnrichedMarkdownTextEventEmitter::OnLinkLayout>(fragments));
+}
+
 - (void)emitTaskListItemPress:(NSInteger)index checked:(BOOL)checked text:(NSString *)text
 {
   auto emitter = std::static_pointer_cast<EnrichedMarkdownTextEventEmitter const>(_eventEmitter);
@@ -749,6 +788,18 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownTextCls(void)
     emitter->onTaskListItemPress({.index = (int)index, .checked = checked, .text = std::string(text.UTF8String ?: "")});
 }
 
+- (void)emitCopyRequest:(NSString *)source markdown:(NSString *)markdown text:(NSString *)text whole:(BOOL)whole
+{
+  auto emitter = std::static_pointer_cast<EnrichedMarkdownTextEventEmitter const>(_eventEmitter);
+  if (emitter)
+    emitter->onCopyRequest({
+        .source = std::string(source.UTF8String),
+        .markdown = std::string(markdown.UTF8String ?: ""),
+        .text = std::string(text.UTF8String ?: ""),
+        .whole = (bool)whole,
+    });
+}
+
 - (void)emitContextMenuItemPress:(NSString *)itemText
                     selectedText:(NSString *)selectedText
                   selectionStart:(NSUInteger)selectionStart
@@ -831,8 +882,18 @@ Class<RCTComponentViewProtocol> EnrichedMarkdownTextCls(void)
   NSMutableArray<UIAction *> *customActions =
       ENRMBuildContextMenuActions(_contextMenuItemTexts, _contextMenuItemIcons, textView, range, handler);
 
+  // A full selection already carries the cached (original) markdown.
+  ENRMCopyRequestHandler onCopyRequest = ^(NSString *markdown, NSString *text, BOOL fullSelection) {
+    EnrichedMarkdownText *strongSelf = weakSelf;
+    if (strongSelf)
+      [strongSelf emitCopyRequest:@"selection"
+                         markdown:markdown
+                             text:text
+                            whole:fullSelection && strongSelf->_cachedMarkdown.length > 0];
+  };
+
   return buildEditMenuForSelection(textView.attributedText, range, _cachedMarkdown, _config, suggestedActions,
-                                   customActions, _selectionMenuConfig);
+                                   customActions, _selectionMenuConfig, onCopyRequest);
 }
 #endif
 

package/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.cpp

@@ -31,6 +31,30 @@ void EnrichedMarkdownEventEmitter::onLinkLongPress(OnLinkLongPress event) const
 }
 
 
+void EnrichedMarkdownEventEmitter::onLinkLayout(OnLinkLayout event) const {
+  dispatchEvent("linkLayout", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    
+    auto fragments = jsi::Array(runtime, event.fragments.size());
+    size_t fragmentsIndex = 0;
+    for (auto fragmentsValue : event.fragments) {
+      auto fragmentsObject = jsi::Object(runtime);
+      fragmentsObject.setProperty(runtime, "linkIndex", fragmentsValue.linkIndex);
+fragmentsObject.setProperty(runtime, "url", fragmentsValue.url);
+fragmentsObject.setProperty(runtime, "text", fragmentsValue.text);
+fragmentsObject.setProperty(runtime, "x", fragmentsValue.x);
+fragmentsObject.setProperty(runtime, "y", fragmentsValue.y);
+fragmentsObject.setProperty(runtime, "width", fragmentsValue.width);
+fragmentsObject.setProperty(runtime, "height", fragmentsValue.height);
+      fragments.setValueAtIndex(runtime, fragmentsIndex++, fragmentsObject);
+    }
+    payload.setProperty(runtime, "fragments", fragments);
+  
+    return payload;
+  });
+}
+
+
 void EnrichedMarkdownEventEmitter::onTaskListItemPress(OnTaskListItemPress event) const {
   dispatchEvent("taskListItemPress", [event=std::move(event)](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
@@ -52,6 +76,18 @@ payload.setProperty(runtime, "language", event.language);
 }
 
 
+void EnrichedMarkdownEventEmitter::onCopyRequest(OnCopyRequest event) const {
+  dispatchEvent("copyRequest", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    payload.setProperty(runtime, "source", event.source);
+payload.setProperty(runtime, "markdown", event.markdown);
+payload.setProperty(runtime, "text", event.text);
+payload.setProperty(runtime, "whole", event.whole);
+    return payload;
+  });
+}
+
+
 void EnrichedMarkdownEventEmitter::onContextMenuItemPress(OnContextMenuItemPress event) const {
   dispatchEvent("contextMenuItemPress", [event=std::move(event)](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
@@ -358,6 +394,30 @@ void EnrichedMarkdownTextEventEmitter::onLinkLongPress(OnLinkLongPress event) co
 }
 
 
+void EnrichedMarkdownTextEventEmitter::onLinkLayout(OnLinkLayout event) const {
+  dispatchEvent("linkLayout", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    
+    auto fragments = jsi::Array(runtime, event.fragments.size());
+    size_t fragmentsIndex = 0;
+    for (auto fragmentsValue : event.fragments) {
+      auto fragmentsObject = jsi::Object(runtime);
+      fragmentsObject.setProperty(runtime, "linkIndex", fragmentsValue.linkIndex);
+fragmentsObject.setProperty(runtime, "url", fragmentsValue.url);
+fragmentsObject.setProperty(runtime, "text", fragmentsValue.text);
+fragmentsObject.setProperty(runtime, "x", fragmentsValue.x);
+fragmentsObject.setProperty(runtime, "y", fragmentsValue.y);
+fragmentsObject.setProperty(runtime, "width", fragmentsValue.width);
+fragmentsObject.setProperty(runtime, "height", fragmentsValue.height);
+      fragments.setValueAtIndex(runtime, fragmentsIndex++, fragmentsObject);
+    }
+    payload.setProperty(runtime, "fragments", fragments);
+  
+    return payload;
+  });
+}
+
+
 void EnrichedMarkdownTextEventEmitter::onTaskListItemPress(OnTaskListItemPress event) const {
   dispatchEvent("taskListItemPress", [event=std::move(event)](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
@@ -379,6 +439,18 @@ payload.setProperty(runtime, "language", event.language);
 }
 
 
+void EnrichedMarkdownTextEventEmitter::onCopyRequest(OnCopyRequest event) const {
+  dispatchEvent("copyRequest", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    payload.setProperty(runtime, "source", event.source);
+payload.setProperty(runtime, "markdown", event.markdown);
+payload.setProperty(runtime, "text", event.text);
+payload.setProperty(runtime, "whole", event.whole);
+    return payload;
+  });
+}
+
+
 void EnrichedMarkdownTextEventEmitter::onContextMenuItemPress(OnContextMenuItemPress event) const {
   dispatchEvent("contextMenuItemPress", [event=std::move(event)](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);

package/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/EventEmitters.h

@@ -25,6 +25,20 @@ class EnrichedMarkdownEventEmitter : public ViewEventEmitter {
       std::string url;
     };
 
+  struct OnLinkLayoutFragments {
+      int linkIndex;
+    std::string url;
+    std::string text;
+    double x;
+    double y;
+    double width;
+    double height;
+    };
+
+  struct OnLinkLayout {
+      std::vector<OnLinkLayoutFragments> fragments;
+    };
+
   struct OnTaskListItemPress {
       int index;
     bool checked;
@@ -36,6 +50,13 @@ class EnrichedMarkdownEventEmitter : public ViewEventEmitter {
     std::string language;
     };
 
+  struct OnCopyRequest {
+      std::string source;
+    std::string markdown;
+    std::string text;
+    bool whole;
+    };
+
   struct OnContextMenuItemPress {
       std::string itemText;
     std::string selectedText;
@@ -46,10 +67,14 @@ class EnrichedMarkdownEventEmitter : public ViewEventEmitter {
 
   void onLinkLongPress(OnLinkLongPress value) const;
 
+  void onLinkLayout(OnLinkLayout value) const;
+
   void onTaskListItemPress(OnTaskListItemPress value) const;
 
   void onCopyPress(OnCopyPress value) const;
 
+  void onCopyRequest(OnCopyRequest value) const;
+
   void onContextMenuItemPress(OnContextMenuItemPress value) const;
 };
 class EnrichedMarkdownTextInputEventEmitter : public ViewEventEmitter {
@@ -292,6 +317,20 @@ class EnrichedMarkdownTextEventEmitter : public ViewEventEmitter {
       std::string url;
     };
 
+  struct OnLinkLayoutFragments {
+      int linkIndex;
+    std::string url;
+    std::string text;
+    double x;
+    double y;
+    double width;
+    double height;
+    };
+
+  struct OnLinkLayout {
+      std::vector<OnLinkLayoutFragments> fragments;
+    };
+
   struct OnTaskListItemPress {
       int index;
     bool checked;
@@ -303,6 +342,13 @@ class EnrichedMarkdownTextEventEmitter : public ViewEventEmitter {
     std::string language;
     };
 
+  struct OnCopyRequest {
+      std::string source;
+    std::string markdown;
+    std::string text;
+    bool whole;
+    };
+
   struct OnContextMenuItemPress {
       std::string itemText;
     std::string selectedText;
@@ -313,10 +359,14 @@ class EnrichedMarkdownTextEventEmitter : public ViewEventEmitter {
 
   void onLinkLongPress(OnLinkLongPress value) const;
 
+  void onLinkLayout(OnLinkLayout value) const;
+
   void onTaskListItemPress(OnTaskListItemPress value) const;
 
   void onCopyPress(OnCopyPress value) const;
 
+  void onCopyRequest(OnCopyRequest value) const;
+
   void onContextMenuItemPress(OnContextMenuItemPress value) const;
 };
 } // namespace facebook::react

package/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/Props.cpp

@@ -21,6 +21,7 @@ EnrichedMarkdownProps::EnrichedMarkdownProps(
 
     markdown(convertRawProp(context, rawProps, "markdown", sourceProps.markdown, {})),
     markdownStyle(convertRawProp(context, rawProps, "markdownStyle", sourceProps.markdownStyle, {})),
+    emitLinkLayout(convertRawProp(context, rawProps, "emitLinkLayout", sourceProps.emitLinkLayout, {false})),
     enableTaskListItemToggle(convertRawProp(context, rawProps, "enableTaskListItemToggle", sourceProps.enableTaskListItemToggle, {true})),
     enableLinkPreview(convertRawProp(context, rawProps, "enableLinkPreview", sourceProps.enableLinkPreview, {true})),
     selectable(convertRawProp(context, rawProps, "selectable", sourceProps.selectable, {false})),
@@ -66,6 +67,10 @@ folly::dynamic EnrichedMarkdownProps::getDiffProps(
     result["markdownStyle"] = toDynamic(markdownStyle);
   }
     
+  if (emitLinkLayout != oldProps->emitLinkLayout) {
+    result["emitLinkLayout"] = emitLinkLayout;
+  }
+    
   if (enableTaskListItemToggle != oldProps->enableTaskListItemToggle) {
     result["enableTaskListItemToggle"] = enableTaskListItemToggle;
   }
@@ -304,6 +309,7 @@ EnrichedMarkdownTextProps::EnrichedMarkdownTextProps(
 
     markdown(convertRawProp(context, rawProps, "markdown", sourceProps.markdown, {})),
     markdownStyle(convertRawProp(context, rawProps, "markdownStyle", sourceProps.markdownStyle, {})),
+    emitLinkLayout(convertRawProp(context, rawProps, "emitLinkLayout", sourceProps.emitLinkLayout, {false})),
     enableTaskListItemToggle(convertRawProp(context, rawProps, "enableTaskListItemToggle", sourceProps.enableTaskListItemToggle, {true})),
     enableLinkPreview(convertRawProp(context, rawProps, "enableLinkPreview", sourceProps.enableLinkPreview, {true})),
     selectable(convertRawProp(context, rawProps, "selectable", sourceProps.selectable, {false})),
@@ -349,6 +355,10 @@ folly::dynamic EnrichedMarkdownTextProps::getDiffProps(
     result["markdownStyle"] = toDynamic(markdownStyle);
   }
     
+  if (emitLinkLayout != oldProps->emitLinkLayout) {
+    result["emitLinkLayout"] = emitLinkLayout;
+  }
+    
   if (enableTaskListItemToggle != oldProps->enableTaskListItemToggle) {
     result["enableTaskListItemToggle"] = enableTaskListItemToggle;
   }

package/ios/generated/ReactCodegen/EnrichedMarkdownTextSpec/Props.h

@@ -997,6 +997,11 @@ struct EnrichedMarkdownMarkdownStyleLinkStruct {
   SharedColor color{};
   bool underline{false};
   SharedColor backgroundColor{};
+  Float borderRadius{0.0};
+  Float paddingHorizontal{0.0};
+  Float paddingVertical{0.0};
+  SharedColor borderColor{};
+  Float borderWidth{0.0};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -1008,6 +1013,11 @@ struct EnrichedMarkdownMarkdownStyleLinkStruct {
     result["color"] = ::facebook::react::toDynamic(color);
     result["underline"] = underline;
     result["backgroundColor"] = ::facebook::react::toDynamic(backgroundColor);
+    result["borderRadius"] = borderRadius;
+    result["paddingHorizontal"] = paddingHorizontal;
+    result["paddingVertical"] = paddingVertical;
+    result["borderColor"] = ::facebook::react::toDynamic(borderColor);
+    result["borderWidth"] = borderWidth;
     return result;
   }
 #endif
@@ -1032,6 +1042,26 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_backgroundColor != map.end()) {
     fromRawValue(context, tmp_backgroundColor->second, result.backgroundColor);
   }
+  auto tmp_borderRadius = map.find("borderRadius");
+  if (tmp_borderRadius != map.end()) {
+    fromRawValue(context, tmp_borderRadius->second, result.borderRadius);
+  }
+  auto tmp_paddingHorizontal = map.find("paddingHorizontal");
+  if (tmp_paddingHorizontal != map.end()) {
+    fromRawValue(context, tmp_paddingHorizontal->second, result.paddingHorizontal);
+  }
+  auto tmp_paddingVertical = map.find("paddingVertical");
+  if (tmp_paddingVertical != map.end()) {
+    fromRawValue(context, tmp_paddingVertical->second, result.paddingVertical);
+  }
+  auto tmp_borderColor = map.find("borderColor");
+  if (tmp_borderColor != map.end()) {
+    fromRawValue(context, tmp_borderColor->second, result.borderColor);
+  }
+  auto tmp_borderWidth = map.find("borderWidth");
+  if (tmp_borderWidth != map.end()) {
+    fromRawValue(context, tmp_borderWidth->second, result.borderWidth);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownMarkdownStyleLinkStruct &value) {
@@ -1049,6 +1079,11 @@ struct EnrichedMarkdownMarkdownStyleLinkVariantsStruct {
   SharedColor color{};
   bool underline{false};
   SharedColor backgroundColor{};
+  Float borderRadius{0.0};
+  Float paddingHorizontal{0.0};
+  Float paddingVertical{0.0};
+  SharedColor borderColor{};
+  Float borderWidth{0.0};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -1060,6 +1095,11 @@ struct EnrichedMarkdownMarkdownStyleLinkVariantsStruct {
     result["color"] = ::facebook::react::toDynamic(color);
     result["underline"] = underline;
     result["backgroundColor"] = ::facebook::react::toDynamic(backgroundColor);
+    result["borderRadius"] = borderRadius;
+    result["paddingHorizontal"] = paddingHorizontal;
+    result["paddingVertical"] = paddingVertical;
+    result["borderColor"] = ::facebook::react::toDynamic(borderColor);
+    result["borderWidth"] = borderWidth;
     return result;
   }
 #endif
@@ -1084,6 +1124,26 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_backgroundColor != map.end()) {
     fromRawValue(context, tmp_backgroundColor->second, result.backgroundColor);
   }
+  auto tmp_borderRadius = map.find("borderRadius");
+  if (tmp_borderRadius != map.end()) {
+    fromRawValue(context, tmp_borderRadius->second, result.borderRadius);
+  }
+  auto tmp_paddingHorizontal = map.find("paddingHorizontal");
+  if (tmp_paddingHorizontal != map.end()) {
+    fromRawValue(context, tmp_paddingHorizontal->second, result.paddingHorizontal);
+  }
+  auto tmp_paddingVertical = map.find("paddingVertical");
+  if (tmp_paddingVertical != map.end()) {
+    fromRawValue(context, tmp_paddingVertical->second, result.paddingVertical);
+  }
+  auto tmp_borderColor = map.find("borderColor");
+  if (tmp_borderColor != map.end()) {
+    fromRawValue(context, tmp_borderColor->second, result.borderColor);
+  }
+  auto tmp_borderWidth = map.find("borderWidth");
+  if (tmp_borderWidth != map.end()) {
+    fromRawValue(context, tmp_borderWidth->second, result.borderWidth);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownMarkdownStyleLinkVariantsStruct &value) {
@@ -2466,6 +2526,7 @@ struct EnrichedMarkdownSelectionMenuConfigStruct {
   bool copyFormatMarkdown{false};
   bool systemItemsNone{false};
   bool codeBlockCopyButton{false};
+  bool interceptCopy{false};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -2484,6 +2545,7 @@ struct EnrichedMarkdownSelectionMenuConfigStruct {
     result["copyFormatMarkdown"] = copyFormatMarkdown;
     result["systemItemsNone"] = systemItemsNone;
     result["codeBlockCopyButton"] = codeBlockCopyButton;
+    result["interceptCopy"] = interceptCopy;
     return result;
   }
 #endif
@@ -2536,6 +2598,10 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_codeBlockCopyButton != map.end()) {
     fromRawValue(context, tmp_codeBlockCopyButton->second, result.codeBlockCopyButton);
   }
+  auto tmp_interceptCopy = map.find("interceptCopy");
+  if (tmp_interceptCopy != map.end()) {
+    fromRawValue(context, tmp_interceptCopy->second, result.interceptCopy);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownSelectionMenuConfigStruct &value) {
@@ -2820,6 +2886,7 @@ class EnrichedMarkdownProps final : public ViewProps {
 
   std::string markdown{};
   EnrichedMarkdownMarkdownStyleStruct markdownStyle{};
+  bool emitLinkLayout{false};
   bool enableTaskListItemToggle{true};
   bool enableLinkPreview{true};
   bool selectable{false};
@@ -4974,6 +5041,11 @@ struct EnrichedMarkdownTextMarkdownStyleLinkStruct {
   SharedColor color{};
   bool underline{false};
   SharedColor backgroundColor{};
+  Float borderRadius{0.0};
+  Float paddingHorizontal{0.0};
+  Float paddingVertical{0.0};
+  SharedColor borderColor{};
+  Float borderWidth{0.0};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -4985,6 +5057,11 @@ struct EnrichedMarkdownTextMarkdownStyleLinkStruct {
     result["color"] = ::facebook::react::toDynamic(color);
     result["underline"] = underline;
     result["backgroundColor"] = ::facebook::react::toDynamic(backgroundColor);
+    result["borderRadius"] = borderRadius;
+    result["paddingHorizontal"] = paddingHorizontal;
+    result["paddingVertical"] = paddingVertical;
+    result["borderColor"] = ::facebook::react::toDynamic(borderColor);
+    result["borderWidth"] = borderWidth;
     return result;
   }
 #endif
@@ -5009,6 +5086,26 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_backgroundColor != map.end()) {
     fromRawValue(context, tmp_backgroundColor->second, result.backgroundColor);
   }
+  auto tmp_borderRadius = map.find("borderRadius");
+  if (tmp_borderRadius != map.end()) {
+    fromRawValue(context, tmp_borderRadius->second, result.borderRadius);
+  }
+  auto tmp_paddingHorizontal = map.find("paddingHorizontal");
+  if (tmp_paddingHorizontal != map.end()) {
+    fromRawValue(context, tmp_paddingHorizontal->second, result.paddingHorizontal);
+  }
+  auto tmp_paddingVertical = map.find("paddingVertical");
+  if (tmp_paddingVertical != map.end()) {
+    fromRawValue(context, tmp_paddingVertical->second, result.paddingVertical);
+  }
+  auto tmp_borderColor = map.find("borderColor");
+  if (tmp_borderColor != map.end()) {
+    fromRawValue(context, tmp_borderColor->second, result.borderColor);
+  }
+  auto tmp_borderWidth = map.find("borderWidth");
+  if (tmp_borderWidth != map.end()) {
+    fromRawValue(context, tmp_borderWidth->second, result.borderWidth);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownTextMarkdownStyleLinkStruct &value) {
@@ -5026,6 +5123,11 @@ struct EnrichedMarkdownTextMarkdownStyleLinkVariantsStruct {
   SharedColor color{};
   bool underline{false};
   SharedColor backgroundColor{};
+  Float borderRadius{0.0};
+  Float paddingHorizontal{0.0};
+  Float paddingVertical{0.0};
+  SharedColor borderColor{};
+  Float borderWidth{0.0};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -5037,6 +5139,11 @@ struct EnrichedMarkdownTextMarkdownStyleLinkVariantsStruct {
     result["color"] = ::facebook::react::toDynamic(color);
     result["underline"] = underline;
     result["backgroundColor"] = ::facebook::react::toDynamic(backgroundColor);
+    result["borderRadius"] = borderRadius;
+    result["paddingHorizontal"] = paddingHorizontal;
+    result["paddingVertical"] = paddingVertical;
+    result["borderColor"] = ::facebook::react::toDynamic(borderColor);
+    result["borderWidth"] = borderWidth;
     return result;
   }
 #endif
@@ -5061,6 +5168,26 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_backgroundColor != map.end()) {
     fromRawValue(context, tmp_backgroundColor->second, result.backgroundColor);
   }
+  auto tmp_borderRadius = map.find("borderRadius");
+  if (tmp_borderRadius != map.end()) {
+    fromRawValue(context, tmp_borderRadius->second, result.borderRadius);
+  }
+  auto tmp_paddingHorizontal = map.find("paddingHorizontal");
+  if (tmp_paddingHorizontal != map.end()) {
+    fromRawValue(context, tmp_paddingHorizontal->second, result.paddingHorizontal);
+  }
+  auto tmp_paddingVertical = map.find("paddingVertical");
+  if (tmp_paddingVertical != map.end()) {
+    fromRawValue(context, tmp_paddingVertical->second, result.paddingVertical);
+  }
+  auto tmp_borderColor = map.find("borderColor");
+  if (tmp_borderColor != map.end()) {
+    fromRawValue(context, tmp_borderColor->second, result.borderColor);
+  }
+  auto tmp_borderWidth = map.find("borderWidth");
+  if (tmp_borderWidth != map.end()) {
+    fromRawValue(context, tmp_borderWidth->second, result.borderWidth);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownTextMarkdownStyleLinkVariantsStruct &value) {
@@ -6443,6 +6570,7 @@ struct EnrichedMarkdownTextSelectionMenuConfigStruct {
   bool copyFormatMarkdown{false};
   bool systemItemsNone{false};
   bool codeBlockCopyButton{false};
+  bool interceptCopy{false};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -6461,6 +6589,7 @@ struct EnrichedMarkdownTextSelectionMenuConfigStruct {
     result["copyFormatMarkdown"] = copyFormatMarkdown;
     result["systemItemsNone"] = systemItemsNone;
     result["codeBlockCopyButton"] = codeBlockCopyButton;
+    result["interceptCopy"] = interceptCopy;
     return result;
   }
 #endif
@@ -6513,6 +6642,10 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_codeBlockCopyButton != map.end()) {
     fromRawValue(context, tmp_codeBlockCopyButton->second, result.codeBlockCopyButton);
   }
+  auto tmp_interceptCopy = map.find("interceptCopy");
+  if (tmp_interceptCopy != map.end()) {
+    fromRawValue(context, tmp_interceptCopy->second, result.interceptCopy);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownTextSelectionMenuConfigStruct &value) {
@@ -6797,6 +6930,7 @@ class EnrichedMarkdownTextProps final : public ViewProps {
 
   std::string markdown{};
   EnrichedMarkdownTextMarkdownStyleStruct markdownStyle{};
+  bool emitLinkLayout{false};
   bool enableTaskListItemToggle{true};
   bool enableLinkPreview{true};
   bool selectable{false};

package/ios/internals/MeasurementCache.h

@@ -128,6 +128,11 @@ template <typename StyleStruct> inline size_t computeStyleFingerprint(const Styl
              s.codeBlock.borderWidth);
   hashFields(s.code.fontFamily, s.code.fontSize);
   hashFields(s.link.fontFamily, s.strong.fontFamily, s.strong.fontWeight, s.em.fontFamily, s.em.fontStyle);
+  // Link chip horizontal padding reserves space in the line; variants can set their own.
+  hashFields(s.link.paddingHorizontal);
+  for (const auto &variant : s.linkVariants) {
+    hashFields(variant.pattern, variant.paddingHorizontal);
+  }
   hashFields(s.highlight.backgroundColor, s.highlight.color);
 
   // Visual/Spacing Elements