fix: github flavor always expanding to full width (#176)

Author: hryhoriiK97

android/src/main/java/com/swmansion/enriched/markdown/MeasurementStore.kt

@@ -349,6 +349,7 @@ object MeasurementStore {
       val widthPx = width.toInt().coerceAtLeast(1)
       val lastIndex = segments.lastIndex
       var totalHeightPx = 0f
+      var maxContentWidthPx = 0f
 
       for ((index, segment) in segments.withIndex()) {
         val isLastSegment = index == lastIndex
@@ -364,6 +365,9 @@ object MeasurementStore {
             val layout = createStaticLayout(styledText, fontSize, widthPx)
             totalHeightPx += layout.height
 
+            val segmentMaxLineWidth = (0 until layout.lineCount).maxOfOrNull { layout.getLineWidth(it) } ?: 0f
+            maxContentWidthPx = maxOf(maxContentWidthPx, ceil(segmentMaxLineWidth))
+
             if (includeBottomMargin) {
               totalHeightPx += segmentRenderer.getLastElementMarginBottom()
             }
@@ -372,6 +376,7 @@ object MeasurementStore {
           is MarkdownSegment.Table -> {
             totalHeightPx += style.tableStyle.marginTop
             totalHeightPx += TableContainerView.measureTableNodeHeight(segment.node, style, context)
+            maxContentWidthPx = width
             if (includeBottomMargin) {
               totalHeightPx += style.tableStyle.marginBottom
             }
@@ -380,6 +385,7 @@ object MeasurementStore {
           is MarkdownSegment.Math -> {
             totalHeightPx += style.mathStyle.marginTop
             totalHeightPx += mathHeightByIndex[index] ?: 0f
+            maxContentWidthPx = width
             if (includeBottomMargin) {
               totalHeightPx += style.mathStyle.marginBottom
             }
@@ -388,7 +394,8 @@ object MeasurementStore {
       }
 
       val totalHeightDip = PixelUtil.toDIPFromPixel(totalHeightPx)
-      val result = YogaMeasureOutput.make(PixelUtil.toDIPFromPixel(width), totalHeightDip)
+      val measuredWidthDip = PixelUtil.toDIPFromPixel(maxContentWidthPx).coerceAtMost(PixelUtil.toDIPFromPixel(width))
+      val result = YogaMeasureOutput.make(measuredWidthDip, totalHeightDip)
 
       if (id != null) {
         data[id] = MeasurementParams(width, result, null, PaintParams(Typeface.DEFAULT, fontSize), propsHash)

ios/EnrichedMarkdown.mm

@@ -180,12 +180,13 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
-- (CGFloat)computeSegmentLayoutForWidth:(CGFloat)width applyFrames:(BOOL)applyFrames
+- (CGSize)computeSegmentLayoutForWidth:(CGFloat)width applyFrames:(BOOL)applyFrames
 {
   if (_segmentViews.count == 0)
-    return 0.0;
+    return CGSizeZero;
 
   __block CGFloat yOffset = 0.0;
+  __block CGFloat maxContentWidth = 0.0;
   const NSUInteger lastIndex = _segmentViews.count - 1;
 
   [_segmentViews enumerateObjectsUsingBlock:^(RCTUIView *segment, NSUInteger i, BOOL *stop) {
@@ -197,16 +198,20 @@ - (CGFloat)computeSegmentLayoutForWidth:(CGFloat)width applyFrames:(BOOL)applyFr
     if ([segment isKindOfClass:[EnrichedMarkdownInternalText class]]) {
       EnrichedMarkdownInternalText *textView = (EnrichedMarkdownInternalText *)segment;
       textView.allowTrailingMargin = shouldAddBottomMargin;
-      segmentHeight = [textView measureHeight:width];
+      CGSize textSize = [textView measureSize:width];
+      segmentHeight = textSize.height;
+      maxContentWidth = MAX(maxContentWidth, textSize.width);
 
     } else if ([segment isKindOfClass:[TableContainerView class]]) {
       yOffset += _config.tableMarginTop;
       segmentHeight = [(TableContainerView *)segment measureHeight:width];
+      maxContentWidth = width;
     }
 #if ENRICHED_MARKDOWN_MATH
     else if ([segment isKindOfClass:[ENRMMathContainerView class]]) {
       yOffset += _config.mathMarginTop;
       segmentHeight = [(ENRMMathContainerView *)segment measureHeight:width];
+      maxContentWidth = width;
     }
 #endif
 
@@ -236,19 +241,20 @@ - (CGFloat)computeSegmentLayoutForWidth:(CGFloat)width applyFrames:(BOOL)applyFr
 #endif
   }];
 
-  return yOffset;
+  return CGSizeMake(maxContentWidth, yOffset);
 }
 
 - (CGSize)measureSize:(CGFloat)maxWidth
 {
   CGFloat defaultHeight = UIFontLineHeight([UIFont systemFontOfSize:16.0]);
-  CGFloat totalHeight = [self computeSegmentLayoutForWidth:maxWidth applyFrames:NO];
-  if (totalHeight == 0)
+  CGSize contentSize = [self computeSegmentLayoutForWidth:maxWidth applyFrames:NO];
+  if (contentSize.height == 0)
     return CGSizeMake(maxWidth, defaultHeight);
 
-  // Round to pixel boundaries to match React Native's <Text> measurement
   CGFloat scale = RCTScreenScale();
-  return CGSizeMake(maxWidth, ceil(totalHeight * scale) / scale);
+  CGFloat measuredWidth = MIN(ceil(contentSize.width * scale) / scale, maxWidth);
+  CGFloat measuredHeight = ceil(contentSize.height * scale) / scale;
+  return CGSizeMake(measuredWidth, measuredHeight);
 }
 
 - (BOOL)hasRenderedMarkdown:(NSString *)markdown

ios/views/EnrichedMarkdownInternalText.h

@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)applyAttributedText:(NSMutableAttributedString *)text context:(RenderContext *)context;
 
 - (CGFloat)measureHeight:(CGFloat)maxWidth;
+- (CGSize)measureSize:(CGFloat)maxWidth;
 
 @property (nonatomic, readonly) ENRMPlatformTextView *textView;
 

ios/views/EnrichedMarkdownInternalText.m

@@ -87,21 +87,26 @@ - (void)applyAttributedText:(NSMutableAttributedString *)text context:(RenderCon
 }
 
 - (CGFloat)measureHeight:(CGFloat)maxWidth
+{
+  return [self measureSize:maxWidth].height;
+}
+
+- (CGSize)measureSize:(CGFloat)maxWidth
 {
   NSAttributedString *text = ENRMGetAttributedText(_textView);
   if (text.length == 0) {
-    return 0;
+    return CGSizeZero;
   }
 
   ENRMTextLayoutResult layout = ENRMMeasureTextLayout(_textView, maxWidth);
 
   CGFloat measuredHeight = layout.usedRect.size.height;
+  CGFloat measuredWidth = layout.usedRect.size.width;
 
   if (!CGRectIsEmpty(layout.extraLineFragmentRect)) {
     measuredHeight -= layout.extraLineFragmentRect.size.height;
   }
 
-  // Code block bottom padding compensation (same as EnrichedMarkdownText)
   if (isLastElementCodeBlock(text)) {
     measuredHeight += [_config codeBlockPadding];
   }
@@ -110,9 +115,8 @@ - (CGFloat)measureHeight:(CGFloat)maxWidth
     measuredHeight += _lastElementMarginBottom;
   }
 
-  // Round to pixel boundaries to match React Native's <Text> measurement
   CGFloat scale = RCTScreenScale();
-  return ceil(measuredHeight * scale) / scale;
+  return CGSizeMake(ceil(measuredWidth * scale) / scale, ceil(measuredHeight * scale) / scale);
 }
 
 - (void)layoutSubviews