@expensify/react-native-live-markdown 0.1.326 → 0.1.328

package/README.md

@@ -193,27 +193,27 @@ Currently, `react-native-live-markdown` supports only [ExpensiMark](https://gith
 
 ### React Native compatibility
 
-|                   | 0.73 | 0.74 | 0.75 | 0.76 | 0.77 | 0.78 | 0.79 | 0.80 | 0.81 | 0.82 | 0.83 |
-|:-----------------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|     0.1.321+      |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ✅   |  ✅   |
-| 0.1.304 - 0.1.320 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |
-| 0.1.297 – 0.1.303 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |
-| 0.1.260 – 0.1.296 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |
-| 0.1.256 – 0.1.259 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
-| 0.1.248 – 0.1.255 |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
-| 0.1.235 – 0.1.247 |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
-| 0.1.141 – 0.1.234 |  ❌   |  ❌   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
-| 0.1.129 – 0.1.140 |  ❌   |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
-| 0.1.122 – 0.1.128 |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
-| 0.1.15 – 0.1.121  |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+|                   | 0.73 | 0.74 | 0.75 | 0.76 | 0.77 | 0.78 | 0.79 | 0.80 | 0.81 | 0.82 | 0.83 | 0.84 | 0.85 |
+|:-----------------:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
+|     0.1.321+      |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ✅   |  ✅   |  ✅   |  ✅   |
+| 0.1.304 - 0.1.320 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.297 – 0.1.303 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.260 – 0.1.296 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.256 – 0.1.259 |  ❌   |  ❌   |  ❌   |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.248 – 0.1.255 |  ❌   |  ❌   |  ❌   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.235 – 0.1.247 |  ❌   |  ❌   |  ✅   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.141 – 0.1.234 |  ❌   |  ❌   |  ✅   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.129 – 0.1.140 |  ❌   |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.122 – 0.1.128 |  ❌   |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
+| 0.1.15 – 0.1.121  |  ✅   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |  ❌   |
 
 
 ### `react-native-worklets` compatibility
 
-|                   | 0.6.x | 0.7.x |
-|:-----------------:|:-----:|:-----:|
-|     0.1.321+      |   ❌   |   ✅   |
-| 0.1.308 – 0.1.320 |   ✅   |   ❌   |
+|                   | 0.6.x | 0.7.x | 0.8.x | 0.9.x |
+|:-----------------:|:-----:|:-----:|:-----:|:-----:|
+|     0.1.321+      |   ❌   |   ✅   |   ✅   |   ✅   |
+| 0.1.308 – 0.1.320 |   ✅   |   ❌   |   ❌   |   ❌   |
 
 
 ## License

package/apple/MarkdownTextInputDecoratorShadowNode.h

@@ -48,6 +48,12 @@ private:
                                                  YGMeasureMode heightMode);
   static YogaLayoutableShadowNode &
   shadowNodeFromContext(YGNodeConstRef yogaNode);
+
+  // Persisted RCTMarkdownUtils instance shared across shadow node clones so
+  // that MarkdownParser's one-entry memo cache (keyed on text + parserId)
+  // survives repeated Yoga measure callbacks instead of being discarded on
+  // every call to applyMarkdownFormattingToTextInputState.
+  mutable std::shared_ptr<void> markdownUtils_;
 };
 
 } // namespace react

package/apple/MarkdownTextInputDecoratorShadowNode.mm

@@ -32,6 +32,13 @@ MarkdownTextInputDecoratorShadowNode::MarkdownTextInputDecoratorShadowNode(
     ShadowNode const &sourceShadowNode,
     ShadowNodeFragment const &fragment)
     : ConcreteViewShadowNode(sourceShadowNode, fragment) {
+  // Carry the persisted RCTMarkdownUtils over from the source node so the
+  // MarkdownParser memo cache survives the frequent cloning that happens
+  // during layout and re-render cycles.
+  const auto &source =
+      static_cast<const MarkdownTextInputDecoratorShadowNode &>(sourceShadowNode);
+  markdownUtils_ = source.markdownUtils_;
+
   initialize();
   makeChildNodeMutable();
   
@@ -182,12 +189,20 @@ void MarkdownTextInputDecoratorShadowNode::applyMarkdownFormattingToTextInputSta
   const auto defaultNSTextAttributes =
       RCTNSTextAttributesFromTextAttributes(defaultTextAttributes);
 
-  // this can possibly be optimized
+  // Lazily create and persist the RCTMarkdownUtils instance so the MarkdownParser
+  // one-entry memo cache (keyed on text + parserId) survives repeated Yoga measure
+  // callbacks. Previously a fresh utils/parser was allocated on every call,
+  // discarding the cache and forcing a full JSI re-parse each time.
+  if (!markdownUtils_) {
+    RCTMarkdownUtils *freshUtils = [[RCTMarkdownUtils alloc] init];
+    markdownUtils_ = std::shared_ptr<void>(
+        (__bridge_retained void *)freshUtils, [](void *p) { CFRelease(p); });
+  }
+  RCTMarkdownUtils *utils = (__bridge RCTMarkdownUtils *)markdownUtils_.get();
+
   RCTMarkdownStyle *markdownStyle =
       [[RCTMarkdownStyle alloc] initWithStruct:decoratorProps.markdownStyle];
-  RCTMarkdownUtils *utils = [[RCTMarkdownUtils alloc] init];
-  [utils setMarkdownStyle:markdownStyle];
-  [utils setParserId:[NSNumber numberWithInt:decoratorProps.parserId]];
+  NSNumber *parserId = [NSNumber numberWithInt:decoratorProps.parserId];
 
   // convert the attibuted string stored in state to
   // NSAttributedString
@@ -228,7 +243,10 @@ void MarkdownTextInputDecoratorShadowNode::applyMarkdownFormattingToTextInputSta
 
     // apply markdown
     NSMutableAttributedString *newString = [nsAttributedString mutableCopy];
-    [utils applyMarkdownFormatting:newString withDefaultTextAttributes:defaultNSTextAttributes];
+    [utils applyMarkdownFormatting:newString
+        withDefaultTextAttributes:defaultNSTextAttributes
+                    markdownStyle:markdownStyle
+                         parserId:parserId];
 
     // create a clone of the old TextInputState and update the
     // attributed string box to point to the string with markdown
@@ -240,7 +258,10 @@ void MarkdownTextInputDecoratorShadowNode::applyMarkdownFormattingToTextInputSta
 
     // apply markdown
     NSMutableAttributedString *newString = [nsAttributedString mutableCopy];
-    [utils applyMarkdownFormatting:newString withDefaultTextAttributes:defaultNSTextAttributes];
+    [utils applyMarkdownFormatting:newString
+        withDefaultTextAttributes:defaultNSTextAttributes
+                    markdownStyle:markdownStyle
+                         parserId:parserId];
 
     // create a clone of the old TextInputState and update the
     // attributed string box to point to the string with markdown

package/apple/RCTMarkdownUtils.h

@@ -11,6 +11,15 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)applyMarkdownFormatting:(nonnull NSMutableAttributedString *)attributedString
       withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes;
 
+// Atomically sets the style/parser and applies formatting under a single lock.
+// Use this from the shadow node measure path, where one RCTMarkdownUtils
+// instance is shared across shadow node clones and may be accessed from
+// concurrent Fabric commits/layout passes.
+- (void)applyMarkdownFormatting:(nonnull NSMutableAttributedString *)attributedString
+      withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
+                  markdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle
+                       parserId:(nonnull NSNumber *)parserId;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/apple/RCTMarkdownUtils.mm

@@ -34,4 +34,22 @@
                            withMarkdownStyle:_markdownStyle];
 }
 
+- (void)applyMarkdownFormatting:(nonnull NSMutableAttributedString *)attributedString
+      withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
+                  markdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle
+                       parserId:(nonnull NSNumber *)parserId
+{
+  // Keep the style/parserId assignment and the parse+format together under a
+  // single lock. The shadow node shares one instance across clones, and Fabric
+  // runs commits/layout optimistically on multiple threads, so without this the
+  // setters could interleave with another thread's parse/format and apply the
+  // wrong parserId/style for a frame. `@synchronized` is recursive, so nesting
+  // with `MarkdownParser`'s own `@synchronized(self)` in `parse:` is safe.
+  @synchronized (self) {
+    _markdownStyle = markdownStyle;
+    _parserId = parserId;
+    [self applyMarkdownFormatting:attributedString withDefaultTextAttributes:defaultTextAttributes];
+  }
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.326",
+  "version": "0.1.328",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -64,12 +64,13 @@
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.5.0",
     "@lwc/eslint-plugin-lwc": "^1.7.2",
-    "@react-native-community/cli": "20.0.0",
-    "@react-native-community/cli-platform-android": "20.0.0",
-    "@react-native-community/cli-platform-ios": "20.0.0",
-    "@react-native/babel-preset": "0.83.1",
-    "@react-native/eslint-config": "0.83.1",
-    "@react-native/metro-config": "0.83.1",
+    "@react-native-community/cli": "20.1.0",
+    "@react-native-community/cli-platform-android": "20.1.0",
+    "@react-native-community/cli-platform-ios": "20.1.0",
+    "@react-native/babel-preset": "0.85.3",
+    "@react-native/eslint-config": "0.85.3",
+    "@react-native/eslint-plugin": "^0.85.3",
+    "@react-native/metro-config": "0.85.3",
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^29.5.14",
     "@types/react": "^19.2.0",
@@ -89,6 +90,7 @@
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-react-native": "^5.0.0",
     "eslint-plugin-tsdoc": "^0.2.17",
     "expensify-common": "2.0.148",
     "jest": "^29.6.3",
@@ -96,15 +98,15 @@
     "nodemon": "^3.1.3",
     "patch-package": "^8.0.0",
     "prettier": "2.8.8",
-    "react": "19.2.0",
-    "react-dom": "19.2.0",
-    "react-native": "0.83.1",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "react-native": "0.85.3",
     "react-native-builder-bob": "^0.30.2",
     "react-native-web": "^0.20.0",
+    "react-native-worklets": "0.9.1",
     "release-it": "^15.0.0",
     "turbo": "^1.10.7",
-    "typescript": "^5.8.3",
-    "react-native-worklets": "0.7.2"
+    "typescript": "^5.8.3"
   },
   "peerDependencies": {
     "expensify-common": ">=2.0.148",
@@ -112,11 +114,6 @@
     "react-native": "*",
     "react-native-worklets": ">=0.7.0"
   },
-  "overrides": {
-    "@expo/webpack-config": {
-      "expo": "^54.0.32"
-    }
-  },
   "workspaces": [
     "./example",
     "./WebExample"