@expensify/react-native-live-markdown 0.1.197 → 0.1.199

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

@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
 
 import com.expensify.livemarkdown.spans.*;
 import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
+import com.facebook.systrace.Systrace;
 
 import java.util.List;
 import java.util.Objects;
@@ -20,22 +21,37 @@ public class MarkdownFormatter {
   }
 
   public void format(SpannableStringBuilder ssb, List<MarkdownRange> markdownRanges, @NonNull MarkdownStyle markdownStyle) {
-    Objects.requireNonNull(markdownStyle, "mMarkdownStyle is null");
-    removeSpans(ssb);
-    applyRanges(ssb, markdownRanges, markdownStyle);
+    try {
+      Systrace.beginSection(0, "format");
+      Objects.requireNonNull(markdownStyle, "mMarkdownStyle is null");
+      removeSpans(ssb);
+      applyRanges(ssb, markdownRanges, markdownStyle);
+    } finally {
+      Systrace.endSection(0);
+    }
   }
 
   private void removeSpans(SpannableStringBuilder ssb) {
-    // We shouldn't use `removeSpans()` because it also removes SpellcheckSpan, SuggestionSpan etc.
-    MarkdownSpan[] spans = ssb.getSpans(0, ssb.length(), MarkdownSpan.class);
-    for (MarkdownSpan span : spans) {
-      ssb.removeSpan(span);
+    try {
+      Systrace.beginSection(0, "removeSpans");
+      // We shouldn't use `removeSpans()` because it also removes SpellcheckSpan, SuggestionSpan etc.
+      MarkdownSpan[] spans = ssb.getSpans(0, ssb.length(), MarkdownSpan.class);
+      for (MarkdownSpan span : spans) {
+        ssb.removeSpan(span);
+      }
+    } finally {
+      Systrace.endSection(0);
     }
   }
 
   private void applyRanges(SpannableStringBuilder ssb, List<MarkdownRange> markdownRanges, @NonNull MarkdownStyle markdownStyle) {
-    for (MarkdownRange markdownRange : markdownRanges) {
-      applyRange(ssb, markdownRange, markdownStyle);
+    try {
+      Systrace.beginSection(0, "applyRanges");
+      for (MarkdownRange markdownRange : markdownRanges) {
+        applyRange(ssb, markdownRange, markdownStyle);
+      }
+    } finally {
+      Systrace.endSection(0);
     }
   }
 

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

@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.util.RNLog;
 import com.facebook.soloader.SoLoader;
+import com.facebook.systrace.Systrace;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -31,46 +32,58 @@ public class MarkdownParser {
   private native String nativeParse(String text, int parserId);
 
   public synchronized List<MarkdownRange> parse(String text, int parserId) {
-    if (text.equals(mPrevText) && parserId == mPrevParserId) {
-      return mPrevMarkdownRanges;
-    }
-
-    String json;
     try {
-      json = nativeParse(text, parserId);
-    } catch (Exception e) {
-      // Skip formatting, runGuarded will show the error in LogBox
-      mPrevText = text;
-      mPrevParserId = parserId;
-      mPrevMarkdownRanges = Collections.emptyList();
-      return mPrevMarkdownRanges;
-    }
+      Systrace.beginSection(0, "parse");
 
-    List<MarkdownRange> markdownRanges = new LinkedList<>();
-    try {
-      JSONArray ranges = new JSONArray(json);
-      for (int i = 0; i < ranges.length(); i++) {
-        JSONObject range = ranges.getJSONObject(i);
-        String type = range.getString("type");
-        int start = range.getInt("start");
-        int length = range.getInt("length");
-        int depth = range.optInt("depth", 1);
-        if (length == 0 || start + length > text.length()) {
-          continue;
+      if (text.equals(mPrevText) && parserId == mPrevParserId) {
+        return mPrevMarkdownRanges;
+      }
+
+      String json;
+      try {
+        Systrace.beginSection(0, "nativeParse");
+        json = nativeParse(text, parserId);
+      } catch (Exception e) {
+        // Skip formatting, runGuarded will show the error in LogBox
+        mPrevText = text;
+        mPrevParserId = parserId;
+        mPrevMarkdownRanges = Collections.emptyList();
+        return mPrevMarkdownRanges;
+      } finally {
+        Systrace.endSection(0);
+      }
+
+      List<MarkdownRange> markdownRanges = new LinkedList<>();
+      try {
+        Systrace.beginSection(0, "markdownRanges");
+        JSONArray ranges = new JSONArray(json);
+        for (int i = 0; i < ranges.length(); i++) {
+          JSONObject range = ranges.getJSONObject(i);
+          String type = range.getString("type");
+          int start = range.getInt("start");
+          int length = range.getInt("length");
+          int depth = range.optInt("depth", 1);
+          if (length == 0 || start + length > text.length()) {
+            continue;
+          }
+          markdownRanges.add(new MarkdownRange(type, start, length, 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());
+        mPrevText = text;
+        mPrevParserId = parserId;
+        mPrevMarkdownRanges = Collections.emptyList();
+        return mPrevMarkdownRanges;
+      } finally {
+        Systrace.endSection(0);
       }
-    } catch (JSONException e) {
-      RNLog.w(mReactContext, "[react-native-live-markdown] Incorrect schema of worklet parser output: " + e.getMessage());
+
       mPrevText = text;
       mPrevParserId = parserId;
-      mPrevMarkdownRanges = Collections.emptyList();
+      mPrevMarkdownRanges = markdownRanges;
       return mPrevMarkdownRanges;
+    } finally {
+      Systrace.endSection(0);
     }
-
-    mPrevText = text;
-    mPrevParserId = parserId;
-    mPrevMarkdownRanges = markdownRanges;
-    return mPrevMarkdownRanges;
   }
 }

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

@@ -5,6 +5,7 @@ import android.text.SpannableStringBuilder;
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.systrace.Systrace;
 
 import java.util.List;
 
@@ -29,8 +30,13 @@ public class MarkdownUtils {
   }
 
   public void applyMarkdownFormatting(SpannableStringBuilder ssb) {
-    String text = ssb.toString();
-    List<MarkdownRange> markdownRanges = mMarkdownParser.parse(text, mParserId);
-    mMarkdownFormatter.format(ssb, markdownRanges, mMarkdownStyle);
+    try {
+      Systrace.beginSection(0, "applyMarkdownFormatting");
+      String text = ssb.toString();
+      List<MarkdownRange> markdownRanges = mMarkdownParser.parse(text, mParserId);
+      mMarkdownFormatter.format(ssb, markdownRanges, mMarkdownStyle);
+    } finally {
+      Systrace.endSection(0);
+    }
   }
 }

package/apple/MarkdownLayoutManager.mm

@@ -5,34 +5,27 @@
 - (void)drawBackgroundForGlyphRange:(NSRange)glyphsToShow atPoint:(CGPoint)origin {
   [super drawBackgroundForGlyphRange:glyphsToShow atPoint:origin];
 
+  NSTextStorage *textStorage = self.textStorage;
+
   [self enumerateLineFragmentsForGlyphRange:glyphsToShow usingBlock:^(CGRect rect, CGRect usedRect, NSTextContainer * _Nonnull textContainer, NSRange glyphRange, BOOL * _Nonnull stop) {
-    __block BOOL isBlockquote = NO;
-    __block int currentDepth = 0;
+    NSNumber *depth = [textStorage attribute:RCTLiveMarkdownBlockquoteDepthAttributeName atIndex:glyphRange.location effectiveRange:nil];
+    if (depth == nil) {
+      return; // not a blockquote
+    }
+
     RCTMarkdownUtils *markdownUtils = [self valueForKey:@"markdownUtils"];
-    [markdownUtils.blockquoteRangesAndLevels enumerateObjectsUsingBlock:^(NSDictionary *item, NSUInteger idx, BOOL * _Nonnull stop) {
-      NSRange range = [[item valueForKey:@"range"] rangeValue];
-      currentDepth = [[item valueForKey:@"depth"] unsignedIntegerValue];
-      NSUInteger start = range.location;
-      NSUInteger end = start + range.length;
-      NSUInteger location = glyphRange.location;
-      if (location >= start && location < end) {
-        isBlockquote = YES;
-        *stop = YES;
-      }
-    }];
-    if (isBlockquote) {
-      CGFloat paddingLeft = origin.x;
-      CGFloat paddingTop = origin.y;
-      CGFloat y = paddingTop + rect.origin.y;
-      CGFloat width = markdownUtils.markdownStyle.blockquoteBorderWidth;
-      CGFloat height = rect.size.height;
-      CGFloat shift = markdownUtils.markdownStyle.blockquoteMarginLeft + markdownUtils.markdownStyle.blockquoteBorderWidth + markdownUtils.markdownStyle.blockquotePaddingLeft;
-      for (int level = 0; level < currentDepth; level++) {
-        CGFloat x =  paddingLeft + (level * shift) + markdownUtils.markdownStyle.blockquoteMarginLeft;
-        CGRect lineRect = CGRectMake(x, y, width, height);
-        [markdownUtils.markdownStyle.blockquoteBorderColor setFill];
-        UIRectFill(lineRect);
-      }
+    CGFloat paddingLeft = origin.x;
+    CGFloat paddingTop = origin.y;
+    CGFloat y = paddingTop + rect.origin.y;
+    CGFloat width = markdownUtils.markdownStyle.blockquoteBorderWidth;
+    CGFloat height = rect.size.height;
+    CGFloat shift = markdownUtils.markdownStyle.blockquoteMarginLeft + markdownUtils.markdownStyle.blockquoteBorderWidth + markdownUtils.markdownStyle.blockquotePaddingLeft;
+  
+    for (NSUInteger level = 0; level < [depth unsignedIntValue]; level++) {
+      CGFloat x = paddingLeft + (level * shift) + markdownUtils.markdownStyle.blockquoteMarginLeft;
+      CGRect lineRect = CGRectMake(x, y, width, height);
+      [markdownUtils.markdownStyle.blockquoteBorderColor setFill];
+      UIRectFill(lineRect);
     }
   }];
 }

package/apple/RCTMarkdownUtils.h

@@ -3,11 +3,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+const NSAttributedStringKey RCTLiveMarkdownBlockquoteDepthAttributeName = @"RCTLiveMarkdownBlockquoteDepth";
+
 @interface RCTMarkdownUtils : NSObject
 
 @property (nonatomic) RCTMarkdownStyle *markdownStyle;
 @property (nonatomic) NSNumber *parserId;
-@property (nonatomic) NSMutableArray<NSDictionary *> *blockquoteRangesAndLevels;
 
 - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey, id>*)attributes;
 

package/apple/RCTMarkdownUtils.mm

@@ -46,8 +46,6 @@
         // This is a workaround that applies the NSUnderlineStyleNone to the string before iterating over ranges which resolves this problem.
         [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleNone] range:NSMakeRange(0, attributedString.length)];
 
-        _blockquoteRangesAndLevels = [NSMutableArray new];
-
         for (MarkdownRange *markdownRange in markdownRanges) {
             [self applyRangeToAttributedString:attributedString
                                           type:std::string([markdownRange.type UTF8String])
@@ -134,10 +132,7 @@
         paragraphStyle.firstLineHeadIndent = indent;
         paragraphStyle.headIndent = indent;
         [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-        [_blockquoteRangesAndLevels addObject:@{
-            @"range": [NSValue valueWithRange:range],
-            @"depth": @(depth)
-        }];
+        [attributedString addAttribute:RCTLiveMarkdownBlockquoteDepthAttributeName value:@(depth) range:range];
     } else if (type == "pre") {
         [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.preColor range:range];
         NSRange rangeForBackground = [[attributedString string] characterAtIndex:range.location] == '\n' ? NSMakeRange(range.location + 1, range.length - 1) : range;

package/package.json

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