Merge branch 'main' into @maksg/performance-fixes-ios

.eslintignore

@@ -3,7 +3,7 @@ parser/react-native-live-markdown-parser.js
 
 # any js file inside android and ios folders
 **/android/**/*.js
-**/ios/**/*.js
+**/apple/**/*.js
 
 # Output of the build process & scripts
 lib/**/*

.github/workflows/build-ios.yml

@@ -4,7 +4,7 @@ on:
     paths:
       - .github/workflows/build-ios.yml
       - RNLiveMarkdown.podspec
-      - ios/**
+      - apple/**
       - cpp/**
       - example/package.json
       - example/ios/**
@@ -17,7 +17,7 @@ on:
     paths:
       - .github/workflows/build-ios.yml
       - RNLiveMarkdown.podspec
-      - ios/**
+      - apple/**
       - cpp/**
       - example/package.json
       - example/ios/**

.github/workflows/publish.yml

@@ -34,7 +34,7 @@ jobs:
 
            - name: Set up git for OSBotify
              run: |
-               git config --global user.signingkey 367811D53E34168C
+               git config --global user.signingkey AEE1036472A782AB
                git config --global commit.gpgsign true
                git config --global user.name OSBotify
                git config --global user.email [email protected]

.gitignore

@@ -80,3 +80,6 @@ lib/
 # react-native-live-markdown
 android/src/main/assets/react-native-live-markdown-parser.js
 .build_complete
+
+# GitHub GPG Keys
+.github/OSBotify-private-key.asc

CONTRIBUTING.md

@@ -149,3 +149,16 @@ When you're sending a pull request:
 - Review the documentation to make sure it looks good.
 - Follow the pull request template when opening a pull request.
 - For pull requests that change the API or implementation, discuss with maintainers first by opening an issue.
+
+### Testing with Expensify/App (or other projects)
+It's possible to locally develop this repo such with live-reload in another React Native project. These instructions are for Expensify/App, but they can be adapted to other repos as well.
+
+1. Clone this repo
+2. Run `yarn install`
+3. Run `yarn build:watch`
+4. In Expensify/App, run `npm install`.
+   - _Note:_ There is a patch for the `link` dev dependency in this repo. If you want these steps to work reliably, you'll likely need to copy that patch over.
+5. In Expensify/App, run `npx link publish --watch ~/react-native-live-markdown --litmus .build_complete`
+6. In E/App, run the app with `npm run web`/`npm run ios`/etc...
+
+The end result should be that you can make a change directly in this repo, and your changes will live-reload in E/App.

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"
 
@@ -37,8 +37,10 @@ Pod::Spec.new do |s|
     ])
   end
 
-  s.subspec "common" do |ss|
-    ss.source_files         = "cpp/**/*.{cpp,h}"
-    ss.header_dir           = "RNLiveMarkdown"
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+    s.subspec "newarch" do |ss|
+      ss.source_files         = "cpp/**/*.{cpp,h}"
+      ss.header_dir           = "RNLiveMarkdown"
+    end
   end
 end

WebExample/__tests__/styles.spec.ts

@@ -52,7 +52,7 @@ test.describe('markdown content styling', () => {
 
   test('blockquote', async ({page, browserName}) => {
     const blockquoteStyle =
-      'border-color: gray; border-width: 6px; margin-left: 6px; padding-left: 6px; border-left-style: solid; display: inline-block; max-width: 100%; box-sizing: border-box;';
+      'border-color: gray; border-width: 6px; margin-left: 6px; padding-left: 6px; border-left-style: solid; display: inline-block; max-width: 100%; box-sizing: border-box; overflow-wrap: anywhere;';
 
     // Firefox border properties are serialized slightly differently
     const browserStyle = browserName === 'firefox' ? blockquoteStyle.replace('border-left-style: solid', 'border-left: 6px solid gray') : blockquoteStyle;

android/build.gradle

@@ -191,3 +191,7 @@ task copyJS(type: Copy) {
 tasks.preBuild {
   dependsOn copyJS
 }
+
+tasks.withType(JavaCompile).configureEach {
+  options.compilerArgs << "-Xlint:all" << "-Werror"
+}

android/src/main/cpp/CMakeLists.txt

@@ -18,18 +18,17 @@ find_package(fbjni REQUIRED CONFIG)
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(hermes-engine REQUIRED CONFIG)
 
+target_link_libraries(
+        ${CMAKE_PROJECT_NAME}
+        fbjni::fbjni
+        hermes-engine::libhermes
+        ReactAndroid::jsi
+)
+
 if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-  target_link_libraries(${CMAKE_PROJECT_NAME}
-          fbjni::fbjni
-          ReactAndroid::jsi
-          ReactAndroid::reactnative
-          hermes-engine::libhermes)
+  target_link_libraries(${CMAKE_PROJECT_NAME} ReactAndroid::reactnative)
 elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
-  target_link_libraries(${CMAKE_PROJECT_NAME}
-          fbjni::fbjni
-          ReactAndroid::jsi
-          ReactAndroid::reactnativejni
-          hermes-engine::libhermes)
+  target_link_libraries(${CMAKE_PROJECT_NAME} ReactAndroid::reactnativejni)
 else ()
   message(FATAL_ERROR "react-native-live-markdown requires react-native 0.75 or newer.")
 endif ()

android/src/main/java/com/expensify/livemarkdown/CustomFabricUIManager.java

@@ -35,6 +35,7 @@ public static FabricUIManager create(FabricUIManager source, ReadableMap markdow
     }
   }
 
+  @SuppressWarnings("unchecked")
   private static <T> T readPrivateField(Object obj, String name) throws NoSuchFieldException, IllegalAccessException {
     Class<?> clazz = obj.getClass();
 

android/src/main/java/com/expensify/livemarkdown/LiveMarkdownPackage.java

@@ -17,8 +17,10 @@
 import java.util.Map;
 
 public class LiveMarkdownPackage extends TurboReactPackage {
+  @NonNull
   @Override
-  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+  @SuppressWarnings("rawtypes")
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
     List<ViewManager> viewManagers = new ArrayList<>();
     viewManagers.add(new MarkdownTextInputDecoratorViewManager());
     return viewManagers;
@@ -27,6 +29,7 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
   @Override
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
     return new ReactModuleInfoProvider() {
+      @NonNull
       @Override
       public Map<String, ReactModuleInfo> getReactModuleInfos() {
         return Map.of(LiveMarkdownModule.NAME, new ReactModuleInfo(

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

@@ -6,6 +6,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.expensify.livemarkdown.spans.*;
 import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
 import com.facebook.soloader.SoLoader;
 
@@ -164,8 +165,6 @@ private void applyRange(SpannableStringBuilder ssb, String type, int start, int
           depth);
         setSpan(ssb, span, start, end);
         break;
-      default:
-        throw new IllegalStateException("Unsupported type: " + type);
     }
   }
 

android/src/main/java/com/expensify/livemarkdown/MarkdownBackgroundColorSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownBackgroundColorSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.text.style.BackgroundColorSpan;
 

android/src/main/java/com/expensify/livemarkdown/MarkdownBlockquoteSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownBlockquoteSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;

android/src/main/java/com/expensify/livemarkdown/MarkdownBoldSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownBoldSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.graphics.Typeface;
 import android.text.style.StyleSpan;

android/src/main/java/com/expensify/livemarkdown/MarkdownEmojiSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownEmojiSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.text.style.AbsoluteSizeSpan;
 

android/src/main/java/com/expensify/livemarkdown/MarkdownFontFamilySpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownFontFamilySpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.content.res.AssetManager;
 import android.graphics.Paint;
@@ -8,8 +8,7 @@
 
 import androidx.annotation.NonNull;
 
-import com.facebook.react.common.assets.ReactFontManager.TypefaceStyle;
-import com.facebook.react.views.text.ReactFontManager;
+import com.facebook.react.common.assets.ReactFontManager;
 
 public class MarkdownFontFamilySpan extends MetricAffectingSpan implements MarkdownSpan {
 
@@ -32,12 +31,7 @@ public void updateDrawState(TextPaint tp) {
   }
 
   private void apply(@NonNull TextPaint textPaint) {
-    int style = TypefaceStyle.NORMAL;
-    if (textPaint.getTypeface() != null) {
-      style = textPaint.getTypeface().getStyle();
-    } else {
-      style = TypefaceStyle.NORMAL;
-    }
+    int style = textPaint.getTypeface() != null ? textPaint.getTypeface().getStyle() : ReactFontManager.TypefaceStyle.NORMAL;
     Typeface typeface = ReactFontManager.getInstance().getTypeface(mFontFamily, style, mAssetManager);
     textPaint.setTypeface(typeface);
     textPaint.setFlags(textPaint.getFlags() | Paint.SUBPIXEL_TEXT_FLAG);

android/src/main/java/com/expensify/livemarkdown/MarkdownFontSizeSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownFontSizeSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.text.style.AbsoluteSizeSpan;
 

android/src/main/java/com/expensify/livemarkdown/MarkdownForegroundColorSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownForegroundColorSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.text.style.ForegroundColorSpan;
 

android/src/main/java/com/expensify/livemarkdown/MarkdownItalicSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownItalicSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.graphics.Typeface;
 import android.text.style.StyleSpan;

android/src/main/java/com/expensify/livemarkdown/MarkdownLineHeightSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownLineHeightSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.graphics.Paint;
 import android.text.style.LineHeightSpan;

android/src/main/java/com/expensify/livemarkdown/MarkdownSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 /*
  * Enables us to distinguish between spans that were added by Live Markdown and spans that were

android/src/main/java/com/expensify/livemarkdown/MarkdownStrikethroughSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownStrikethroughSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.text.style.StrikethroughSpan;
 

android/src/main/java/com/expensify/livemarkdown/MarkdownUnderlineSpan.java → android/src/main/java/com/expensify/livemarkdown/spans/MarkdownUnderlineSpan.java

@@ -1,4 +1,4 @@
-package com.expensify.livemarkdown;
+package com.expensify.livemarkdown.spans;
 
 import android.text.style.UnderlineSpan;