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

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.x**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
+| **1.0.x**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
 | **0.7.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ✅  |  ✅  |
 | **0.6.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ⛔  |  ⛔  |
 | **0.5.0**   |  ⛔  |  ✅  |  ✅  |  ✅  |  ⛔  |  ⛔  |

package/android/src/main/java/com/swmansion/enriched/markdown/input/EnrichedMarkdownTextInputView.kt

@@ -60,6 +60,8 @@ class EnrichedMarkdownTextInputView(
   context: Context,
 ) : AppCompatEditText(context) {
   private var isComponentReady = false
+  private var lastEmittedSelectionStart = -1
+  private var lastEmittedSelectionEnd = -1
 
   val formattingStore = FormattingStore()
   val blockStore = BlockStore()
@@ -387,6 +389,7 @@ class EnrichedMarkdownTextInputView(
     } finally {
       editSession.exit()
     }
+    emitSelectionIfChanged()
   }
 
   override fun onSelectionChanged(
@@ -416,12 +419,33 @@ class EnrichedMarkdownTextInputView(
       syncEmptyListAnchor()
     }
 
-    eventEmitter.emitSelection(selStart, selEnd)
+    emitSelectionIfChanged()
     dispatchMentionUpdate()
     eventEmitter.emitState()
     eventEmitter.emitCaretRectChangeIfNeeded()
   }
 
+  /**
+   * Sends the caret range to JS when it differs from the last range JS received.
+   *
+   * [onSelectionChanged] returns immediately while an edit phase is active, so
+   * a caret move from setValue, a programmatic insert, or anchor management is
+   * not reported there. Those callers invoke this once the edit phase has ended.
+   *
+   * This function then rereads the latest range at that point before emitting
+   * the selection.
+   */
+  private fun emitSelectionIfChanged() {
+    if (!isComponentReady) return
+    val start = selectionStart
+    val end = selectionEnd
+    if (start == lastEmittedSelectionStart && end == lastEmittedSelectionEnd) return
+    if (eventEmitter.emitSelection(start, end)) {
+      lastEmittedSelectionStart = start
+      lastEmittedSelectionEnd = end
+    }
+  }
+
   /**
    * Text typed over a non-empty selection inherits the inline styles of the first
    * selected character (mirrors iOS rebuildFromContext and the range-inheritance
@@ -478,6 +502,7 @@ class EnrichedMarkdownTextInputView(
     } finally {
       editSession.exit()
     }
+    emitSelectionIfChanged()
   }
 
   fun applyFormatting() {
@@ -971,6 +996,7 @@ class EnrichedMarkdownTextInputView(
     } finally {
       editSession.exit()
     }
+    emitSelectionIfChanged()
   }
 
   override fun setBackgroundColor(color: Int) {
@@ -1036,10 +1062,22 @@ class EnrichedMarkdownTextInputView(
     AutoCapitalizeUtils.apply(this, flagName)
   }
 
-  fun requestFocusProgrammatically() {
-    requestFocus()
-    inputMethodManager?.showSoftInput(this, 0)
-    setSelection(selectionStart.coerceAtLeast(0))
+  /**
+   * Programmatic focus for ref.focus() and for the focus command that the JS
+   * pressability onPress sends on finger-up (including after a long-press word
+   * select).
+   *
+   * Matches ReactEditText.requestFocusProgrammatically: request focus and show
+   * the keyboard without touching the selection, so a long-press word selection
+   * isn't collapsed:
+   * https://github.com/react/react-native/blob/v0.86.2/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt#L396-L402
+   */
+  fun requestFocusProgrammatically(): Boolean {
+    val focused = super.requestFocus(FOCUS_DOWN, null)
+    if (isInTouchMode && showSoftInputOnFocus) {
+      inputMethodManager?.showSoftInput(this, 0)
+    }
+    return focused
   }
 
   private fun showAutoFocusKeyboardIfPending() {

package/android/src/main/java/com/swmansion/enriched/markdown/input/layout/InputEventEmitter.kt

@@ -48,9 +48,7 @@ class InputEventEmitter(
   fun emitSelection(
     start: Int,
     end: Int,
-  ) {
-    dispatch(OnChangeSelectionEvent(surfaceId(), view.id, start, end))
-  }
+  ): Boolean = dispatch(OnChangeSelectionEvent(surfaceId(), view.id, start, end))
 
   fun emitState() {
     val pos = view.selectionStart
@@ -236,10 +234,13 @@ class InputEventEmitter(
     return UIManagerHelper.getSurfaceId(reactContext)
   }
 
-  private fun dispatch(event: Event<*>) {
-    if (view.editSession.shouldSuppressEvents) return
-    val reactContext = view.context as? ReactContext ?: return
-    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id)
-    dispatcher?.dispatchEvent(event)
+  /** Returns true when [event] was handed to the React event dispatcher */
+  private fun dispatch(event: Event<*>): Boolean {
+    if (view.editSession.shouldSuppressEvents) return false
+    val reactContext = view.context as? ReactContext ?: return false
+    val dispatcher =
+      UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id) ?: return false
+    dispatcher.dispatchEvent(event)
+    return true
   }
 }

package/docs/API_REFERENCE.md

@@ -935,6 +935,30 @@ Fires when the input loses focus.
 
 The input participates in React Native's text-input focus tracking (`TextInput.State`), so blur also happens through the platform's standard keyboard-dismiss paths: taps outside the input inside a `ScrollView` (per its `keyboardShouldPersistTaps` setting) and `Keyboard.dismiss()`. See [Keyboard Dismissal](INPUT.md#keyboard-dismissal).
 
+### `onPress`, `onPressIn`, `onPressOut`
+
+Fire for taps on the input, like React Native `TextInput`. The input claims the JS touch responder, so a tap that focuses it does not also fire the `onPress` of an ancestor `Pressable`. After `onPress` runs, the input focuses itself (unless `editable` is `false`) without changing the current selection. As on `TextInput`, responder props passed through `ViewProps` (`onStartShouldSetResponder`, `onResponderGrant`, and the rest) are overridden by the input's press handling.
+
+| Type                                        | Default Value | Platform |
+| ------------------------------------------- | ------------- | -------- |
+| `(event: GestureResponderEvent) => unknown` | -             | Both     |
+
+### `hitSlop`
+
+Extends the touchable area for the press handlers above. Same as `hitSlop` on React Native `TextInput`.
+
+| Type                   | Default Value | Platform |
+| ---------------------- | ------------- | -------- |
+| `ViewProps['hitSlop']` | -             | Both     |
+
+### `rejectResponderTermination`
+
+When `true`, a parent scroll view or pressable can't take over the touch responder while the input is being pressed. Same as React Native `TextInput`.
+
+| Type      | Default Value | Platform |
+| --------- | ------------- | -------- |
+| `boolean` | `true`        | iOS      |
+
 ### `onStartMention`
 
 Fires when a new mention flow starts. See [Mentions](MENTIONS.md#events).

package/docs/BREAKING_CHANGES.md

@@ -5,6 +5,16 @@ This file tracks breaking changes and how to migrate for each. Entries are newes
 
 ## Unreleased
 
+## v1.1.1
+
+No breaking changes. v1.1.1 is a patch release over v1.1.0 - every public prop, method, event and style
+key from v1.1.0 keeps its name and behaviour, and no deprecation was introduced or removed.
+
+## 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

@@ -377,6 +377,7 @@ static char kENRMSegmentFadeAnimatorKey;
   view.allowFontScaling = _fontScaleObserver.allowFontScaling;
   view.lineBreakStrategy = _lineBreakStrategy;
   view.dynamicProps = _dynamicBlockProps;
+  view.accessibilityLabels = _accessibilityLabels;
 
   __weak EnrichedMarkdown *weakSelf = self;
   view.onCopyPress = ^(NSString *code, NSString *language) {
@@ -404,6 +405,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 +462,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 +511,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 +611,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) {
@@ -625,6 +662,8 @@ static char kENRMSegmentFadeAnimatorKey;
       ((EnrichedMarkdownInternalText *)segment).accessibilityLabels = _accessibilityLabels;
     } else if ([segment isKindOfClass:[TableContainerView class]]) {
       ((TableContainerView *)segment).accessibilityLabels = _accessibilityLabels;
+    } else if ([segment isKindOfClass:[ENRMBlockquoteContainerView class]]) {
+      ((ENRMBlockquoteContainerView *)segment).accessibilityLabels = _accessibilityLabels;
     }
 #if ENRICHED_MARKDOWN_MATH
     else if ([segment isKindOfClass:[ENRMMathContainerView class]]) {
@@ -649,10 +688,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 +869,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 +1053,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 +1274,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/ios/internals/ShadowMeasurementUtils.h

@@ -70,8 +70,7 @@ static inline bool ENRMPropsNeedExactStreamingMeasurement(const PropsT &oldProps
          oldProps.md4cFlags.highlight != newProps.md4cFlags.highlight ||
          oldProps.md4cFlags.hardSoftBreaks != newProps.md4cFlags.hardSoftBreaks ||
          oldProps.md4cFlags.preserveBlankLines != newProps.md4cFlags.preserveBlankLines ||
-         oldProps.isGFM != newProps.isGFM ||
-         oldProps.md4cFlags.admonitions != newProps.md4cFlags.admonitions ||
+         oldProps.isGFM != newProps.isGFM || oldProps.md4cFlags.admonitions != newProps.md4cFlags.admonitions ||
          computeStyleFingerprint(oldProps.markdownStyle) != computeStyleFingerprint(newProps.markdownStyle);
 }
 

package/ios/renderer/ListItemRenderer.m

@@ -19,6 +19,41 @@ NSString *const TaskIndexAttribute = @"TaskIndex";
 @implementation ENRMListMarkerDescriptor
 @end
 
+// NSArray's -hash is its count, so plain one-marker arrays all collide in the
+// table that uniques attribute dictionaries, and each list item probes past
+// every earlier one. Hashing by the item's own marker keeps rendering linear.
+@interface ENRMListMarkerArray : NSArray
+@end
+
+@implementation ENRMListMarkerArray {
+  NSArray<ENRMListMarkerDescriptor *> *_markers;
+}
+
+- (instancetype)initWithMarkers:(NSArray<ENRMListMarkerDescriptor *> *)markers
+{
+  if (self = [super init]) {
+    _markers = [markers copy];
+  }
+  return self;
+}
+
+- (NSUInteger)count
+{
+  return _markers.count;
+}
+
+- (id)objectAtIndex:(NSUInteger)index
+{
+  return _markers[index];
+}
+
+- (NSUInteger)hash
+{
+  return _markers.lastObject.hash;
+}
+
+@end
+
 @interface ListItemRenderer ()
 - (void)applyCheckedDecorationsTo:(NSMutableAttributedString *)output
                             range:(NSRange)range
@@ -184,7 +219,9 @@ NSString *const TaskIndexAttribute = @"TaskIndex";
   NSArray *existingMarkers = [output attribute:ListItemMarkerStartAttribute atIndex:anchorLocation effectiveRange:NULL];
   NSArray *markers =
       [existingMarkers isKindOfClass:[NSArray class]] ? [existingMarkers arrayByAddingObject:marker] : @[ marker ];
-  [output addAttribute:ListItemMarkerStartAttribute value:markers range:anchorRange];
+  [output addAttribute:ListItemMarkerStartAttribute
+                 value:[[ENRMListMarkerArray alloc] initWithMarkers:markers]
+                 range:anchorRange];
 
   if (isTask && isChecked) {
     [self applyCheckedDecorationsTo:output range:itemRange nestingLevel:nestingLevel];

package/ios/segments/ENRMBlockquoteContainerView.h

@@ -5,6 +5,7 @@
 #import "StyleConfig.h"
 
 @class MarkdownASTNode;
+@class ENRMAccessibilityLabels;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -79,6 +80,11 @@ typedef void (^ENRMBlockquoteLinkBlock)(NSString *url);
 // a toggle is born current with no per-toggle push. See ENRMDynamicBlockProps.
 @property (nonatomic, strong) ENRMDynamicBlockProps *dynamicProps;
 
+// Resolved VoiceOver strings (list, quote, table and math announcements). Set by
+// the host at creation and pushed to this quote's children, recursing into
+// nested quotes, so they are labelled the same way top-level segments are.
+@property (nonatomic, strong, nullable) ENRMAccessibilityLabels *accessibilityLabels;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/segments/ENRMBlockquoteContainerView.mm

@@ -152,6 +152,30 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
 #endif
 }
 
+- (void)setAccessibilityLabels:(ENRMAccessibilityLabels *)accessibilityLabels
+{
+  if (_accessibilityLabels == accessibilityLabels) {
+    return;
+  }
+  _accessibilityLabels = accessibilityLabels;
+  // Children created before this point (or before a labels prop change) still
+  // hold the previous labels; nested quotes forward them to their own children.
+  for (RCTUIView *child in self.subviews) {
+    if ([child isKindOfClass:[EnrichedMarkdownInternalText class]]) {
+      ((EnrichedMarkdownInternalText *)child).accessibilityLabels = accessibilityLabels;
+    } else if ([child isKindOfClass:[TableContainerView class]]) {
+      ((TableContainerView *)child).accessibilityLabels = accessibilityLabels;
+    } else if ([child isKindOfClass:[ENRMBlockquoteContainerView class]]) {
+      ((ENRMBlockquoteContainerView *)child).accessibilityLabels = accessibilityLabels;
+    }
+#if ENRICHED_MARKDOWN_MATH
+    else if ([child isKindOfClass:[ENRMMathContainerView class]]) {
+      ((ENRMMathContainerView *)child).accessibilityLabels = accessibilityLabels;
+    }
+#endif
+  }
+}
+
 // Child registry for this quote's own content. It reuses static creators for
 // every kind and, for a nested Blockquote, creates another
 // ENRMBlockquoteContainerView (the recursion). Streaming is static: no
@@ -172,6 +196,7 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
                       EnrichedMarkdownInternalText *view = [[EnrichedMarkdownInternalText alloc] initWithConfig:config];
                       view.lastElementMarginBottom = segment.textResult.lastElementMarginBottom;
                       view.accessibilityInfo = segment.textResult.accessibilityInfo;
+                      view.accessibilityLabels = strongSelf.accessibilityLabels;
                       [view applyAttributedText:segment.textResult.attributedText context:segment.textResult.context];
                       if (strongSelf) {
                         [strongSelf attachLinkTapToTextView:view];
@@ -195,6 +220,7 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
                             ENRMBlockquoteContainerView *strongSelf = weakSelf;
                             if (strongSelf) {
                               view.dynamicProps = strongSelf.dynamicProps;
+                              view.accessibilityLabels = strongSelf.accessibilityLabels;
                               view.onLinkPress = ^(NSString *url) {
                                 ENRMBlockquoteContainerView *s = weakSelf;
                                 if (s.onLinkPress && url)
@@ -252,6 +278,7 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
                               view.allowFontScaling = strongSelf.allowFontScaling;
                               view.lineBreakStrategy = strongSelf.lineBreakStrategy;
                               view.dynamicProps = strongSelf.dynamicProps;
+                              view.accessibilityLabels = strongSelf.accessibilityLabels;
                               view.onCopyPress = strongSelf.onCopyPress;
                               view.onCodeBlockPress = strongSelf.onCodeBlockPress;
                               view.onLinkPress = ^(NSString *url) {
@@ -283,6 +310,7 @@ static UIEdgeInsets ENRMBlockquoteContentInsets(StyleConfig *config)
                             ENRMMathContainerView *view = [[ENRMMathContainerView alloc] initWithConfig:config];
                             ENRMBlockquoteContainerView *strongSelf = weakSelf;
                             view.dynamicProps = strongSelf.dynamicProps;
+                            view.accessibilityLabels = strongSelf.accessibilityLabels;
                             [view applyLatex:segment.mathSegment.latex];
                             return view;
                           }