@expensify/react-native-live-markdown 0.1.295 → 0.1.297

package/README.md

@@ -188,16 +188,17 @@ Currently, `react-native-live-markdown` supports only [ExpensiMark](https://gith
 
 `react-native-live-markdown` supports only latest React Native minor releases with the New Architecture enabled.
 
-| @expensify/react-native-live-markdown | 0.73 | 0.74 | 0.75 | 0.76 | 0.77 | 0.78 | 0.79 |
-| :-----------------------------------: | :--: | :--: | :--: | :--: | :--: | :--: | :--: |
-|               0.1.260+                |  ❌  |  ❌  |  ❌  |  ❌  |  ✅  |  ✅  |  ✅  |
-|           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            |  ✅  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |
+| @expensify/react-native-live-markdown | 0.73 | 0.74 | 0.75 | 0.76 | 0.77 | 0.78 | 0.79 | 0.80 |
+| :-----------------------------------: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: |
+|               0.1.297+                |  ❌  |  ❌  |  ❌  |  ❌  |  ✅  |  ✅  |  ✅  |  ✅  |
+|           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            |  ✅  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |
 
 ## License
 

package/android/build.gradle

@@ -128,8 +128,8 @@ android {
       ]
 
       // TextLayoutManager
-      if (REACT_NATIVE_MINOR_VERSION <= 76 ) {
-          java.srcDirs += "src/reactNativeVersionPatch/CustomMountingManager/76"
+      if (REACT_NATIVE_MINOR_VERSION <= 79 ) {
+          java.srcDirs += "src/reactNativeVersionPatch/CustomMountingManager/79"
       } else {
           java.srcDirs += "src/reactNativeVersionPatch/CustomMountingManager/latest"
       }

package/android/src/main/new_arch/CMakeLists.txt

@@ -51,6 +51,7 @@ target_compile_options(
         -frtti
         -Wall
         -std=c++20
+        -DREACT_NATIVE_MINOR_VERSION=${ReactAndroid_VERSION_MINOR}
 )
 
 target_include_directories(

package/android/src/main/new_arch/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp

@@ -3,7 +3,9 @@
 #include <fbjni/fbjni.h>
 #include <react/fabric/JFabricUIManager.h>
 #include <react/jni/ReadableNativeMap.h>
+#if REACT_NATIVE_MINOR_VERSION < 80
 #include <react/jni/SafeReleaseJniRef.h>
+#endif // REACT_NATIVE_MINOR_VERSION < 80
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <yoga/Yoga.h>

package/android/src/reactNativeVersionPatch/CustomMountingManager/{76 → 79}/com/expensify/livemarkdown/CustomMountingManager.java

@@ -3,7 +3,6 @@ package com.expensify.livemarkdown;
 import static com.facebook.react.views.text.TextAttributeProps.UNSET;
 
 import android.content.Context;
-import android.content.res.AssetManager;
 import android.text.BoringLayout;
 import android.text.Layout;
 import android.text.Spannable;
@@ -12,6 +11,7 @@ import android.text.TextPaint;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.util.Preconditions;
 
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
@@ -21,6 +21,7 @@ import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.views.text.TextAttributeProps;
 import com.facebook.react.views.text.TextLayoutManager;
+import com.facebook.react.views.text.internal.span.ReactTextPaintHolderSpan;
 import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
@@ -30,7 +31,13 @@ import java.lang.reflect.Method;
 
 public class CustomMountingManager extends MountingManager {
   private static final boolean DEFAULT_INCLUDE_FONT_PADDING = true;
-  private static final TextPaint sTextPaintInstance = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+  private static final ThreadLocal<TextPaint> sTextPaintInstance =
+          new ThreadLocal<TextPaint>() {
+            @Override
+            protected TextPaint initialValue() {
+              return new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
+            }
+          };
 
   private MarkdownUtils markdownUtils;
 
@@ -77,24 +84,48 @@ public class CustomMountingManager extends MountingManager {
       TextAttributeProps.getHyphenationFrequency(
         paragraphAttributes.getString(TextLayoutManager.PA_KEY_HYPHENATION_FREQUENCY));
 
-    // StaticLayout returns wrong metrics for the last line if it's empty, add something to the
-    // last line so it's measured correctly
-    if (text.toString().endsWith("\n")) {
-      SpannableStringBuilder sb = new SpannableStringBuilder(text);
-      sb.append("I");
+    try {
+      Class<TextLayoutManager> textLayoutManagerClass = TextLayoutManager.class;
 
-      text = sb;
-    }
+      Method getTextAlignmentAttrMethod = textLayoutManagerClass.getDeclaredMethod("getTextAlignmentAttr", MapBuffer.class);
+      getTextAlignmentAttrMethod.setAccessible(true);
 
-    Layout.Alignment alignment = TextLayoutManager.getTextAlignment(attributedString, text);
+      String textAlignmentAttr = (String)getTextAlignmentAttrMethod.invoke(null, attributedString);
 
-    markdownUtils.applyMarkdownFormatting((SpannableStringBuilder)text);
+      Method getTextAlignmentMethod = textLayoutManagerClass.getDeclaredMethod("getTextAlignment", MapBuffer.class, Spannable.class, String.class);
+      getTextAlignmentMethod.setAccessible(true);
 
-    BoringLayout.Metrics boring = BoringLayout.isBoring(text, sTextPaintInstance);
+      Layout.Alignment alignment = (Layout.Alignment)getTextAlignmentMethod.invoke(
+              null,
+              attributedString,
+              text,
+              textAlignmentAttr
+      );
 
-    Class<TextLayoutManager> mapBufferClass = TextLayoutManager.class;
-    try {
-      Method createLayoutMethod = mapBufferClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class, Layout.Alignment.class);
+      Method getTextJustificationModeMethod = textLayoutManagerClass.getDeclaredMethod("getTextJustificationMode", String.class);
+      getTextJustificationModeMethod.setAccessible(true);
+
+      Integer justificationMode = (Integer) getTextJustificationModeMethod.invoke(null, textAlignmentAttr);
+
+
+      markdownUtils.applyMarkdownFormatting((SpannableStringBuilder)text);
+
+      TextPaint paint;
+      if (attributedString.contains(TextLayoutManager.AS_KEY_CACHE_ID)) {
+        paint = text.getSpans(0, 0, ReactTextPaintHolderSpan.class)[0].getTextPaint();
+      } else {
+        TextAttributeProps baseTextAttributes =
+                TextAttributeProps.fromMapBuffer(attributedString.getMapBuffer(TextLayoutManager.AS_KEY_BASE_ATTRIBUTES));
+        paint = Preconditions.checkNotNull(sTextPaintInstance.get());
+
+        Method updateTextPaintMethod = textLayoutManagerClass.getDeclaredMethod("updateTextPaint", TextPaint.class, TextAttributeProps.class, Context.class);
+        updateTextPaintMethod.setAccessible(true);
+        updateTextPaintMethod.invoke(null, paint, baseTextAttributes, context);
+      }
+
+      BoringLayout.Metrics boring = BoringLayout.isBoring(text, paint);
+
+      Method createLayoutMethod = textLayoutManagerClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class, Layout.Alignment.class, int.class, TextPaint.class);
       createLayoutMethod.setAccessible(true);
 
       Layout layout = (Layout)createLayoutMethod.invoke(
@@ -106,7 +137,9 @@ public class CustomMountingManager extends MountingManager {
         includeFontPadding,
         textBreakStrategy,
         hyphenationFrequency,
-        alignment);
+        alignment,
+        justificationMode,
+        paint);
 
       int maximumNumberOfLines =
         paragraphAttributes.contains(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)

package/android/src/reactNativeVersionPatch/CustomMountingManager/latest/com/expensify/livemarkdown/CustomFabricUIManager.java

@@ -0,0 +1,47 @@
+package com.expensify.livemarkdown;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.fabric.FabricUIManager;
+import com.facebook.react.fabric.mounting.MountingManager;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
+
+import java.lang.reflect.Field;
+
+public class CustomFabricUIManager {
+
+  public static FabricUIManager create(FabricUIManager source, ReadableMap markdownProps, int parserId) {
+    Class<? extends FabricUIManager> uiManagerClass = source.getClass();
+
+    try {
+      Field mountingManagerField = uiManagerClass.getDeclaredField("mMountingManager");
+      mountingManagerField.setAccessible(true);
+
+      MountingManager sourceMountingManager = readPrivateField(source, "mMountingManager");
+      ReactApplicationContext reactContext = readPrivateField(source, "mReactApplicationContext");
+      ViewManagerRegistry viewManagerRegistry = readPrivateField(source, "mViewManagerRegistry");
+      BatchEventDispatchedListener batchEventDispatchedListener = readPrivateField(source, "mBatchEventDispatchedListener");
+      MountingManager.MountItemExecutor mountItemExecutor = readPrivateField(source, "mMountItemExecutor");
+
+      FabricUIManager customFabricUIManager = new FabricUIManager(reactContext, viewManagerRegistry, batchEventDispatchedListener);
+
+      mountingManagerField.set(customFabricUIManager, new CustomMountingManager(sourceMountingManager, viewManagerRegistry, mountItemExecutor, reactContext, markdownProps, parserId));
+
+      return customFabricUIManager;
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      throw new RuntimeException("[LiveMarkdown] Cannot read data from FabricUIManager");
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private static <T> T readPrivateField(Object obj, String name) throws NoSuchFieldException, IllegalAccessException {
+    Class<?> clazz = obj.getClass();
+
+    Field field = clazz.getDeclaredField(name);
+    field.setAccessible(true);
+    T value = (T) field.get(obj);
+
+    return value;
+  }
+}

package/android/src/reactNativeVersionPatch/CustomMountingManager/latest/com/expensify/livemarkdown/CustomMountingManager.java

@@ -8,6 +8,7 @@ import android.text.Layout;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -15,8 +16,10 @@ import androidx.core.util.Preconditions;
 
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.fabric.mounting.MountingManager;
+import com.facebook.react.fabric.mounting.SurfaceMountingManager;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.views.text.TextAttributeProps;
@@ -39,20 +42,28 @@ public class CustomMountingManager extends MountingManager {
             }
           };
 
+  private MountingManager sourceMountingManager;
   private MarkdownUtils markdownUtils;
 
   public CustomMountingManager(
+      @NonNull MountingManager sourceMountingManager,
       @NonNull ViewManagerRegistry viewManagerRegistry,
       @NonNull MountItemExecutor mountItemExecutor,
       @NonNull Context context,
       @NonNull ReadableMap decoratorProps,
       int parserId) {
     super(viewManagerRegistry, mountItemExecutor);
+    this.sourceMountingManager = sourceMountingManager;
     this.markdownUtils = new MarkdownUtils((ReactContext) context);
     this.markdownUtils.setMarkdownStyle(new MarkdownStyle(decoratorProps, context));
     this.markdownUtils.setParserId(parserId);
   }
 
+  @Override
+  public SurfaceMountingManager getSurfaceManagerEnforced(int surfaceId, String context) {
+    return sourceMountingManager.getSurfaceManagerEnforced(surfaceId, context);
+  }
+
   @Override
   public long measureMapBuffer(
       @NonNull ReactContext context,
@@ -125,9 +136,20 @@ public class CustomMountingManager extends MountingManager {
 
       BoringLayout.Metrics boring = BoringLayout.isBoring(text, paint);
 
-      Method createLayoutMethod = textLayoutManagerClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class, Layout.Alignment.class, int.class, TextPaint.class);
+      Method createLayoutMethod = textLayoutManagerClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class, Layout.Alignment.class, int.class, TextUtils.TruncateAt.class, int.class, TextPaint.class);
       createLayoutMethod.setAccessible(true);
 
+      int maximumNumberOfLines =
+        paragraphAttributes.contains(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
+          ? paragraphAttributes.getInt(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
+          : ReactConstants.UNSET;
+      @Nullable
+      TextUtils.TruncateAt ellipsizeMode =
+        paragraphAttributes.contains(TextLayoutManager.PA_KEY_ELLIPSIZE_MODE)
+          ? TextAttributeProps.getEllipsizeMode(
+          paragraphAttributes.getString(TextLayoutManager.PA_KEY_ELLIPSIZE_MODE))
+          : null;
+
       Layout layout = (Layout)createLayoutMethod.invoke(
         null,
         text,
@@ -139,13 +161,10 @@ public class CustomMountingManager extends MountingManager {
         hyphenationFrequency,
         alignment,
         justificationMode,
+        ellipsizeMode,
+        maximumNumberOfLines,
         paint);
 
-      int maximumNumberOfLines =
-        paragraphAttributes.contains(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
-          ? paragraphAttributes.getInt(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
-          : UNSET;
-
       int calculatedLineCount =
         maximumNumberOfLines == UNSET || maximumNumberOfLines == 0
           ? layout.getLineCount()

package/apple/MarkdownRange.mm

@@ -3,13 +3,13 @@
 @implementation MarkdownRange
 
 - (instancetype)initWithType:(NSString *)type range:(NSRange)range depth:(NSUInteger)depth {
-    self = [super init];
-    if (self) {
-        _type = type;
-        _range = range;
-        _depth = depth;
-    }
-    return self;
+  self = [super init];
+  if (self) {
+    _type = type;
+    _range = range;
+    _depth = depth;
+  }
+  return self;
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.295",
+  "version": "0.1.297",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -64,13 +64,13 @@
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.5.0",
     "@lwc/eslint-plugin-lwc": "^1.7.2",
-    "@react-native-community/cli": "18.0.0",
-    "@react-native-community/cli-platform-android": "18.0.0",
-    "@react-native-community/cli-platform-ios": "18.0.0",
-    "@react-native/eslint-config": "0.79.2",
+    "@react-native-community/cli": "19.0.0",
+    "@react-native-community/cli-platform-android": "19.0.0",
+    "@react-native-community/cli-platform-ios": "19.0.0",
+    "@react-native/eslint-config": "0.80.1",
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^29.5.14",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.1.0",
     "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.15.0",
     "del-cli": "^5.0.0",
@@ -93,10 +93,11 @@
     "nodemon": "^3.1.3",
     "patch-package": "^8.0.0",
     "prettier": "2.8.8",
-    "react": "^19.0.0",
-    "react-native": "0.79.2",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "react-native": "0.80.1",
     "react-native-builder-bob": "^0.30.2",
-    "react-native-reanimated": "3.17.3",
+    "react-native-reanimated": "3.18.0",
     "react-native-web": "^0.20.0",
     "release-it": "^15.0.0",
     "turbo": "^1.10.7",