@expensify/react-native-live-markdown 0.1.168 → 0.1.170

package/RNLiveMarkdown.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => "11.0", :visionos => "1.0" }
   s.source       = { :git => "https://github.com/expensify/react-native-live-markdown.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm}"
+  s.source_files = "apple/**/*.{h,m,mm}"
 
   s.resources = "parser/react-native-live-markdown-parser.js"
 

package/apple/RCTMarkdownUtils.mm

@@ -0,0 +1,213 @@
+#import <RNLiveMarkdown/RCTMarkdownUtils.h>
+#import "react_native_assert.h"
+#import <React/RCTAssert.h>
+#import <React/RCTFont.h>
+
+#include <jsi/jsi.h>
+#include <hermes/hermes.h>
+
+using namespace facebook;
+
+@implementation RCTMarkdownUtils {
+  NSString *_prevInputString;
+  NSAttributedString *_prevAttributedString;
+  NSDictionary<NSAttributedStringKey, id> *_prevTextAttributes;
+  __weak RCTMarkdownStyle *_prevMarkdownStyle;
+}
+
+- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey,id> *)attributes
+{
+    @synchronized (self) {
+        if (input == nil) {
+            return nil;
+        }
+
+        NSString *inputString = [input string];
+        if ([inputString isEqualToString:_prevInputString] && [attributes isEqualToDictionary:_prevTextAttributes] && [_markdownStyle isEqual:_prevMarkdownStyle]) {
+            return _prevAttributedString;
+        }
+
+        static std::shared_ptr<jsi::Runtime> runtime;
+        static std::mutex runtimeMutex;
+        auto lock = std::lock_guard<std::mutex>(runtimeMutex);
+
+        if (runtime == nullptr) {
+            NSString *path = [[NSBundle mainBundle] pathForResource:@"react-native-live-markdown-parser" ofType:@"js"];
+            assert(path != nil && "[react-native-live-markdown] Markdown parser bundle not found");
+            NSString *content = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:NULL];
+            assert(content != nil && "[react-native-live-markdown] Markdown parser bundle is empty");
+            runtime = facebook::hermes::makeHermesRuntime();
+            auto codeBuffer = std::make_shared<const jsi::StringBuffer>([content UTF8String]);
+            runtime->evaluateJavaScript(codeBuffer, "evaluateJavaScript");
+        }
+
+        jsi::Runtime &rt = *runtime;
+        auto text = jsi::String::createFromUtf8(rt, [inputString UTF8String]);
+
+        auto func = rt.global().getPropertyAsFunction(rt, "parseExpensiMarkToRanges");
+        auto output = func.call(rt, text);
+        if (output.isUndefined()) {
+          return input;
+        }
+        const auto &ranges = output.asObject(rt).asArray(rt);
+
+        NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:inputString attributes:attributes];
+        [attributedString beginEditing];
+
+        // If the attributed string ends with underlined text, blurring the single-line input imprints the underline style across the whole string.
+        // It looks like a bug in iOS, as there is no underline style to be found in the attributed string, especially after formatting.
+        // 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 (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 &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;
+
+            [self applyRangeToAttributedString:attributedString type:type start:start length:length depth:depth];
+        }
+
+        RCTApplyBaselineOffset(attributedString);
+
+        [attributedString endEditing];
+
+        _prevInputString = inputString;
+        _prevAttributedString = attributedString;
+        _prevTextAttributes = attributes;
+        _prevMarkdownStyle = _markdownStyle;
+
+        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
+    }
+}
+
+static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
+{
+  __block CGFloat maximumLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSParagraphStyleAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
+    if (!paragraphStyle) {
+      return;
+    }
+
+    maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
+  }];
+
+  if (maximumLineHeight == 0) {
+    // `lineHeight` was not specified, nothing to do.
+    return;
+  }
+
+  __block CGFloat maximumFontLineHeight = 0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
+    if (!font) {
+      return;
+    }
+
+    maximumFontLineHeight = MAX(font.lineHeight, maximumFontLineHeight);
+  }];
+
+  if (maximumLineHeight < maximumFontLineHeight) {
+    return;
+  }
+
+  CGFloat baseLineOffset = (maximumLineHeight - maximumFontLineHeight) / 2.0;
+  [attributedText addAttribute:NSBaselineOffsetAttributeName
+                         value:@(baseLineOffset)
+                         range:NSMakeRange(0, attributedText.length)];
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.168",
+  "version": "0.1.170",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -12,11 +12,11 @@
     "lib",
     "parser/react-native-live-markdown-parser.js",
     "android",
-    "ios",
+    "apple",
     "cpp",
     "*.podspec",
     "react-native.config.js",
-    "!ios/build",
+    "!apple/build",
     "!android/build",
     "!android/gradle",
     "!android/gradlew",

package/ios/RCTMarkdownUtils.mm

@@ -1,210 +0,0 @@
-#import <RNLiveMarkdown/RCTMarkdownUtils.h>
-#import "react_native_assert.h"
-#import <React/RCTAssert.h>
-#import <React/RCTFont.h>
-
-#include <jsi/jsi.h>
-#include <hermes/hermes.h>
-
-using namespace facebook;
-
-@implementation RCTMarkdownUtils {
-  NSString *_prevInputString;
-  NSAttributedString *_prevAttributedString;
-  NSDictionary<NSAttributedStringKey, id> *_prevTextAttributes;
-  __weak RCTMarkdownStyle *_prevMarkdownStyle;
-}
-
-- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey,id> *)attributes
-{
-    @synchronized (self) {
-        if (input == nil) {
-            return nil;
-        }
-
-        NSString *inputString = [input string];
-        if ([inputString isEqualToString:_prevInputString] && [attributes isEqualToDictionary:_prevTextAttributes] && [_markdownStyle isEqual:_prevMarkdownStyle]) {
-            return _prevAttributedString;
-        }
-
-        static std::shared_ptr<jsi::Runtime> runtime;
-        static std::mutex runtimeMutex;
-        auto lock = std::lock_guard<std::mutex>(runtimeMutex);
-
-        if (runtime == nullptr) {
-            NSString *path = [[NSBundle mainBundle] pathForResource:@"react-native-live-markdown-parser" ofType:@"js"];
-            assert(path != nil && "[react-native-live-markdown] Markdown parser bundle not found");
-            NSString *content = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:NULL];
-            assert(content != nil && "[react-native-live-markdown] Markdown parser bundle is empty");
-            runtime = facebook::hermes::makeHermesRuntime();
-            auto codeBuffer = std::make_shared<const jsi::StringBuffer>([content UTF8String]);
-            runtime->evaluateJavaScript(codeBuffer, "evaluateJavaScript");
-        }
-
-        jsi::Runtime &rt = *runtime;
-        auto text = jsi::String::createFromUtf8(rt, [inputString UTF8String]);
-
-        auto func = rt.global().getPropertyAsFunction(rt, "parseExpensiMarkToRanges");
-        auto output = func.call(rt, text);
-        if (output.isUndefined()) {
-          return input;
-        }
-        const auto &ranges = output.asObject(rt).asArray(rt);
-
-        NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:inputString attributes:attributes];
-        [attributedString beginEditing];
-
-        // If the attributed string ends with underlined text, blurring the single-line input imprints the underline style across the whole string.
-        // It looks like a bug in iOS, as there is no underline style to be found in the attributed string, especially after formatting.
-        // 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 (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 &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
-            }
-        }
-
-        RCTApplyBaselineOffset(attributedString);
-
-        [attributedString endEditing];
-
-        _prevInputString = inputString;
-        _prevAttributedString = attributedString;
-        _prevTextAttributes = attributes;
-        _prevMarkdownStyle = _markdownStyle;
-
-        return attributedString;
-
-    }
-}
-
-static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
-{
-  __block CGFloat maximumLineHeight = 0;
-
-  [attributedText enumerateAttribute:NSParagraphStyleAttributeName
-                             inRange:NSMakeRange(0, attributedText.length)
-                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
-    if (!paragraphStyle) {
-      return;
-    }
-
-    maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
-  }];
-
-  if (maximumLineHeight == 0) {
-    // `lineHeight` was not specified, nothing to do.
-    return;
-  }
-
-  __block CGFloat maximumFontLineHeight = 0;
-
-  [attributedText enumerateAttribute:NSFontAttributeName
-                             inRange:NSMakeRange(0, attributedText.length)
-                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-                          usingBlock:^(UIFont *font, NSRange range, __unused BOOL *stop) {
-    if (!font) {
-      return;
-    }
-
-    maximumFontLineHeight = MAX(font.lineHeight, maximumFontLineHeight);
-  }];
-
-  if (maximumLineHeight < maximumFontLineHeight) {
-    return;
-  }
-
-  CGFloat baseLineOffset = (maximumLineHeight - maximumFontLineHeight) / 2.0;
-  [attributedText addAttribute:NSBaselineOffsetAttributeName
-                         value:@(baseLineOffset)
-                         range:NSMakeRange(0, attributedText.length)];
-}
-
-@end