@expensify/react-native-live-markdown 0.1.330 → 0.1.331

package/android/build.gradle

@@ -129,6 +129,8 @@ android {
           java.srcDirs += "src/reactNativeVersionPatch/CustomMountingManager/79"
       } else if (REACT_NATIVE_MINOR_VERSION == 80) {
           java.srcDirs += "src/reactNativeVersionPatch/CustomMountingManager/80"
+      } else if (REACT_NATIVE_MINOR_VERSION <= 85) {
+          java.srcDirs += "src/reactNativeVersionPatch/CustomMountingManager/81"
       } else {
           java.srcDirs += "src/reactNativeVersionPatch/CustomMountingManager/latest"
       }

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

@@ -0,0 +1,121 @@
+package com.expensify.livemarkdown;
+
+import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getYogaMeasureMode;
+import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getYogaSize;
+
+import android.text.SpannableStringBuilder;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.jni.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import com.facebook.react.fabric.FabricUIManager;
+import com.facebook.react.fabric.mounting.MountingManager;
+import com.facebook.react.fabric.mounting.SurfaceMountingManager;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
+import com.facebook.react.views.text.TextLayoutManager;
+
+import java.lang.reflect.Field;
+
+@DoNotStrip
+public class CustomFabricUIManager extends FabricUIManager {
+
+  private final ReactApplicationContext mReactApplicationContext;
+  private final MountingManager mMountingManager;
+  private final MarkdownUtils mMarkdownUtils;
+
+  public CustomFabricUIManager(
+    ReactApplicationContext reactContext,
+    ViewManagerRegistry viewManagerRegistry,
+    BatchEventDispatchedListener batchEventDispatchedListener,
+    MountingManager mountingManager,
+    ReadableMap markdownProps,
+    int parserId
+  ) {
+    super(reactContext, viewManagerRegistry, batchEventDispatchedListener);
+
+    this.mReactApplicationContext = reactContext;
+    this.mMountingManager = mountingManager;
+
+    this.mMarkdownUtils = new MarkdownUtils(reactContext);
+    this.mMarkdownUtils.setMarkdownStyle(new MarkdownStyle(markdownProps, reactContext));
+    this.mMarkdownUtils.setParserId(parserId);
+  }
+
+  @Override
+  public long measureText(
+    int surfaceId,
+    ReadableMapBuffer attributedString,
+    ReadableMapBuffer paragraphAttributes,
+    float minWidth,
+    float maxWidth,
+    float minHeight,
+    float maxHeight,
+    @Nullable float[] attachmentsPositions) {
+
+    ReactContext context;
+    if (surfaceId > 0) {
+      SurfaceMountingManager surfaceMountingManager =
+        mMountingManager.getSurfaceManagerEnforced(surfaceId, "measureText");
+      if (surfaceMountingManager.isStopped()) {
+        return 0;
+      }
+      context = surfaceMountingManager.getContext();
+      Assertions.assertNotNull(
+        context, "Context in SurfaceMountingManager is null. surfaceId: " + surfaceId);
+    } else {
+      context = mReactApplicationContext;
+    }
+
+    return TextLayoutManager.measureText(
+      context,
+      attributedString,
+      paragraphAttributes,
+      getYogaSize(minWidth, maxWidth),
+      getYogaMeasureMode(minWidth, maxWidth),
+      getYogaSize(minHeight, maxHeight),
+      getYogaMeasureMode(minHeight, maxHeight),
+      spannable -> {
+        mMarkdownUtils.applyMarkdownFormatting((SpannableStringBuilder)spannable);
+      },
+      attachmentsPositions);
+  }
+
+  public static FabricUIManager create(FabricUIManager source, ReadableMap markdownProps, int parserId) {
+    try {
+      MountingManager sourceMountingManager = readPrivateField(source, "mMountingManager");
+      ReactApplicationContext reactContext = readPrivateField(source, "mReactApplicationContext");
+      ViewManagerRegistry viewManagerRegistry = readPrivateField(source, "mViewManagerRegistry");
+      BatchEventDispatchedListener batchEventDispatchedListener = readPrivateField(source, "mBatchEventDispatchedListener");
+
+      FabricUIManager customFabricUIManager = new CustomFabricUIManager(
+        reactContext,
+        viewManagerRegistry,
+        batchEventDispatchedListener,
+        sourceMountingManager,
+        markdownProps,
+        parserId
+      );
+
+      return customFabricUIManager;
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      throw new RuntimeException("[LiveMarkdown] Cannot read data from FabricUIManager", e);
+    }
+  }
+
+  @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/CustomFabricUIManager.java

@@ -7,15 +7,11 @@ import android.text.SpannableStringBuilder;
 
 import androidx.annotation.Nullable;
 
-import com.facebook.infer.annotation.Assertions;
 import com.facebook.jni.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
 import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.react.fabric.mounting.SurfaceMountingManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
 import com.facebook.react.views.text.TextLayoutManager;
@@ -26,29 +22,26 @@ import java.lang.reflect.Field;
 public class CustomFabricUIManager extends FabricUIManager {
 
   private final ReactApplicationContext mReactApplicationContext;
-  private final MountingManager mMountingManager;
   private final MarkdownUtils mMarkdownUtils;
 
   public CustomFabricUIManager(
     ReactApplicationContext reactContext,
     ViewManagerRegistry viewManagerRegistry,
     BatchEventDispatchedListener batchEventDispatchedListener,
-    MountingManager mountingManager,
     ReadableMap markdownProps,
     int parserId
   ) {
     super(reactContext, viewManagerRegistry, batchEventDispatchedListener);
 
     this.mReactApplicationContext = reactContext;
-    this.mMountingManager = mountingManager;
 
     this.mMarkdownUtils = new MarkdownUtils(reactContext);
     this.mMarkdownUtils.setMarkdownStyle(new MarkdownStyle(markdownProps, reactContext));
     this.mMarkdownUtils.setParserId(parserId);
   }
 
+  @Override
   public long measureText(
-    int surfaceId,
     ReadableMapBuffer attributedString,
     ReadableMapBuffer paragraphAttributes,
     float minWidth,
@@ -57,22 +50,8 @@ public class CustomFabricUIManager extends FabricUIManager {
     float maxHeight,
     @Nullable float[] attachmentsPositions) {
 
-    ReactContext context;
-    if (surfaceId > 0) {
-      SurfaceMountingManager surfaceMountingManager =
-        mMountingManager.getSurfaceManagerEnforced(surfaceId, "measureText");
-      if (surfaceMountingManager.isStopped()) {
-        return 0;
-      }
-      context = surfaceMountingManager.getContext();
-      Assertions.assertNotNull(
-        context, "Context in SurfaceMountingManager is null. surfaceId: " + surfaceId);
-    } else {
-      context = mReactApplicationContext;
-    }
-
     return TextLayoutManager.measureText(
-      context,
+      mReactApplicationContext.getAssets(),
       attributedString,
       paragraphAttributes,
       getYogaSize(minWidth, maxWidth),
@@ -86,29 +65,20 @@ public class CustomFabricUIManager extends FabricUIManager {
   }
 
   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");
 
-      FabricUIManager customFabricUIManager = new CustomFabricUIManager(
+      return new CustomFabricUIManager(
         reactContext,
         viewManagerRegistry,
         batchEventDispatchedListener,
-        sourceMountingManager,
         markdownProps,
         parserId
       );
-
-      return customFabricUIManager;
     } catch (NoSuchFieldException | IllegalAccessException e) {
-      throw new RuntimeException("[LiveMarkdown] Cannot read data from FabricUIManager");
+      throw new RuntimeException("[LiveMarkdown] Cannot read data from FabricUIManager", e);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.330",
+  "version": "0.1.331",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",