react-native-enriched-markdown 1.1.0-nightly-20260930-7bcab4e4a → 1.1.0

package/README.md

@@ -262,7 +262,8 @@ We're actively working on expanding the capabilities of `react-native-enriched-m
 |             | 0.82 | 0.83 | 0.84 | 0.85 | 0.86 | 0.87 |
 | ----------- | :--: | :--: | :--: | :--: | :--: | :--: |
 | **nightly** |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
-| **1.0.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
+| **1.1.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
+| **1.0.x**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
 | **0.7.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
 | **0.6.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ⛔  |  ⛔  |
 | **0.5.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ⛔  |  ⛔  |

package/docs/BREAKING_CHANGES.md

@@ -5,6 +5,11 @@ This file tracks breaking changes and how to migrate for each. Entries are newes
 
 ## Unreleased
 
+## v1.1.0
+
+No breaking changes. v1.1.0 is additive over v1.0.2 - every public prop, method, event and style key
+from v1.0.2 keeps its name and behaviour, and no deprecation was introduced or removed.
+
 ## v1.0.2
 
 ### The Expo config plugin was removed

package/ios/EnrichedMarkdown.mm

@@ -404,6 +404,32 @@ static char kENRMSegmentFadeAnimatorKey;
   return view;
 }
 
+/// The box the segments actually live in: the component frame inset by the
+/// `containerStyle` border and padding (`LayoutMetrics::getContentFrame`).
+///
+/// Yoga hands `measureContent` an available size that already excludes those
+/// insets and then adds them back to the frame it commits, so laying the
+/// segments out against `self.bounds` would stack them over the padding and
+/// across the border while the space Yoga reserved for the content stays blank
+/// at the bottom. Unlike `EnrichedMarkdownText`, the segments are attached to
+/// the component view itself rather than to `contentView`, so nothing applies
+/// the insets for us.
+///
+/// Taken from `_layoutMetrics` rather than recomputed off `self.bounds`:
+/// `prepareForRecycle` resets the metrics but leaves the bounds behind, so the
+/// two do not always agree. The box is empty both before the first layout
+/// metrics arrive and when the insets consume the whole component width; neither
+/// may fall back to `self.bounds`, which is the padded border box the segments
+/// must not be drawn across, so an over-constrained box clamps to zero and
+/// callers skip laying out at all.
+- (CGRect)contentBounds
+{
+  CGRect box = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+  box.size.width = MAX(box.size.width, 0);
+  box.size.height = MAX(box.size.height, 0);
+  return box;
+}
+
 - (CGSize)computeSegmentLayoutForWidth:(CGFloat)width applyFrames:(BOOL)applyFrames
 {
   if (_segmentViews.count == 0)
@@ -435,6 +461,10 @@ static char kENRMSegmentFadeAnimatorKey;
   __block CGFloat yOffset = 0.0;
   __block CGFloat maxContentWidth = 0.0;
   const NSUInteger lastIndex = _segmentViews.count - 1;
+  // Frames are stacked in the component's own coordinate space, so the content
+  // origin (containerStyle border + padding) shifts every segment. yOffset stays
+  // content-relative because it doubles as the measured content height.
+  const CGPoint contentOrigin = applyFrames ? [self contentBounds].origin : CGPointZero;
 
   [_segmentViews enumerateObjectsUsingBlock:^(RCTUIView *segment, NSUInteger i, BOOL *stop) {
     const BOOL isLast = (i == lastIndex);
@@ -480,16 +510,16 @@ static char kENRMSegmentFadeAnimatorKey;
 #endif
 
     if (applyFrames) {
-      CGFloat segmentX = 0;
+      CGFloat segmentX = contentOrigin.x;
       CGFloat segmentWidth = width;
       if (isTable) {
         CGFloat overhang = MAX(_config.tableHorizontalOverflow, 0);
         if (overhang > 0) {
-          segmentX = -overhang;
+          segmentX = contentOrigin.x - overhang;
           segmentWidth = width + overhang * 2;
         }
       }
-      CGRect segmentFrame = CGRectMake(segmentX, yOffset, segmentWidth, segmentHeight);
+      CGRect segmentFrame = CGRectMake(segmentX, contentOrigin.y + yOffset, segmentWidth, segmentHeight);
       segment.frame = segmentFrame;
 #if TARGET_OS_OSX
       if ([segment isKindOfClass:[EnrichedMarkdownInternalText class]]) {
@@ -580,15 +610,21 @@ static char kENRMSegmentFadeAnimatorKey;
   }
 }
 
-/// Yoga-resolved direction inherited from any ancestor `direction` style.
-/// In FirstStrong mode this feeds the neutral-paragraph fallback, so a change
-/// requires segment recreation.
+/// Publishes the committed size to the streaming fast path's mailbox, and picks
+/// up the Yoga-resolved direction inherited from any ancestor `direction` style.
+/// In FirstStrong mode the direction feeds the neutral-paragraph fallback, so a
+/// change requires segment recreation.
+///
+/// The mailbox holds a content size, not the border box: `measureContent`
+/// returns it straight to Yoga, which adds the `containerStyle` insets back on
+/// top of whatever it gets, so storing `frame.size` would double-count them.
 - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
            oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics
 {
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
 
-  _lastCommittedSize.store(CGSizeMake(layoutMetrics.frame.size.width, layoutMetrics.frame.size.height));
+  const auto contentSize = layoutMetrics.getContentFrame().size;
+  _lastCommittedSize.store(CGSizeMake(contentSize.width, contentSize.height));
 
   NSWritingDirection resolved = _resolvedLayoutDirection;
   if (layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) {
@@ -649,10 +685,11 @@ static char kENRMSegmentFadeAnimatorKey;
     MeasurementCache::shared().removeMatchingMarkdown(std::string(_renderedMarkdown.UTF8String));
   }
 
-  if (self.bounds.size.width > 0) {
+  CGRect contentBounds = [self contentBounds];
+  if (contentBounds.size.width > 0) {
     [self setNeedsLayout];
-    CGSize measured = [self measureSize:self.bounds.size.width];
-    if (needsHeightUpdate(measured, self.bounds)) {
+    CGSize measured = [self measureSize:contentBounds.size.width];
+    if (needsHeightUpdate(measured, contentBounds)) {
       [self requestHeightUpdate];
     }
   }
@@ -829,16 +866,17 @@ static char kENRMSegmentFadeAnimatorKey;
     }
   }];
 
-  if (self.bounds.size.width > 0) {
+  CGRect contentBounds = [self contentBounds];
+  if (contentBounds.size.width > 0) {
     [self setNeedsLayout];
 
     if (forceHeightUpdate || segmentTopologyChanged) {
-      [self computeSegmentLayoutForWidth:self.bounds.size.width applyFrames:YES];
+      [self computeSegmentLayoutForWidth:contentBounds.size.width applyFrames:YES];
       [self layoutIfNeeded];
       [self requestHeightUpdate];
     } else {
-      CGSize measured = [self measureSize:self.bounds.size.width];
-      if (needsHeightUpdate(measured, self.bounds)) {
+      CGSize measured = [self measureSize:contentBounds.size.width];
+      if (needsHeightUpdate(measured, contentBounds)) {
         [self requestHeightUpdate];
       }
     }
@@ -1012,7 +1050,10 @@ static char kENRMSegmentFadeAnimatorKey;
 - (void)layoutSubviews
 {
   [super layoutSubviews];
-  [self computeSegmentLayoutForWidth:self.bounds.size.width applyFrames:YES];
+  CGFloat contentWidth = [self contentBounds].size.width;
+  if (contentWidth > 0) {
+    [self computeSegmentLayoutForWidth:contentWidth applyFrames:YES];
+  }
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
@@ -1230,9 +1271,12 @@ static char kENRMSegmentFadeAnimatorKey;
       }
     }
 
-    CGSize measured = [self measureSize:self.bounds.size.width];
-    if (needsHeightUpdate(measured, self.bounds)) {
-      [self requestHeightUpdate];
+    CGRect contentBounds = [self contentBounds];
+    if (contentBounds.size.width > 0) {
+      CGSize measured = [self measureSize:contentBounds.size.width];
+      if (needsHeightUpdate(measured, contentBounds)) {
+        [self requestHeightUpdate];
+      }
     }
   }
 }

package/ios/EnrichedMarkdownText.mm

@@ -151,6 +151,34 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 
 #pragma mark - Measuring and State
 
+/// The box the text actually lives in: `self.bounds` inset by the
+/// `containerStyle` border and padding.
+///
+/// Yoga hands `measureContent` an available size that already excludes those
+/// insets, and `RCTViewComponentView` sizes `contentView` (our text view) to
+/// `layoutMetrics.getContentFrame()`, so the shadow node's height and the text
+/// view's frame are both content-box quantities. Measuring at `self.bounds`
+/// instead overshoots by the horizontal insets, and because
+/// `ENRMMeasureTextLayout` measures by resizing the live display container and
+/// leaves it there (UIKit never re-syncs it - `widthTracksTextView` does not
+/// apply with `scrollEnabled = NO`), the overshoot becomes the layout the user
+/// sees: glyphs spill past the text view and get clipped, while the taller
+/// content-width height Yoga committed shows up as blank space at the bottom.
+///
+/// The text view's frame is authoritative, so this is zero-sized both before the
+/// first layout metrics arrive and when the insets consume the whole component
+/// width. Neither may fall back to `self.bounds`: that is the padded border box,
+/// and in the second case it is a real layout the text would then be drawn
+/// across. Callers skip measuring and laying out at a zero width instead.
+///
+/// The frame, not the bounds: a `UITextView` is a scroll view, so its
+/// `bounds.origin` is the content offset rather than the inset the segments of
+/// `EnrichedMarkdown` get from the matching method.
+- (CGRect)contentBounds
+{
+  return _textView.frame;
+}
+
 - (CGSize)measureSize:(CGFloat)maxWidth
 {
   CGSize size = ENRMMeasureMarkdownText(_textView, maxWidth, _config, _allowTrailingMargin, _lastElementMarginBottom);
@@ -186,15 +214,21 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   }
 }
 
-/// Yoga-resolved direction inherited from any ancestor `direction` style.
-/// In FirstStrong mode this feeds the neutral-paragraph fallback, so a change
-/// requires a re-render of the cached markdown.
+/// Publishes the committed size to the streaming fast path's mailbox, and picks
+/// up the Yoga-resolved direction inherited from any ancestor `direction` style.
+/// In FirstStrong mode the direction feeds the neutral-paragraph fallback, so a
+/// change requires a re-render of the cached markdown.
+///
+/// The mailbox holds a content size, not the border box: `measureContent`
+/// returns it straight to Yoga, which adds the `containerStyle` insets back on
+/// top of whatever it gets, so storing `frame.size` would double-count them.
 - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
            oldLayoutMetrics:(const LayoutMetrics &)oldLayoutMetrics
 {
   [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
 
-  _lastCommittedSize.store(CGSizeMake(layoutMetrics.frame.size.width, layoutMetrics.frame.size.height));
+  const auto contentSize = layoutMetrics.getContentFrame().size;
+  _lastCommittedSize.store(CGSizeMake(contentSize.width, contentSize.height));
 
   NSWritingDirection resolved = _resolvedLayoutDirection;
   if (layoutMetrics.layoutDirection == LayoutDirection::RightToLeft) {
@@ -225,9 +259,10 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
     facebook::react::MeasurementCache::shared().removeMatchingMarkdown(std::string(_renderedMarkdown.UTF8String));
   }
 
-  if (self.bounds.size.width > 0) {
-    CGSize measured = [self measureSize:self.bounds.size.width];
-    if (needsHeightUpdate(measured, self.bounds)) {
+  CGRect contentBounds = [self contentBounds];
+  if (contentBounds.size.width > 0) {
+    CGSize measured = [self measureSize:contentBounds.size.width];
+    if (needsHeightUpdate(measured, contentBounds)) {
       [self requestHeightUpdate];
     }
   }
@@ -444,17 +479,12 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 }
 
 // Kept in sync with the view-free measurement so the rendered line count matches
-// the measured height. The clamp must be computed at the padding-inset content
-// width (the text view's own width) rather than the full component bounds, or a
-// full-width measurement pass leaves the truncation laid out too wide and fewer
-// lines render than were measured. numberOfLines == 0 restores the unlimited default.
+// the measured height: both clamp a layout performed at the content width (see
+// contentBounds), so the truncation falls on the same word.
+// numberOfLines == 0 restores the unlimited default.
 - (void)applyLineClampToTextContainer
 {
   if (_numberOfLines > 0) {
-    CGFloat contentWidth = _textView.bounds.size.width;
-    if (contentWidth > 0) {
-      _textView.textContainer.size = CGSizeMake(contentWidth, CGFLOAT_MAX);
-    }
     _textView.textContainer.maximumNumberOfLines = _numberOfLines;
     _textView.textContainer.lineBreakMode = _ellipsizeLineBreakMode;
   } else {
@@ -477,9 +507,10 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   // Ensure the text container has unlimited height before setting content.
   // updateLayoutMetrics may have shrunk the frame (and thus the text container)
   // from a previous layout pass, which would clip the new attributed text.
-  CGFloat containerWidth = _textView.textContainer.size.width;
+  CGRect contentBounds = [self contentBounds];
+  CGFloat containerWidth = contentBounds.size.width;
   if (containerWidth <= 0) {
-    containerWidth = self.bounds.size.width;
+    containerWidth = _textView.textContainer.size.width;
   }
   _textView.textContainer.size = CGSizeMake(containerWidth, CGFLOAT_MAX);
   [self applyLineClampToTextContainer];
@@ -499,7 +530,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   // that corrupts the height sent to Yoga.
   [_spoilerManager setNeedsUpdate];
 
-  if (self.bounds.size.width > 0) {
+  if (contentBounds.size.width > 0) {
     // Font/style changes can produce the same measured size before UIKit has
     // fully refreshed layout, so force one Yoga update after those renders.
     BOOL forceHeightUpdate = _forceHeightUpdateOnNextRender;
@@ -513,19 +544,10 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 
     [_spoilerManager updateIfNeeded];
 
-    CGSize measured = [self measureSize:self.bounds.size.width];
-    if (forceHeightUpdate || needsHeightUpdate(measured, self.bounds)) {
+    CGSize measured = [self measureSize:contentBounds.size.width];
+    if (forceHeightUpdate || needsHeightUpdate(measured, contentBounds)) {
       [self requestHeightUpdate];
     }
-
-    // measureSize lays the shared display container out at the full bounds width;
-    // re-pin the clamp to the content width so the visible truncation matches the
-    // content-width line count the shadow node measured.
-    if (_numberOfLines > 0) {
-      [self applyLineClampToTextContainer];
-      [_textView.layoutManager ensureLayoutForTextContainer:_textView.textContainer];
-      ENRMSetNeedsDisplay(_textView);
-    }
   }
 
   if (_textView.hidden) {
@@ -741,14 +763,20 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 
   if (self.window && _renderedMarkdown != nil) {
     _textView.hidden = NO;
-    ENRMRefreshTextViewAfterWindowAttach(_textView, self.bounds);
+    // Refresh in place: RCTViewComponentView owns the text view's frame and has
+    // already set it to the content frame, so re-assigning self.bounds here would
+    // drop the containerStyle insets (see contentBounds).
+    ENRMRefreshTextViewLayout(_textView);
 
     [_spoilerManager setNeedsUpdate];
     [_spoilerManager updateIfNeeded];
 
-    CGSize measured = [self measureSize:self.bounds.size.width];
-    if (needsHeightUpdate(measured, self.bounds)) {
-      [self requestHeightUpdate];
+    CGRect contentBounds = [self contentBounds];
+    if (contentBounds.size.width > 0) {
+      CGSize measured = [self measureSize:contentBounds.size.width];
+      if (needsHeightUpdate(measured, contentBounds)) {
+        [self requestHeightUpdate];
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-enriched-markdown",
-  "version": "1.1.0-nightly-20260930-7bcab4e4a",
+  "version": "1.1.0",
   "description": "Markdown-based Rich Text solution for React Native",
   "main": "./lib/module/index",
   "module": "./lib/module/index",