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

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

@@ -57,6 +57,13 @@ class EnrichedMarkdownTextInputManager :
     stateWrapper: StateWrapper?,
   ): Any? {
     view.stateWrapper = stateWrapper
+    // Fabric applies props before it hands over the state wrapper, so every layout
+    // invalidation raised during the mount transaction was dropped. Replay it now that we can
+    // actually push state — otherwise the shadow node keeps the initialMeasure() estimate,
+    // which ignores math chips, until the first keystroke.
+    if (stateWrapper != null) {
+      view.layoutManager.flushPendingInvalidation()
+    }
     return super.updateState(view, props, stateWrapper)
   }
 
@@ -69,6 +76,11 @@ class EnrichedMarkdownTextInputManager :
     view.dismissActiveMention()
     super.onDropViewInstance(view)
     view.layoutManager.release()
+    // Unreachable while view recycling is off — it needs a `setupViewRecycling()` call from this
+    // constructor *and* ReactNativeFeatureFlags.enableViewRecycling(). Kept because the flush
+    // above turns a recycled view into a view that pushes state at mount: without this, it would
+    // push into the shadow node it was dropped from.
+    view.stateWrapper = null
   }
 
   override fun measure(

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

@@ -708,8 +708,16 @@ class EnrichedMarkdownTextInputView(
       }
       invalidate()
       requestLayout()
+      // Chips only reach the text here when `defaultValue` landed before `markdownStyle`
+      // (@ReactProp order is undefined). requestLayout() cannot change a height Fabric owns —
+      // the shadow tree has to re-measure text that now carries the spans.
+      layoutManager.invalidateLayout()
     } else if (mathStyleChanged) {
       refreshAllMathChips()
+      // A math font size / padding change resizes every chip, so the measured height moves.
+      // Colour-only changes end up here too; store() then measures the same size and skips
+      // the state update.
+      layoutManager.invalidateLayout()
     }
     return changed
   }

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

@@ -8,21 +8,49 @@ class InputLayoutManager(
 ) {
   private var forceHeightRecalculationCounter = 0
 
+  /**
+   * An invalidation that arrived before `stateWrapper` existed. Fabric applies every prop
+   * (and runs `onAfterUpdateTransaction`) inside `ViewManager.updateProperties`, which runs
+   * *before* `updateState` assigns the wrapper — so the whole mount transaction invalidates
+   * into the void. Without this flag the measurement store stays empty and Yoga keeps the
+   * `initialMeasure()` approximation until the next text/prop change.
+   */
+  private var pending = false
+
   fun invalidateLayout() {
-    if (view.stateWrapper == null) return
+    val stateWrapper = view.stateWrapper
+    if (stateWrapper == null) {
+      pending = true
+      return
+    }
+    pending = false
 
     val text = view.text
     val paint = view.paint
 
+    // First call for this view measures against cachedWidth = 0 and stores a throwaway size;
+    // Yoga immediately re-measures through getMeasureById() with the real width and overwrites
+    // it. The state update below is what makes that second pass happen.
     val needUpdate = InputMeasurementStore.store(view.id, text, paint)
     if (!needUpdate) return
 
     val state = Arguments.createMap()
     state.putInt("forceHeightRecalculationCounter", forceHeightRecalculationCounter++)
-    view.stateWrapper?.updateState(state)
+    stateWrapper.updateState(state)
+  }
+
+  /**
+   * Replays an invalidation that was dropped while `stateWrapper` was null. Called once the
+   * wrapper is assigned, i.e. after every prop of the mount transaction has been applied — so
+   * the text carries its math chips and the paint carries the resolved typeface/size.
+   */
+  fun flushPendingInvalidation() {
+    if (!pending) return
+    invalidateLayout()
   }
 
   fun release() {
+    pending = false
     InputMeasurementStore.release(view.id)
   }
 }

package/ios/EnrichedMarkdown.mm

@@ -123,6 +123,45 @@ static char kENRMSegmentFadeAnimatorKey;
   return concreteComponentDescriptorProvider<EnrichedMarkdownComponentDescriptor>();
 }
 
+/// Clears every piece of state that `updateProps` derives from props, back to the
+/// values the default-constructed `EnrichedMarkdownProps` describes.
+///
+/// `updateProps` applies most props as a per-field diff against `_props`, so this
+/// state is only correct while it stays in phase with the `_props` baseline it was
+/// diffed from. `prepareForRecycle` resets `_props`, so it must reset this too —
+/// otherwise every field the next consumer leaves at its default silently inherits
+/// the previous consumer's value. Called from `initWithFrame:` as well, so the two
+/// baselines cannot drift apart.
+///
+/// Requires `_fontScaleObserver` to already exist.
+- (void)resetPropDerivedState
+{
+  // Discarded rather than cleared field-by-field: the style diff can only clear a
+  // field when new and old differ, which never holds against a reset baseline.
+  _config = nil;
+
+  _md4cFlags = [ENRMMd4cFlags propsDefaultFlags];
+  _maxFontSizeMultiplier = 0;
+  _allowTrailingMargin = NO;
+  _fontScaleObserver.allowFontScaling = YES;
+  _streamingAnimation = NO;
+  _tableStreamingMode = ENRMTableStreamingModeProgressive;
+  _spoilerOverlay = ENRMSpoilerOverlayParticles;
+  _lineBreakStrategy = NSLineBreakStrategyNone;
+  _writingDirectionMode = ENRMWritingDirectionModeFirstStrong;
+  _contextMenuItemTexts = nil;
+  _contextMenuItemIcons = nil;
+  _accessibilityLabels = nil;
+
+  // Written only once a render completes, so stale until the next one lands.
+  _renderedStyleFingerprint = 0;
+  _pendingStyleFingerprint = 0;
+
+  _dirtyFlags = ENRMDirtyNone;
+  _heightUpdateCounter = 0;
+  _state = nullptr;
+}
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
@@ -131,28 +170,22 @@ static char kENRMSegmentFadeAnimatorKey;
 
     self.backgroundColor = [RCTUIColor clearColor];
     _parser = [[ENRMMarkdownParser alloc] init];
-    _md4cFlags = [ENRMMd4cFlags defaultFlags];
     _segmentViews = [NSMutableArray array];
     _segmentSignatures = [NSMutableArray array];
-    _dirtyFlags = ENRMDirtyNone;
     [self configureSegmentViewRegistry];
 
     _renderCoordinator =
         [[ENRMAsyncRenderCoordinator alloc] initWithQueueLabel:"com.swmansion.enriched.markdown.container.render"];
 
-    _maxFontSizeMultiplier = 0;
-    _allowTrailingMargin = NO;
     _selectable = YES;
     _enableLinkPreview = YES;
-    _streamingAnimation = NO;
-    _tableStreamingMode = ENRMTableStreamingModeProgressive;
     _selectionMenuConfig = (ENRMSelectionMenuConfig){.copyAsMarkdown = YES, .copyImageURL = YES};
-    _lineBreakStrategy = NSLineBreakStrategyNone;
-    _writingDirectionMode = ENRMWritingDirectionModeFirstStrong;
     _resolvedLayoutDirection =
         [[RCTI18nUtil sharedInstance] isRTL] ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
 
     _fontScaleObserver = [[FontScaleObserver alloc] init];
+    [self resetPropDerivedState];
+
     __weak EnrichedMarkdown *weakSelf = self;
     _fontScaleObserver.onChange = ^{
       EnrichedMarkdown *strongSelf = weakSelf;
@@ -624,7 +657,7 @@ static char kENRMSegmentFadeAnimatorKey;
                                   selectionEnd:selectionEnd];
         });
     return buildEditMenuForSelection(textView.textStorage, textView.selectedRange, segmentMarkdown, strongSelf->_config,
-                                     @[ baseMenu ], customItems, strongSelf -> _selectionMenuConfig);
+                                     @[ baseMenu ], customItems, strongSelf->_selectionMenuConfig);
   }];
 #endif
 
@@ -949,9 +982,8 @@ static char kENRMSegmentFadeAnimatorKey;
 
   _cachedMarkdown = nil;
   _renderedMarkdown = nil;
-  _streamingAnimation = NO;
-  _tableStreamingMode = ENRMTableStreamingModeProgressive;
-  _dirtyFlags = ENRMDirtyNone;
+
+  [self resetPropDerivedState];
 
   [super prepareForRecycle];
 }

package/ios/EnrichedMarkdownText.mm

@@ -46,6 +46,7 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 };
 
 @interface EnrichedMarkdownText () <RCTEnrichedMarkdownTextViewProtocol, UITextViewDelegate>
+- (void)resetPropDerivedState;
 - (void)setupTextView;
 - (void)renderMarkdownContent:(NSString *)markdownString;
 - (void)applyRenderedText:(NSMutableAttributedString *)attributedText;
@@ -177,6 +178,46 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   ENRMRequestHeightUpdate<EnrichedMarkdownTextState>(_state, _heightUpdateCounter, self);
 }
 
+/// Clears every piece of state that `updateProps` derives from props, back to the
+/// values the default-constructed `EnrichedMarkdownTextProps` describes.
+///
+/// `updateProps` applies most props as a per-field diff against `_props`, so this
+/// state is only correct while it stays in phase with the `_props` baseline it was
+/// diffed from. `prepareForRecycle` resets `_props`, so it must reset this too —
+/// otherwise every field the next consumer leaves at its default silently inherits
+/// the previous consumer's value. Called from `initWithFrame:` as well, so the two
+/// baselines cannot drift apart.
+///
+/// Requires `_fontScaleObserver` to already exist.
+- (void)resetPropDerivedState
+{
+  // Discarded rather than cleared field-by-field: the style diff can only clear a
+  // field when new and old differ, which never holds against a reset baseline.
+  _config = nil;
+  _spoilerManager = nil;
+
+  _md4cFlags = [ENRMMd4cFlags propsDefaultFlags];
+  _maxFontSizeMultiplier = 0;
+  _allowTrailingMargin = NO;
+  _fontScaleObserver.allowFontScaling = YES;
+  _streamingAnimation = NO;
+  _lineBreakStrategy = NSLineBreakStrategyNone;
+  _writingDirectionMode = ENRMWritingDirectionModeFirstStrong;
+  _contextMenuItemTexts = nil;
+  _contextMenuItemIcons = nil;
+  _accessibilityLabels = nil;
+
+  // Written only once a render completes, so stale until the next one lands.
+  _renderedStyleFingerprint = 0;
+  _pendingStyleFingerprint = 0;
+  _lastElementMarginBottom = 0;
+
+  _dirtyFlags = ENRMDirtyNone;
+  _forceHeightUpdateOnNextRender = NO;
+  _heightUpdateCounter = 0;
+  _state = nullptr;
+}
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
@@ -185,23 +226,18 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
 
     self.backgroundColor = [RCTUIColor clearColor];
     _parser = [[ENRMMarkdownParser alloc] init];
-    _md4cFlags = [ENRMMd4cFlags defaultFlags];
 
     _renderCoordinator =
         [[ENRMAsyncRenderCoordinator alloc] initWithQueueLabel:"com.swmansion.enriched.markdown.render"];
 
-    _maxFontSizeMultiplier = 0;
-    _allowTrailingMargin = NO;
     _enableLinkPreview = YES;
-    _forceHeightUpdateOnNextRender = NO;
     _selectionMenuConfig = (ENRMSelectionMenuConfig){.copyAsMarkdown = YES, .copyImageURL = YES};
-    _lineBreakStrategy = NSLineBreakStrategyNone;
-    _writingDirectionMode = ENRMWritingDirectionModeFirstStrong;
     _resolvedLayoutDirection =
         [[RCTI18nUtil sharedInstance] isRTL] ? NSWritingDirectionRightToLeft : NSWritingDirectionLeftToRight;
-    _dirtyFlags = ENRMDirtyNone;
 
     _fontScaleObserver = [[FontScaleObserver alloc] init];
+    [self resetPropDerivedState];
+
     __weak EnrichedMarkdownText *weakSelf = self;
     _fontScaleObserver.onChange = ^{
       EnrichedMarkdownText *strongSelf = weakSelf;
@@ -253,8 +289,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
 
@@ -636,14 +671,15 @@ typedef NS_OPTIONS(NSUInteger, ENRMDirtyFlags) {
   [_fadeAnimator cancel];
   _fadeAnimator = nil;
   _previousTextLength = 0;
-  _streamingAnimation = NO;
-  _forceHeightUpdateOnNextRender = NO;
   _cachedMarkdown = nil;
   _renderedMarkdown = nil;
   _accessibilityElements = nil;
   _accessibilityInfo = nil;
   _accessibilityNeedsRebuild = NO;
   [_spoilerManager removeAllOverlays];
+
+  [self resetPropDerivedState];
+
   if (_textView != nil) {
     ENRMSetAttributedText(_textView, [[NSAttributedString alloc] initWithString:@""]);
     _textView.hidden = YES;

package/ios/parser/ENRMMarkdownParser.h

@@ -11,6 +11,14 @@
 
 + (instancetype)defaultFlags;
 
+/// Flags matching the codegen `md4cFlags` Props defaults (every flag off).
+///
+/// Components mirror `md4cFlags` into an ivar with a per-field diff against the
+/// props baseline, so the ivar has to start from the same baseline the props do.
+/// `defaultFlags` enables `latexMath`, which is the right default for the
+/// standalone parser API but would make a `latexMath: false` prop a no-op.
++ (instancetype)propsDefaultFlags;
+
 @end
 
 @interface ENRMMarkdownParser : NSObject

package/ios/parser/ENRMMarkdownParser.mm

@@ -22,6 +22,17 @@ extern MarkdownASTNode *parseMarkdownWithCppParser(NSString *markdown, ENRMMd4cF
   return [[ENRMMd4cFlags alloc] init];
 }
 
++ (instancetype)propsDefaultFlags
+{
+  ENRMMd4cFlags *flags = [[ENRMMd4cFlags alloc] init];
+  flags.underline = NO;
+  flags.latexMath = NO;
+  flags.superscript = NO;
+  flags.subscript = NO;
+  flags.highlight = NO;
+  return flags;
+}
+
 - (id)copyWithZone:(NSZone *)zone
 {
   ENRMMd4cFlags *copy = [[ENRMMd4cFlags allocWithZone:zone] init];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-enriched-markdown-scaffold",
-  "version": "0.7.4-scaffold.2",
+  "version": "0.7.4-scaffold.4",
   "description": "Markdown Text component for React Native",
   "main": "./lib/module/index",
   "module": "./lib/module/index",