Pass ranges as objects instead of arrays (#200)

Expensify · Feb 23, 2024 · d0aa9ec · d0aa9ec
1 parent 56b3ca8
commit d0aa9ec
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 158 deletions.
diff --git a/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java b/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java
@@ -16,6 +16,7 @@
 
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -91,10 +92,11 @@ public void applyMarkdownFormatting(SpannableStringBuilder ssb) {
     try {
       JSONArray ranges = new JSONArray(output);
       for (int i = 0; i < ranges.length(); i++) {
-        JSONArray range = ranges.getJSONArray(i);
-        String type = range.getString(0);
-        int start = range.getInt(1);
-        int end = start + range.getInt(2);
+        JSONObject range = ranges.getJSONObject(i);
+        String type = range.getString("type");
+        int start = range.getInt("start");
+        int length = range.getInt("length");
+        int end = start + length;
         applyRange(ssb, type, start, end);
       }
     } catch (JSONException e) {

diff --git a/ios/RCTMarkdownUtils.mm b/ios/RCTMarkdownUtils.mm
@@ -58,10 +58,10 @@ - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input
   _blockquoteRanges = [NSMutableArray new];
 
   [ranges enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-    NSArray *item = obj;
-    NSString *type = item[0];
-    NSUInteger location = [item[1] unsignedIntegerValue];
-    NSUInteger length = [item[2] unsignedIntegerValue];
+    NSDictionary *item = obj;
+    NSString *type = [item valueForKey:@"type"];
+    NSInteger location = [[item valueForKey:@"start"] unsignedIntegerValue];
+    NSInteger length = [[item valueForKey:@"length"] unsignedIntegerValue];
     NSRange range = NSMakeRange(location, length);
 
     if ([type isEqualToString:@"bold"] || [type isEqualToString:@"italic"] || [type isEqualToString:@"code"] || [type isEqualToString:@"pre"] || [type isEqualToString:@"h1"]) {