Merge branch 'main' into @tomekzaw/worklets

Expensify · Oct 10, 2024 · c4df160 · c4df160
2 parents 0d08556 + 1cbf3aa
commit c4df160
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 85 deletions.
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -4,9 +4,9 @@ PODS:
   - FBLazyVector (0.75.3)
   - fmt (9.1.0)
   - glog (0.3.5)
-  - hermes-engine (0.75.2):
-    - hermes-engine/Pre-built (= 0.75.2)
-  - hermes-engine/Pre-built (0.75.2)
+  - hermes-engine (0.75.3):
+    - hermes-engine/Pre-built (= 0.75.3)
+  - hermes-engine/Pre-built (0.75.3)
   - RCT-Folly (2024.01.01.00):
     - boost
     - DoubleConversion
@@ -1841,7 +1841,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 7b438dceb9f904bd85ca3c31d64cce32a035472b
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
   glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
-  hermes-engine: 3b6e0717ca847e2fc90a201e59db36caf04dee88
+  hermes-engine: 8d2103d6c0176779aea4e25df6bb1410f9946680
   RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
   RCTDeprecation: 4191f6e64b72d9743f6fe1a8a16e89e868f5e9e7
   RCTRequired: 9bb589570f2bb3abc6518761e3fd1ad9b7f7f06c

diff --git a/ios/RCTMarkdownUtils.mm b/ios/RCTMarkdownUtils.mm
@@ -53,90 +53,11 @@ - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withA
         for (size_t i = 0, n = ranges.size(rt); i < n; ++i) {
             const auto &item = ranges.getValueAtIndex(rt, i).asObject(rt);
             const auto &type = item.getProperty(rt, "type").asString(rt).utf8(rt);
-            const auto &location = static_cast<int>(item.getProperty(rt, "start").asNumber());
+            const auto &start = static_cast<int>(item.getProperty(rt, "start").asNumber());
             const auto &length = static_cast<int>(item.getProperty(rt, "length").asNumber());
             const auto &depth = item.hasProperty(rt, "depth") ? static_cast<int>(item.getProperty(rt, "depth").asNumber()) : 1;
 
-            if (length == 0 || location + length > attributedString.length) {
-                continue;
-            }
-
-            NSRange range = NSMakeRange(location, length);
-
-            if (type == "bold" || type == "italic" || type == "code" || type == "pre" || type == "h1" || type == "emoji") {
-                UIFont *font = [attributedString attribute:NSFontAttributeName atIndex:location effectiveRange:NULL];
-                if (type == "bold") {
-                    font = [RCTFont updateFont:font withWeight:@"bold"];
-                } else if (type == "italic") {
-                    font = [RCTFont updateFont:font withStyle:@"italic"];
-                } else if (type == "code") {
-                    font = [RCTFont updateFont:font withFamily:_markdownStyle.codeFontFamily
-                                                          size:[NSNumber numberWithFloat:_markdownStyle.codeFontSize]
-                                                        weight:nil
-                                                         style:nil
-                                                       variant:nil
-                                               scaleMultiplier:0];
-                } else if (type == "pre") {
-                    font = [RCTFont updateFont:font withFamily:_markdownStyle.preFontFamily
-                                                          size:[NSNumber numberWithFloat:_markdownStyle.preFontSize]
-                                                        weight:nil
-                                                        style:nil
-                                                      variant:nil
-                                              scaleMultiplier:0];
-                } else if (type == "h1") {
-                    font = [RCTFont updateFont:font withFamily:nil
-                                                          size:[NSNumber numberWithFloat:_markdownStyle.h1FontSize]
-                                                        weight:@"bold"
-                                                         style:nil
-                                                       variant:nil
-                                               scaleMultiplier:0];
-                } else if (type == "emoji") {
-                    font = [RCTFont updateFont:font withFamily:nil
-                                                          size:[NSNumber numberWithFloat:_markdownStyle.emojiFontSize]
-                                                        weight:nil
-                                                         style:nil
-                                                       variant:nil
-                                               scaleMultiplier:0];
-                }
-                [attributedString addAttribute:NSFontAttributeName value:font range:range];
-            }
-
-            if (type == "syntax") {
-                [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.syntaxColor range:range];
-            } else if (type == "strikethrough") {
-                [attributedString addAttribute:NSStrikethroughStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
-            } else if (type == "code") {
-                [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.codeColor range:range];
-                [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.codeBackgroundColor range:range];
-            } else if (type == "mention-here") {
-                [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionHereColor range:range];
-                [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionHereBackgroundColor range:range];
-            } else if (type == "mention-user") {
-                // TODO: change mention color when it mentions current user
-                [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionUserColor range:range];
-                [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionUserBackgroundColor range:range];
-            } else if (type == "mention-report") {
-                [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionReportColor range:range];
-                [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionReportBackgroundColor range:range];
-            } else if (type == "link") {
-                [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
-                [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.linkColor range:range];
-            } else if (type == "blockquote") {
-                CGFloat indent = (_markdownStyle.blockquoteMarginLeft + _markdownStyle.blockquoteBorderWidth + _markdownStyle.blockquotePaddingLeft) * depth;
-                NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
-                paragraphStyle.firstLineHeadIndent = indent;
-                paragraphStyle.headIndent = indent;
-                [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-                [_blockquoteRangesAndLevels addObject:@{
-                    @"range": [NSValue valueWithRange:range],
-                    @"depth": @(depth)
-                }];
-            } else if (type == "pre") {
-                [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.preColor range:range];
-                NSRange rangeForBackground = [inputString characterAtIndex:range.location] == '\n' ? NSMakeRange(range.location + 1, range.length - 1) : range;
-                [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.preBackgroundColor range:rangeForBackground];
-                // TODO: pass background color and ranges to layout manager
-            }
+            [self applyRangeToAttributedString:attributedString type:type start:start length:length depth:depth];
         }
 
         RCTApplyBaselineOffset(attributedString);
@@ -150,7 +71,89 @@ - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withA
         _prevParserId = _parserId;
 
         return attributedString;
+    }
+}
+
+- (void)applyRangeToAttributedString:(NSMutableAttributedString *)attributedString type:(const std::string)type start:(const int)start length:(const int)length depth:(const int)depth {
+    if (length == 0 || start + length > attributedString.length) {
+        return;
+    }
+
+    NSRange range = NSMakeRange(start, length);
+
+    if (type == "bold" || type == "italic" || type == "code" || type == "pre" || type == "h1" || type == "emoji") {
+        UIFont *font = [attributedString attribute:NSFontAttributeName atIndex:start effectiveRange:NULL];
+        if (type == "bold") {
+            font = [RCTFont updateFont:font withWeight:@"bold"];
+        } else if (type == "italic") {
+            font = [RCTFont updateFont:font withStyle:@"italic"];
+        } else if (type == "code") {
+            font = [RCTFont updateFont:font withFamily:_markdownStyle.codeFontFamily
+                                                  size:[NSNumber numberWithFloat:_markdownStyle.codeFontSize]
+                                                weight:nil
+                                                 style:nil
+                                               variant:nil
+                                       scaleMultiplier:0];
+        } else if (type == "pre") {
+            font = [RCTFont updateFont:font withFamily:_markdownStyle.preFontFamily
+                                                  size:[NSNumber numberWithFloat:_markdownStyle.preFontSize]
+                                                weight:nil
+                                                style:nil
+                                              variant:nil
+                                      scaleMultiplier:0];
+        } else if (type == "h1") {
+            font = [RCTFont updateFont:font withFamily:nil
+                                                  size:[NSNumber numberWithFloat:_markdownStyle.h1FontSize]
+                                                weight:@"bold"
+                                                 style:nil
+                                               variant:nil
+                                       scaleMultiplier:0];
+        } else if (type == "emoji") {
+            font = [RCTFont updateFont:font withFamily:nil
+                                                  size:[NSNumber numberWithFloat:_markdownStyle.emojiFontSize]
+                                                weight:nil
+                                                 style:nil
+                                               variant:nil
+                                       scaleMultiplier:0];
+        }
+        [attributedString addAttribute:NSFontAttributeName value:font range:range];
+    }
 
+    if (type == "syntax") {
+        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.syntaxColor range:range];
+    } else if (type == "strikethrough") {
+        [attributedString addAttribute:NSStrikethroughStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
+    } else if (type == "code") {
+        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.codeColor range:range];
+        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.codeBackgroundColor range:range];
+    } else if (type == "mention-here") {
+        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionHereColor range:range];
+        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionHereBackgroundColor range:range];
+    } else if (type == "mention-user") {
+        // TODO: change mention color when it mentions current user
+        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionUserColor range:range];
+        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionUserBackgroundColor range:range];
+    } else if (type == "mention-report") {
+        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.mentionReportColor range:range];
+        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.mentionReportBackgroundColor range:range];
+    } else if (type == "link") {
+        [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleSingle] range:range];
+        [attributedString addAttribute:NSForegroundColorAttributeName value:_markdownStyle.linkColor range:range];
+    } else if (type == "blockquote") {
+        CGFloat indent = (_markdownStyle.blockquoteMarginLeft + _markdownStyle.blockquoteBorderWidth + _markdownStyle.blockquotePaddingLeft) * depth;
+        NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
+        paragraphStyle.firstLineHeadIndent = indent;
+        paragraphStyle.headIndent = indent;
+        [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
+        [_blockquoteRangesAndLevels addObject:@{
+            @"range": [NSValue valueWithRange:range],
+            @"depth": @(depth)
+        }];
+    } 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;
+        [attributedString addAttribute:NSBackgroundColorAttributeName value:_markdownStyle.preBackgroundColor range:rangeForBackground];
+        // TODO: pass background color and ranges to layout manager
     }
 }