@expensify/react-native-live-markdown 0.1.190 → 0.1.192

package/README.md

@@ -20,7 +20,7 @@ npm install @expensify/react-native-live-markdown react-native-reanimated expens
 npx expo install @expensify/react-native-live-markdown react-native-reanimated expensify-common
 ```
 
-React Native Live Markdown requires [react-native-reanimated](https://github.com/software-mansion/react-native-reanimated) 3.16.3 or newer and [expensify-common](https://github.com/Expensify/expensify-common) 2.0.106 or newer.
+React Native Live Markdown requires [react-native-reanimated](https://github.com/software-mansion/react-native-reanimated) 3.16.3 or newer and [expensify-common](https://github.com/Expensify/expensify-common) 2.0.108 or newer.
 
 Then, install the iOS dependencies with CocoaPods:
 

package/android/src/main/java/com/expensify/livemarkdown/MarkdownRange.java

@@ -0,0 +1,31 @@
+package com.expensify.livemarkdown;
+
+public class MarkdownRange {
+  private final String mType;
+  private final int mStart;
+  private final int mLength;
+  private final int mDepth;
+
+  public MarkdownRange(String type, int start, int length, int depth) {
+    mType = type;
+    mStart = start;
+    mLength = length;
+    mDepth = depth;
+  }
+
+  public String getType() {
+    return mType;
+  }
+
+  public int getStart() {
+    return mStart;
+  }
+
+  public int getLength() {
+    return mLength;
+  }
+
+  public int getDepth() {
+    return mDepth;
+  }
+}

package/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java

@@ -16,6 +16,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Objects;
 
 public class MarkdownUtils {
@@ -68,6 +70,7 @@ public class MarkdownUtils {
       mPrevParserId = mParserId;
     }
 
+    List<MarkdownRange> markdownRanges = new LinkedList<>();
     try {
       JSONArray ranges = new JSONArray(output);
       for (int i = 0; i < ranges.length(); i++) {
@@ -80,14 +83,21 @@ public class MarkdownUtils {
         if (length == 0 || end > input.length()) {
           continue;
         }
-        applyRange(ssb, type, start, end, depth);
+        markdownRanges.add(new MarkdownRange(type, start, length, depth));
       }
     } catch (JSONException e) {
       RNLog.w(mReactContext, "[react-native-live-markdown] Incorrect schema of worklet parser output: " + e.getMessage());
     }
+
+    for (MarkdownRange markdownRange : markdownRanges) {
+      applyRange(ssb, markdownRange);
+    }
   }
 
-  private void applyRange(SpannableStringBuilder ssb, String type, int start, int end, int depth) {
+  private void applyRange(SpannableStringBuilder ssb, MarkdownRange markdownRange) {
+    String type = markdownRange.getType();
+    int start = markdownRange.getStart();
+    int end = start + markdownRange.getLength();
     switch (type) {
       case "bold":
         setSpan(ssb, new MarkdownBoldSpan(), start, end);
@@ -149,7 +159,7 @@ public class MarkdownUtils {
           mMarkdownStyle.getBlockquoteBorderWidth(),
           mMarkdownStyle.getBlockquoteMarginLeft(),
           mMarkdownStyle.getBlockquotePaddingLeft(),
-          depth);
+          markdownRange.getDepth());
         setSpan(ssb, span, start, end);
         break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.190",
+  "version": "0.1.192",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -84,7 +84,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-tsdoc": "^0.2.17",
-    "expensify-common": "2.0.106",
+    "expensify-common": "2.0.108",
     "jest": "^29.6.3",
     "jest-environment-jsdom": "^29.7.0",
     "nodemon": "^3.1.3",
@@ -100,7 +100,7 @@
     "typescript": "~5.3.3"
   },
   "peerDependencies": {
-    "expensify-common": ">=2.0.106",
+    "expensify-common": ">=2.0.108",
     "react": "*",
     "react-native": "*",
     "react-native-reanimated": ">=3.16.3"